From 5d74d44d39e1322d62c8848c39f63c39a9d96010 Mon Sep 17 00:00:00 2001 From: Johan Girod Date: Fri, 10 Apr 2020 15:06:33 +0200 Subject: [PATCH] :bug: corrige l'affichage de l'editeur dans le studio --- package.json | 1 + serve.publicodes.json | 4 ++++ source/engine/mecanisms/régularisation.ts | 1 - source/webpack.prod.legacyBrowser.js | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 serve.publicodes.json diff --git a/package.json b/package.json index 979c50f20..ec5d47679 100644 --- a/package.json +++ b/package.json @@ -95,6 +95,7 @@ "i18n:rules:translate": "node source/scripts/i18n/translate-rules.js", "i18n:ui:check": "yarn run i18next && node source/scripts/i18n/check-missing-UI-translation", "i18n:ui:translate": "rm -rf source/locales/static-analysis-fr.json && yarn run i18next && node source/scripts/i18n/translate-ui.js", + "publicodes:serve": "PORT=5002 serve --config serve.publicodes.json --no-clipboard", "mon-entreprise:serve": "PORT=5000 serve --config serve.mon-entreprise.json --no-clipboard", "mon-entreprise:test": "cypress open --browser chromium", "mycompanyinfrance:serve": "PORT=5001 serve --config serve.infrance.json --no-clipboard", diff --git a/serve.publicodes.json b/serve.publicodes.json new file mode 100644 index 000000000..8ad7f32cc --- /dev/null +++ b/serve.publicodes.json @@ -0,0 +1,4 @@ +{ + "rewrites": [{ "source": "**", "destination": "publicodes.html" }], + "public": "dist" +} diff --git a/source/engine/mecanisms/régularisation.ts b/source/engine/mecanisms/régularisation.ts index 1c92a4f0a..5ed679cc6 100644 --- a/source/engine/mecanisms/régularisation.ts +++ b/source/engine/mecanisms/régularisation.ts @@ -145,7 +145,6 @@ function evaluate( } const evaluation = evaluate(node.explanation.rule) - console.log(evaluation) const temporalValue = evaluation.temporalValue const evaluationWithRegularisation = groupByYear( temporalValue as Temporal> diff --git a/source/webpack.prod.legacyBrowser.js b/source/webpack.prod.legacyBrowser.js index c9b811b07..e29c351f8 100644 --- a/source/webpack.prod.legacyBrowser.js +++ b/source/webpack.prod.legacyBrowser.js @@ -1,4 +1,6 @@ const { map } = require('ramda') +const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin') + const prod = require('./webpack.prod.js') const { commonLoaders, @@ -19,6 +21,7 @@ module.exports = { }, plugins: [ ...HTMLPlugins({ injectTrackingScript: true }), + new MonacoWebpackPlugin(), new EnvironmentPlugin({ EN_SITE: '/infrance${path}', FR_SITE: '/mon-entreprise${path}'