From 39d25fdff9984b0adbede13ccf6a86152f8d6cd0 Mon Sep 17 00:00:00 2001 From: hugh-obrien Date: Thu, 29 Mar 2018 17:48:05 +0100 Subject: [PATCH] webpack compiling for publish menu --- services/web/app/views/project/editor.pug | 2 +- services/web/app/views/project/editor/publish.pug | 2 +- services/web/package.json | 3 +++ services/web/webpack.config.js | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/services/web/app/views/project/editor.pug b/services/web/app/views/project/editor.pug index d004101546..5e3598909d 100644 --- a/services/web/app/views/project/editor.pug +++ b/services/web/app/views/project/editor.pug @@ -137,7 +137,7 @@ block requirejs "fineuploader": "libs/#{lib('fineuploader')}", "ide": "#{buildJsPath('ide.js', {hashedPath:settings.useMinifiedJs, removeExtension:true})}", "libraries": "#{buildJsPath('libraries.js', {hashedPath:settings.useMinifiedJs, removeExtension:true})}", - !{moduleIncludes("editor:script", locals)}, + !{moduleIncludes("editor:script", locals)} !{moduleIncludes("publish:script", locals)} }, "waitSeconds": 0, diff --git a/services/web/app/views/project/editor/publish.pug b/services/web/app/views/project/editor/publish.pug index 8ef74f3d67..a4b9247b93 100644 --- a/services/web/app/views/project/editor/publish.pug +++ b/services/web/app/views/project/editor/publish.pug @@ -5,5 +5,5 @@ script(type='text/ng-template', id='publishProjectModalTemplate') data-dismiss="modal" ng-click="cancel()" ) × - h3 Publish} + h3 Publish .modal-body.modal-body-publish diff --git a/services/web/package.json b/services/web/package.json index 570ef55a2d..f86a0d57ea 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -38,10 +38,12 @@ "cookie-parser": "1.3.5", "csurf": "^1.8.3", "dateformat": "1.0.4-1.2.3", + "expose-loader": "^0.7.3", "express": "4.13.0", "express-http-proxy": "^1.1.0", "express-session": "^1.14.2", "fs-extra": "^4.0.2", + "fuse.js": "^3.0.0", "heapdump": "^0.3.7", "helmet": "^3.8.1", "http-proxy": "^1.8.1", @@ -96,6 +98,7 @@ "babel-core": "^6.26.0", "babel-loader": "^7.1.2", "babel-preset-env": "^1.6.1", + "babel-preset-react": "^6.16.0", "bunyan": "0.22.1", "chai": "3.5.0", "chai-spies": "", diff --git a/services/web/webpack.config.js b/services/web/webpack.config.js index 93107ada1d..a5b6501e66 100644 --- a/services/web/webpack.config.js +++ b/services/web/webpack.config.js @@ -52,6 +52,7 @@ module.exports = { loader: 'babel-loader', options: { presets: [ + 'react', ['env', { modules: false }] ], // Configure babel-loader to cache compiled output so that subsequent