Merge pull request #92 from odecee/fix/add-angular2-router-to-vendor-…

…scripts Fix/add angular2 router to vendor scripts
Cognizant-CDE-Australia · Nov 25, 2016 · 867ad91 · 867ad91
2 parents 34002c3 + 164877b
commit 867ad91
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 26 deletions.
diff --git a/lib/buildTool/npm/npmResources.yml b/lib/buildTool/npm/npmResources.yml
@@ -14,7 +14,7 @@ documentation:
         description: Creates a development-version of the documentation website and watches for changes.
 
       - name: docs:build
-        tasks: ['cross-env NODE_ENV=production webpack -p --progress --config <%- paths.config.configDir + resources.documentation.configSubDir %>swanky.webpack.config.js --colors']
+        tasks: ['cross-env NODE_ENV=production webpack --progress --config <%- paths.config.configDir + resources.documentation.configSubDir %>swanky.webpack.config.js --colors']
         description: Creates a production-version of the documentation website in the `<%- documentation.outputDir %>`.
 
       - name: docs:build:serve

diff --git a/lib/buildTool/webpack/sampleApp/sampleApp.js b/lib/buildTool/webpack/sampleApp/sampleApp.js
@@ -68,15 +68,14 @@ module.exports = function() {
 
     if (sampleAppVendorScripts) {
       vendorScripts = [].concat(
-        sampleAppVendorScripts.pre,
+        sampleAppVendorScripts.pre || [],
         vendorScripts,
-        sampleAppVendorScripts.post
+        sampleAppVendorScripts.post || []
       );
     }
 
     config.buildJS.vendorScripts = _.uniq((config.buildJS.vendorScripts || []).concat(vendorScripts));
 
-
     // Add any TEST vendor scripts to the testUnit config from the selectedFrameworkConfig
     let testVendorScripts = (selectedFrameworkConfig.frameworkPackages.testPackages || []).map((pkg) => pkg.name);
 

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
 
@@ -107,18 +108,25 @@ sampleApp:
       ES6: {}
       TypeScript: {}
     AngularJS 1.x:
-      ES6: {}
-      TypeScript: {}
+      ES6:
+        vendorScripts:  # Add these items to the vendor scripts entryPoint
+          post:
+            - angular-route
+      TypeScript:
+        vendorScripts:
+          post:
+            - angular-route
     AngularJS 2.x:
       TypeScript:
-        vendorScripts:  # Add these items to the vendor scripts entryPoint
+        vendorScripts:
           pre:
             - './polyfills.browser.ts'
-          post: []
+          post:
+            - '@angular/router'
 
     React (latest):
       ES6:
-        vendorScripts:  # Add these items to the vendor scripts entryPoint.
+        vendorScripts:
           pre:
             - './polyfills.js'
           post:

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/package.json b/package.json
@@ -52,7 +52,7 @@
     "dev": "cross-env NODE_ENV=development npm run verify:watch",
     "docs:_publish": "node config/docs/publish.js",
     "predocs:build": "rimraf website/",
-    "docs:build": "cross-env NODE_ENV=production webpack -p --progress --config config/docs/swanky.webpack.config.js --colors",
+    "docs:build": "cross-env NODE_ENV=production webpack --progress --config config/docs/swanky.webpack.config.js --colors",
     "docs:build:serve": "npm-run-all docs:build docs:serve",
     "docs:dev": "cross-env NODE_ENV=development node config/docs/serve.dev.js",
     "docs:postpublish": "node config/docs/postpublish.js",

diff --git a/test/fixtures/node-es6.yml b/test/fixtures/node-es6.yml
@@ -1,6 +1,6 @@
 generator-confit:
   app:
-    _version: e33311babea61ce43d48fbda705c261d1fc56765
+    _version: 79f049c89ce496892cf2385bf177fa588156332a
     buildProfile: Latest
     copyrightOwner: Brett Uglow
     license: UNLICENSED

diff --git a/test/fixtures/webpack-different-paths.yml b/test/fixtures/webpack-different-paths.yml
@@ -1,6 +1,6 @@
 generator-confit:
   app:
-    _version: e33311babea61ce43d48fbda705c261d1fc56765
+    _version: 79f049c89ce496892cf2385bf177fa588156332a
     buildProfile: Latest
     projectType: browser
     repositoryType: Other

diff --git a/test/fixtures/webpack-es6-ng1-stylus.yml b/test/fixtures/webpack-es6-ng1-stylus.yml
@@ -1,6 +1,6 @@
 generator-confit:
   app:
-    _version: e33311babea61ce43d48fbda705c261d1fc56765
+    _version: 79f049c89ce496892cf2385bf177fa588156332a
     buildProfile: Latest
     projectType: browser
     repositoryType: Other

diff --git a/test/fixtures/webpack-es6-none-css.yml b/test/fixtures/webpack-es6-none-css.yml
@@ -1,6 +1,6 @@
 generator-confit:
   app:
-    _version: e33311babea61ce43d48fbda705c261d1fc56765
+    _version: 79f049c89ce496892cf2385bf177fa588156332a
     buildProfile: Latest
     projectType: browser
     repositoryType: Other

diff --git a/test/fixtures/webpack-es6-none-sass.yml b/test/fixtures/webpack-es6-none-sass.yml
@@ -1,6 +1,6 @@
 generator-confit:
   app:
-    _version: e33311babea61ce43d48fbda705c261d1fc56765
+    _version: 79f049c89ce496892cf2385bf177fa588156332a
     buildProfile: Latest
     projectType: browser
     repositoryType: Other

diff --git a/test/fixtures/webpack-es6-none-stylus.yml b/test/fixtures/webpack-es6-none-stylus.yml
@@ -1,6 +1,6 @@
 generator-confit:
   app:
-    _version: e33311babea61ce43d48fbda705c261d1fc56765
+    _version: 79f049c89ce496892cf2385bf177fa588156332a
     buildProfile: Latest
     projectType: browser
     repositoryType: Other

diff --git a/test/fixtures/webpack-es6-react-stylus.yml b/test/fixtures/webpack-es6-react-stylus.yml
@@ -1,6 +1,6 @@
 generator-confit:
   app:
-    _version: e33311babea61ce43d48fbda705c261d1fc56765
+    _version: 79f049c89ce496892cf2385bf177fa588156332a
     buildProfile: Latest
     projectType: browser
     repositoryType: Other

diff --git a/test/fixtures/webpack-ts-ng1-stylus.yml b/test/fixtures/webpack-ts-ng1-stylus.yml
@@ -1,6 +1,6 @@
 generator-confit:
   app:
-    _version: e33311babea61ce43d48fbda705c261d1fc56765
+    _version: 79f049c89ce496892cf2385bf177fa588156332a
     buildProfile: Latest
     projectType: browser
     repositoryType: Other

diff --git a/test/fixtures/webpack-ts-ng2-stylus.yml b/test/fixtures/webpack-ts-ng2-stylus.yml
@@ -1,6 +1,6 @@
 generator-confit:
   app:
-    _version: e33311babea61ce43d48fbda705c261d1fc56765
+    _version: 79f049c89ce496892cf2385bf177fa588156332a
     buildProfile: Latest
     projectType: browser
     repositoryType: Other

diff --git a/test/fixtures/webpack-ts-none-stylus.yml b/test/fixtures/webpack-ts-none-stylus.yml
@@ -1,6 +1,6 @@
 generator-confit:
   app:
-    _version: e33311babea61ce43d48fbda705c261d1fc56765
+    _version: 79f049c89ce496892cf2385bf177fa588156332a
     buildProfile: Latest
     projectType: browser
     repositoryType: Other

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');