chore(generator): update to ngx-library 5.4.0

Author: tinesoft

.travis.yml

@@ -22,3 +22,6 @@ script: gulp test:ci
 
 after_success: gulp coveralls
 
+cache:
+  yarn: true
+  

.yo-rc.json

@@ -1,11 +1,11 @@
 {
   "generator-ngx-library": {
-    "version": "4.3.0",
+    "version": "5.4.0",
     "authorName": "Tine Kondo",
     "authorEmail": "kondotine@gmail.com",
     "githubUsername": "tinesoft",
     "projectName": "ngx-wow",
-    "projectVersion": "0.0.1",
+    "projectVersion": "1.0.0",
     "projectDescription": "Angular module for WOW.js.",
     "projectKeywords": [
       "ng",
@@ -16,30 +16,30 @@
       "reveal",
       "animation"
     ],
-    "ngPrefix": "ngw",
     "ngVersion": "2.0.0",
     "ngModules": [
       "core",
       "common"
     ],
-    "useGreenkeeper": true,
+    "otherDependencies": ["wowjs"],
+    "dependenciesRange": ">=",
+    "ngPrefix": "ngw",
+    "useGreenkeeper": false,
     "useCompodoc": true,
     "enforceNgGitCommitMsg": true,
+    "skipDemo": false,
+    "skipSample": true,
+    "skipStyles": true,
     "exclusions": [
-      "src/module/component/lib.component.html",
-      "src/module/component/lib.component.spec.ts",
-      "src/module/component/lib.component.ts",
-      "src/module/component/lib.component.scss",
-      "src/module/service/lib.service.ts",
-      "src/module/service/lib.service.spec.ts",
-      "src/module/lib.module.ts",
-      "src/tsconfig.lib.es5.json",
-      "src/index.ts",
-      "demo/src/app/home/home.component.html",
-      "demo/src/app/home/home.component.scss",
-      "demo/src/app/home/home.module.ts",
+      "README.md",
+      "CHANGELOG.md",
+      "config/karma.conf",
+      "demo/src/app/**",
+      "demo/src/styles.scss",
+      "demo/src/assets/logo.svg",
+      "demo/src/index.html",
       "demo/src/favicon.ico",
-      "demo/src/styles.scss"
+      "src/**/*.*"
     ]
   }
 }

config/webpack.test.js

@@ -1,7 +1,7 @@
 const helpers = require('./helpers');
 const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin');
 const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin');
