chore(build): use valid webpack devServer properties

Cognizant-CDE-Australia · Nov 25, 2016 · 164877b · 164877b
1 parent 0505b0c
commit 164877b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/lib/buildTool/webpack/serverDev/templates/webpack.serverDev.config.js.tpl b/lib/buildTool/webpack/serverDev/templates/webpack.serverDev.config.js.tpl
@@ -31,8 +31,7 @@ config.devServer = {
     'Access-Control-Allow-Origin': '*',
     'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, PATCH, OPTIONS',
     'Access-Control-Allow-Headers': 'accept, content-type, authorization',
-    'Access-Control-Allow-Credentials': true
-  },
-  outputPath: helpers.root('<%- paths.output.devDir %>')
+    'Access-Control-Allow-Credentials': 'true'
+  }
 };
 /* **/
diff --git a/lib/buildTool/webpack/webpackResources.yml b/lib/buildTool/webpack/webpackResources.yml
@@ -1,6 +1,7 @@
 buildBrowser:
   packages:
     - <<: *pkg_webpack
+    - <<: *pkg_loader-utils
     - <<: *pkg_webpack-dev-server
     - <<: *pkg_extract-text-webpack-plugin
 

diff --git a/lib/core/packages.yml b/lib/core/packages.yml
@@ -560,6 +560,11 @@ $packages:
     name: webpack
     version: 2.1.0-beta.25
 
+  # We only need to include this package with webpack 2.1.0-beta.25. Later betas include it already
+  - &pkg_loader-utils
+    name: loader-utils
+    version: 0.2.16
+
   - &pkg_webpack-dev-server
     name: webpack-dev-server
     version: 2.1.0-beta.9

diff --git a/test/spec/unit/documentationGenerator.spec.js b/test/spec/unit/documentationGenerator.spec.js
@@ -174,7 +174,7 @@ describe('Documentation Generator', () => {
         let pkg = fs.readJsonSync('package.json');
 
         assert.equal(pkg.scripts['docs:dev'], 'cross-env NODE_ENV=development node config/docs/serve.dev.js');
-        assert.equal(pkg.scripts['docs:build'], 'cross-env NODE_ENV=production webpack -p --progress --config config/docs/swanky.webpack.config.js --colors');
+        assert.equal(pkg.scripts['docs:build'], 'cross-env NODE_ENV=production webpack --progress --config config/docs/swanky.webpack.config.js --colors');
         assert.equal(pkg.scripts['docs:build:serve'], 'npm-run-all docs:build docs:serve');
         assert.equal(pkg.scripts['docs:serve'], 'http-server webdocs/ -o');
         assert.equal(pkg.scripts['docs:publish'], 'npm-run-all docs:prepublish docs:build docs:_publish docs:postpublish');
@@ -199,7 +199,7 @@ describe('Documentation Generator', () => {
         let pkg = fs.readJsonSync('package.json');
 
         assert.equal(pkg.scripts['docs:dev'], 'cross-env NODE_ENV=development node config/docs/serve.dev.js');
-        assert.equal(pkg.scripts['docs:build'], 'cross-env NODE_ENV=production webpack -p --progress --config config/docs/swanky.webpack.config.js --colors');
+        assert.equal(pkg.scripts['docs:build'], 'cross-env NODE_ENV=production webpack --progress --config config/docs/swanky.webpack.config.js --colors');
         assert.equal(pkg.scripts['docs:build:serve'], 'npm-run-all docs:build docs:serve');
         assert.equal(pkg.scripts['docs:serve'], 'http-server webdocs/ -o');
         assert.equal(pkg.scripts['docs:publish'], 'npm-run-all docs:prepublish docs:build docs:_publish docs:postpublish');
@@ -226,7 +226,7 @@ describe('Documentation Generator', () => {
         let pkg = fs.readJsonSync('package.json');
 
         assert.equal(pkg.scripts['docs:dev'], 'cross-env NODE_ENV=development node config/docs/serve.dev.js');
-        assert.equal(pkg.scripts['docs:build'], 'cross-env NODE_ENV=production webpack -p --progress --config config/docs/swanky.webpack.config.js --colors');
+        assert.equal(pkg.scripts['docs:build'], 'cross-env NODE_ENV=production webpack --progress --config config/docs/swanky.webpack.config.js --colors');
         assert.equal(pkg.scripts['docs:build:serve'], 'npm-run-all docs:build docs:serve');
         assert.equal(pkg.scripts['docs:serve'], 'http-server webdocs/ -o');
         assert.equal(pkg.scripts['docs:publish'], 'npm-run-all docs:prepublish docs:build docs:_publish docs:postpublish');