-const {CheckerPlugin} = require('awesome-typescript-loader');
+const { CheckerPlugin } = require('awesome-typescript-loader');
 
 const getConfig = (hasCoverage, isTddMode) => {
 
@@ -50,7 +50,7 @@ const getConfig = (hasCoverage, isTddMode) => {
                         {
                             loader: 'awesome-typescript-loader',
                             options: {
-                                configFileName: helpers.root('src','tsconfig.spec.json'),
+                                configFileName: helpers.root('src', 'tsconfig.spec.json'),
                                 // use inline sourcemaps for "karma-remap-coverage" reporter (if coverage is activated)
                                 sourceMap: !hasCoverage,
                                 inlineSourceMap: hasCoverage,
@@ -66,15 +66,6 @@ const getConfig = (hasCoverage, isTddMode) => {
                     ],
                     exclude: [/\.e2e\.ts$/]
                 },
-                {
-                    test: /\.css$/,
-                    loader: ['to-string-loader', 'css-loader']
-                },
-                {
-                  test: /\.(scss|sass)$/,
-                  use: ['to-string-loader', 'css-loader', 'sass-loader'],
-                  exclude: [helpers.root('src', 'scss')]
-                },
                 {
                     test: /\.html$/,
                     loader: 'raw-loader'
@@ -92,11 +83,11 @@ const getConfig = (hasCoverage, isTddMode) => {
             }),
             // Fixes linker warnings (see https://github.com/angular/angular/issues/11580)
             new ContextReplacementPlugin(
-              // The (\\|\/) piece accounts for path separators in *nix and Windows
-              /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
-              helpers.root('src'), // location of your src
-              {} // a map of your routes
-            ),
+                // fixes WARNING Critical dependency: the request of a dependency is an expression
+                /(.+)?angular(\\|\/)core(.+)?/,
+                helpers.root('src'), // location of your src
+                {} // a map of your routes
+              ),
         ].concat(extraPlugins),
 
         performance: {

demo/.angular-cli.json

@@ -5,8 +5,9 @@
   },
   "apps": [
     {
+      "name": "bsr",
       "root": "src",
-      "outDir": "dist",
+      "outDir": "dist/browser",
       "assets": [
         "assets",
         "favicon.ico"
@@ -27,13 +28,14 @@
       "environmentSource": "environments/environment.ts",
       "environments": {
         "dev": "environments/environment.ts",
+        "hmr": "environments/environment.hmr.ts",
         "prod": "environments/environment.prod.ts"
       }
     },
     {
       "name": "ssr",
       "root": "src",
-      "outDir": "dist-server",
+      "outDir": "dist/server",
       "assets": [
         "assets",
         "favicon.ico"
@@ -49,7 +51,7 @@
         "styles.scss"
       ],
       "scripts": [
-        "../node_modules/wowjs/dist/wow.min.js"
+        "../node_modules/wowjs/dist/wow.js"
       ],
       "environmentSource": "environments/environment.ts",
       "environments": {

demo/.gitignore

@@ -2,7 +2,6 @@
 
 # compiled output
 /dist
-/dist-server
 /tmp
 /out-tsc
 

demo/README.md

@@ -1,6 +1,6 @@
 # ngx-wow-demo
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.4.1.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.6.0.
 
 ## Development server
 
@@ -21,7 +21,6 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
 ## Running end-to-end tests
 
 Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-Before running the tests make sure you are serving the app via `ng serve`.
 
 ## Further help
 

demo/package.json

@@ -14,33 +14,34 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^4.2.4",
-    "@angular/common": "^4.2.4",
-    "@angular/compiler": "^4.2.4",
-    "@angular/core": "^4.2.4",
-    "@angular/forms": "^4.2.4",
-    "@angular/http": "^4.2.4",
-    "@angular/platform-browser": "^4.2.4",
-    "@angular/platform-browser-dynamic": "^4.2.4",
-    "@angular/router": "^4.2.4",
+    "@angular/animations": "^5.0.0",
+    "@angular/common": "^5.0.0",
+    "@angular/compiler": "^5.0.0",
+    "@angular/core": "^5.0.0",
+    "@angular/forms": "^5.0.0",
+    "@angular/http": "^5.0.0",
+    "@angular/platform-browser": "^5.0.0",
+    "@angular/platform-browser-dynamic": "^5.0.0",
+    "@angular/router": "^5.0.0",
     "@ng-bootstrap/ng-bootstrap": "1.0.0-beta.3",
     "bootstrap": "4.0.0-beta",
     "core-js": "^2.4.1",
     "font-awesome": "^4.7.0",
     "include-media": "^1.4.9",
-    "rxjs": "^5.4.2",
+    "rxjs": "^5.5.2",
     "wowjs": "^1.1.3",
-    "zone.js": "^0.8.14"
+    "zone.js": "^0.8.14",
+    "@angular/platform-server": "^5.0.0"
   },
   "devDependencies": {
-    "@angular/cli": "1.4.7",
-    "@angular/compiler-cli": "^4.2.4",
-    "@angular/language-service": "^4.2.4",
-    "@angular/platform-server": "^4.2.4",
+    "@angular/cli": "1.6.0",
+    "@angular/compiler-cli": "^5.0.0",
+    "@angular/language-service": "^5.0.0",
+    "@angularclass/hmr": "~2.1.3",
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
-    "codelyzer": "~3.2.0",
+    "codelyzer": "^4.0.1",
     "jasmine-core": "~2.6.2",
     "jasmine-spec-reporter": "~4.1.0",
     "karma": "~1.7.0",
@@ -52,11 +53,12 @@
     "protractor": "~5.1.2",
     "ts-node": "~3.2.0",
     "tslint": "~5.7.0",
-    "typescript": "~2.3.3",
+    "typescript": "~2.4.2",
     "ts-loader": "~2.3.7",
     "reflect-metadata": "~0.1.10",
     "webpack-node-externals": "~1.6.0",
-    "@nguniversal/express-engine": "~1.0.0-beta.3",
-    "@nguniversal/module-map-ngfactory-loader": "~1.0.0-beta.3"
+    "express": "^4.16.2",
+    "@nguniversal/express-engine": "^5.0.0-beta.5",
+    "@nguniversal/module-map-ngfactory-loader": "^5.0.0-beta.5"
   }
 }

demo/prerender.ts

@@ -1,35 +1,45 @@
 // Load zone.js for the server.
 import 'zone.js/dist/zone-node';
 import 'reflect-metadata';
-import { readFileSync, writeFileSync } from 'fs';
+import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
 import { join } from 'path';
 
+import { enableProdMode } from '@angular/core';
+// Faster server renders w/ Prod mode (dev mode never needed)
+enableProdMode();
+
 // Express Engine
 import { ngExpressEngine } from '@nguniversal/express-engine';
 // Import module map for lazy loading
 import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader';
-
 import { renderModuleFactory } from '@angular/platform-server';
+import { ROUTES } from './static.paths';
 
 // * NOTE :: leave this as require() since this file is built Dynamically from webpack
-const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist-server/main.bundle');
-
-const DIST_FOLDER = join(process.cwd(), 'dist');
-
-// Load the index.html file containing references to your application bundle.
-const index = readFileSync(join(DIST_FOLDER, 'index.html'), 'utf8');
-
-
-// Writes rendered HTML to ./dist/index.html, replacing the file if it already exists.
-renderModuleFactory(AppServerModuleNgFactory, {
-  document: index,
-  url: '/',
-  extraProviders: [
-    provideModuleMap(LAZY_MODULE_MAP)
-  ]
-})
-  .then(html => {
-    console.log(`Replacing 'index.html' file at '${DIST_FOLDER}/index.html'`);
-    writeFileSync(join(DIST_FOLDER, 'index.html'), html);
-    console.log(`File 'index.html' successfully replaced with server-side version!`);
-  });
+const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main.bundle');
+
+const BROWSER_FOLDER = join(process.cwd(), 'dist', 'browser');
+
+// Load the index.html file containing referances to your application bundle.
+const index = readFileSync(join(BROWSER_FOLDER, 'index.html'), 'utf8');
+
+let previousRender = Promise.resolve();
+
+// Iterate each route path
+ROUTES.forEach(route => {
+  var fullPath = join(BROWSER_FOLDER, route);
+
+  // Make sure the directory structure is there
+  if(!existsSync(fullPath)){
+    mkdirSync(fullPath);
+  }
+
+  // Writes rendered HTML to index.html, replacing the file if it already exists.
+  previousRender = previousRender.then(_ => renderModuleFactory(AppServerModuleNgFactory, {
+    document: index,
+    url: route,
+    extraProviders: [
+      provideModuleMap(LAZY_MODULE_MAP)
+    ]
+  })).then(html => writeFileSync(join(fullPath, 'index.html'), html));
+});

demo/server.ts

@@ -1,5 +1,7 @@
+// These are important and needed before anything else
 import 'zone.js/dist/zone-node';
 import 'reflect-metadata';
+
 import { renderModuleFactory } from '@angular/platform-server';
 import { enableProdMode } from '@angular/core';
 
@@ -17,42 +19,39 @@ const PORT = process.env.PORT || 4000;
 const DIST_FOLDER = join(process.cwd(), 'dist');
 
 // Our index.html we'll use as our template
-const template = readFileSync(join(DIST_FOLDER, 'index.html')).toString();
+const template = readFileSync(join(DIST_FOLDER, 'browser', 'index.html')).toString();
 
 // * NOTE :: leave this as require() since this file is built Dynamically from webpack
-const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist-server/main.bundle');
-
-// Express Engine
-import { ngExpressEngine } from '@nguniversal/express-engine';
-// Import module map for lazy loading
-import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader';
-
-// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
-app.engine('html', ngExpressEngine({
-  bootstrap: AppServerModuleNgFactory,
-  providers: [
-    provideModuleMap(LAZY_MODULE_MAP)
-  ]
-}));
+const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main.bundle');
+
+const { provideModuleMap } = require('@nguniversal/module-map-ngfactory-loader');
+
+app.engine('html', (_, options, callback) => {
+  renderModuleFactory(AppServerModuleNgFactory, {
+    // Our index.html
+    document: template,
+    url: options.req.url,
+    // DI so that we can get lazy-loading to work differently (since we need it to just instantly render it)
+    extraProviders: [
+      provideModuleMap(LAZY_MODULE_MAP)
+    ]
+  }).then(html => {
+    callback(null, html);
+  });
+});
 
 app.set('view engine', 'html');
-app.set('views', DIST_FOLDER);
-
-/* - Example Express Rest API endpoints -
-  app.get('/api/**', (req, res) => { });
-*/
+app.set('views', join(DIST_FOLDER, 'browser'));
 
-// Server static files from 'dist/'
-app.get('*.*', express.static(DIST_FOLDER, {
-  maxAge: '1y'
-}));
+// Server static files from /browser
+app.get('*.*', express.static(join(DIST_FOLDER, 'browser')));
 
-// ALl regular routes use the Universal engine
+// All regular routes use the Universal engine
 app.get('*', (req, res) => {
-  res.render('index', { req });
+  res.render(join(DIST_FOLDER, 'browser', 'index.html'), { req });
 });
 
 // Start up the Node server
 app.listen(PORT, () => {
-  console.log(`Node Express server listening on http://localhost:${PORT}`);
+  console.log(`Node server listening on http://localhost:${PORT}`);
 });

demo/src/environments/environment.hmr.ts

@@ -0,0 +1,4 @@
+export const environment = {
+  production: false,
+  hmr: true
+};