From e430a813cd9d7afc11718875f34c3aeceb940d0e Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Fri, 1 Sep 2017 13:23:59 -0400 Subject: [PATCH 1/5] chore(package): update generated app deps --- src/test/get-expected-files.js | 1 + templates/app/_package.json | 61 +++++++++++------------ templates/app/postcss.config.js | 7 +++ templates/app/protractor.conf.js | 11 +++- templates/app/webpack.make.js | 11 ---- templates/endpoint/basename.controller.js | 4 +- 6 files changed, 48 insertions(+), 47 deletions(-) create mode 100644 templates/app/postcss.config.js diff --git a/src/test/get-expected-files.js b/src/test/get-expected-files.js index 235c42caf..9940d5830 100644 --- a/src/test/get-expected-files.js +++ b/src/test/get-expected-files.js @@ -100,6 +100,7 @@ export function app(options) { 'karma.conf.js', 'mocha.conf.js', 'mocha.global.js', + 'postcss.config.js', 'protractor.conf.js', 'README.md', 'spec.js', diff --git a/templates/app/_package.json b/templates/app/_package.json index ceea38d0a..9862e4923 100644 --- a/templates/app/_package.json +++ b/templates/app/_package.json @@ -6,14 +6,14 @@ "core-js": "^2.4.1", "cors": "^2.8.1", "express": "^4.13.3", - "morgan": "~1.7.0", + "morgan": "~1.8.2", "body-parser": "^1.13.3", "method-override": "^2.3.5", "cookie-parser": "^1.3.5", "express-session": "^1.11.3", "errorhandler": "^1.4.2", "composable-middleware": "^0.3.0", - "fast-json-patch": "^1.0.0", + "fast-json-patch": "^2.0.5", "lodash": "^4.17.4", "lodash-es": "^4.17.4", "lusca": "^1.4.1", @@ -37,7 +37,7 @@ "express-sequelize-session": "0.4.0",<% } %><% if(filters.auth) { %> "jsonwebtoken": "^7.0.0", "express-jwt": "^5.0.0", - "passport": "~0.3.0", + "passport": "~0.4.0", "passport-local": "^1.0.0",<% } %><% if(filters.facebookAuth) { %> "passport-facebook": "^2.0.0",<% } %><% if(filters.twitterAuth) { %> "passport-twitter": "^1.0.3",<% } %><% if(filters.googleAuth) { %> @@ -73,16 +73,16 @@ "@types/lodash": "^4.14.63", <%_ if(filters.mocha) { -%> "@types/mocha": "^2.2.41", - "@types/chai": "^3.5.2", + "@types/chai": "^4.0.4", "@types/sinon": "^2.1.3", "@types/sinon-chai": "^2.7.27", <%_ } -%> - "@types/node": "^7.0.14", + "@types/node": "^8.0.26", "@types/selenium-webdriver": "^3.0.3", "@types/webpack": "^2.2.15", <%_ } -%> "angular2-universal": "2.1.0-rc.1", - "angular2-jwt": "^0.1.28", + "angular2-jwt": "^0.2.3", <% if(filters.auth) { %> "angular-validation-match": "^1.9.0",<% } %> <% if(filters.uirouter) { %> @@ -107,23 +107,23 @@ <%# END CLIENT %> - "autoprefixer": "^6.0.0", + "autoprefixer": "^7.1.3", "babel-core": "^6.6.5", "babel-eslint": "^6.0.4", "babel-register": "^6.16.0", "bs-fullscreen-message": "^1.0.0", <%_ if(filters.flow) { -%> - "flow-bin": "^0.31.0", + "flow-bin": "^0.54.0", "babel-plugin-syntax-flow": "^6.8.0", "babel-plugin-transform-flow-comments": "^6.8.0",<% } %> "babel-plugin-transform-class-properties": "^6.6.0", "babel-plugin-transform-runtime": "^6.6.0", - "babel-plugin-istanbul": "^3.1.0", + "babel-plugin-istanbul": "^4.1.4", "babel-preset-es2015": "^6.6.0", "eslint": "^2.12.0", - "del": "^2.0.2", + "del": "^3.0.0", "gulp": "^3.9.1", - "gulp-babel": "^6.1.2",<% if(filters.ts) { %> + "gulp-babel": "^7.0.0",<% if(filters.ts) { %> "gulp-typescript": "~2.13.0", "gulp-typings": "^1.3.6", "gulp-tslint": "^5.0.0",<% } %> @@ -138,44 +138,41 @@ <%# "gulp-node-inspector": "^0.1.0", %> "gulp-plumber": "^1.0.1", "gulp-protractor": "^3.0.0", - "gulp-rev": "^7.0.0", + "gulp-rev": "^8.0.0", "gulp-rev-replace": "^0.4.2", "gulp-sort": "^2.0.0", - "gulp-sourcemaps": "^1.5.2", + "gulp-sourcemaps": "^2.6.1", "gulp-util": "^3.0.5", "gulp-watch": "^4.3.5", - "gulp-stylint": "^3.0.0", + "gulp-stylint": "^4.0.0", "grunt": "^1.0.1", "grunt-build-control": "^0.7.0", "isparta": "^4.0.0", "nodemon": "^1.3.7", - "run-sequence": "^1.1.0", + "run-sequence": "^2.1.0", "lazypipe": "^1.0.1", <%# WEBPACK %> "webpack": "^2.3.1", "webpack-dev-server": "^2.4.2", "extract-text-webpack-plugin": "2.0.0", "html-webpack-plugin": "^2.24.1", - "html-webpack-harddisk-plugin": "~0.0.2", + "html-webpack-harddisk-plugin": "~0.1.0", <%_ if(filters.pug) { _%> "pug-html-loader": "^1.0.8",<% } %> "typescript": "^2.2.1", "awesome-typescript-loader": "^3.1.2", - "ng-annotate-loader": "~0.1.0", - "babel-loader": "^6.2.4", - "css-loader": "^0.24.0", - "file-loader": "^0.9.0", - "imports-loader": "^0.6.5", - "isparta-instrumenter-loader": "^1.0.0", - "isparta-loader": "^2.0.0", - "istanbul-instrumenter-loader": "^0.2.0", + "babel-loader": "^7.1.2", + "css-loader": "^0.28.7", + "file-loader": "^0.11.2", + "imports-loader": "^0.7.1", + "istanbul-instrumenter-loader": "^3.0.0", "null-loader": "^0.1.1", - "postcss-loader": "^0.11.1", + "postcss-loader": "^2.0.6", "raw-loader": "^0.5.1", "style-loader": "^0.13.0", <%_ if(filters.sass) { _%> - "node-sass": "^3.8.0", - "sass-loader": "^4.0.1",<% } %> + "node-sass": "^4.5.3", + "sass-loader": "^6.0.6",<% } %> <%_ if(filters.less) { _%> "less": "^2.7.1", "less-loader": "^2.2.3",<% } %> @@ -187,9 +184,9 @@ "through2": "^2.0.1", "open": "~0.0.4", "istanbul": "1.1.0-alpha.1", - "chai": "^3.2.0", - "sinon": "^1.16.1", - "chai-as-promised": "^5.1.0", + "chai": "^4.1.2", + "sinon": "^3.2.1", + "chai-as-promised": "^7.1.1", "chai-things": "^0.2.0", "karma": "~0.13.3", "karma-firefox-launcher": "^1.0.0", @@ -202,13 +199,13 @@ "sinon-chai": "^2.8.0", "mocha": "^3.0.2",<% if(filters.mocha) { %> "karma-mocha": "^1.0.1", - "karma-chai-plugins": "~0.7.0",<% } if(filters.jasmine) { %> + "karma-chai-plugins": "~0.9.0",<% } if(filters.jasmine) { %> "jasmine-core": "^2.3.4", "karma-jasmine": "^1.0.2", "jasmine-spec-reporter": "^2.4.0",<% } %> "phantomjs-prebuilt": "^2.1.4", "proxyquire": "^1.0.1", - "strip-ansi": "^3.0.1", + "strip-ansi": "^4.0.0", "supertest": "^1.1.0"<% if(filters.ts) { %>, "tslint": "^3.5.0"<% } %> }, diff --git a/templates/app/postcss.config.js b/templates/app/postcss.config.js new file mode 100644 index 000000000..e11c67f14 --- /dev/null +++ b/templates/app/postcss.config.js @@ -0,0 +1,7 @@ +const autoprefixer = require('autoprefixer'); + +module.exports = (ctx) => ({ + plugins: [ + autoprefixer(ctx.plugin), + ] +}); diff --git a/templates/app/protractor.conf.js b/templates/app/protractor.conf.js index 4f3e10eef..941481bab 100644 --- a/templates/app/protractor.conf.js +++ b/templates/app/protractor.conf.js @@ -76,9 +76,16 @@ var config = { Object.getOwnPropertyDescriptor(Object.prototype, 'should') ); <% } if (filters.jasmine) { %> - var SpecReporter = require('jasmine-spec-reporter'); + var SpecReporter = require('jasmine-spec-reporter').SpecReporter; // add jasmine spec reporter - jasmine.getEnv().addReporter(new SpecReporter({displayStacktrace: true})); + jasmine.getEnv().addReporter(new SpecReporter({ + spec: { + displayStacktrace: true + }, + summary: { + displayStacktrace: true + } + })); <% } %> var serverConfig = config.params.serverConfig;<% if (filters.mongoose) { %> diff --git a/templates/app/webpack.make.js b/templates/app/webpack.make.js index edb4f09d2..e87d98c06 100644 --- a/templates/app/webpack.make.js +++ b/templates/app/webpack.make.js @@ -2,7 +2,6 @@ /*eslint-env node*/ const _ = require('lodash'); var webpack = require('webpack'); -var autoprefixer = require('autoprefixer'); var HtmlWebpackPlugin = require('html-webpack-plugin'); var HtmlWebpackHarddiskPlugin = require('html-webpack-harddisk-plugin'); var ExtractTextPlugin = require('extract-text-webpack-plugin'); @@ -227,16 +226,6 @@ module.exports = function makeWebpackConfig(options) { options: { context: __dirname }, - /** - * PostCSS - * Reference: https://github.com/postcss/autoprefixer-core - * Add vendor prefixes to your css - */ - postcss: [ - autoprefixer({ - browsers: ['last 2 version'] - }) - ], <%_ if(filters.sass) { -%> sassLoader: { outputStyle: 'compressed', diff --git a/templates/endpoint/basename.controller.js b/templates/endpoint/basename.controller.js index 301d61cf2..a97d38bd6 100644 --- a/templates/endpoint/basename.controller.js +++ b/templates/endpoint/basename.controller.js @@ -10,7 +10,7 @@ 'use strict';<% if(filters.models) { %> -import jsonpatch from 'fast-json-patch';<% if(filters.mongooseModels) { %> +import { applyPatch } from 'fast-json-patch';<% if(filters.mongooseModels) { %> import <%= classedName %> from './<%= basename %>.model';<% } if(filters.sequelizeModels) { %> import {<%= classedName %>} from '<%= relativeRequire(config.get('registerModelsFile')) %>';<% } %> @@ -27,7 +27,7 @@ function respondWithResult(res, statusCode) { function patchUpdates(patches) { return function(entity) { try { - jsonpatch.apply(entity, patches, /*validate*/ true); + applyPatch(entity, patches, /*validate*/ true); } catch(err) { return Promise.reject(err); } From 94ce6bf1336ef0b4be9646a70860772b93fcf957 Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Fri, 1 Sep 2017 14:30:19 -0400 Subject: [PATCH 2/5] chore(package): bump some more stuff --- templates/app/_package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/app/_package.json b/templates/app/_package.json index 9862e4923..18680db09 100644 --- a/templates/app/_package.json +++ b/templates/app/_package.json @@ -109,7 +109,7 @@ "autoprefixer": "^7.1.3", "babel-core": "^6.6.5", - "babel-eslint": "^6.0.4", + "babel-eslint": "^7.2.3", "babel-register": "^6.16.0", "bs-fullscreen-message": "^1.0.0", <%_ if(filters.flow) { -%> @@ -124,7 +124,7 @@ "del": "^3.0.0", "gulp": "^3.9.1", "gulp-babel": "^7.0.0",<% if(filters.ts) { %> - "gulp-typescript": "~2.13.0", + "gulp-typescript": "~3.2.2", "gulp-typings": "^1.3.6", "gulp-tslint": "^5.0.0",<% } %> "gulp-env": "^0.4.0", @@ -175,10 +175,10 @@ "sass-loader": "^6.0.6",<% } %> <%_ if(filters.less) { _%> "less": "^2.7.1", - "less-loader": "^2.2.3",<% } %> + "less-loader": "^4.0.5",<% } %> <%_ if(filters.stylus) { _%> "stylus": "^0.54.5", - "stylus-loader": "^2.1.1",<% } %> + "stylus-loader": "^3.0.1",<% } %> "karma-webpack": "^2.0.3", <%# END WEBPACK %> "through2": "^2.0.1", @@ -188,7 +188,7 @@ "sinon": "^3.2.1", "chai-as-promised": "^7.1.1", "chai-things": "^0.2.0", - "karma": "~0.13.3", + "karma": "^1.7.1", "karma-firefox-launcher": "^1.0.0", "karma-script-launcher": "^1.0.0", "karma-coverage": "^1.0.0", @@ -206,7 +206,7 @@ "phantomjs-prebuilt": "^2.1.4", "proxyquire": "^1.0.1", "strip-ansi": "^4.0.0", - "supertest": "^1.1.0"<% if(filters.ts) { %>, + "supertest": "^3.0.0"<% if(filters.ts) { %>, "tslint": "^3.5.0"<% } %> }, "engines": { From 6616021801541fb314ce42eb5110715d2a892c6c Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Fri, 1 Sep 2017 14:38:17 -0400 Subject: [PATCH 3/5] chore(package): bump tslint deps --- templates/app/_package.json | 4 ++-- templates/app/client/tslint.json(ts) | 3 +-- templates/app/gulpfile.babel.js | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/templates/app/_package.json b/templates/app/_package.json index 18680db09..946e5f9a5 100644 --- a/templates/app/_package.json +++ b/templates/app/_package.json @@ -126,7 +126,7 @@ "gulp-babel": "^7.0.0",<% if(filters.ts) { %> "gulp-typescript": "~3.2.2", "gulp-typings": "^1.3.6", - "gulp-tslint": "^5.0.0",<% } %> + "gulp-tslint": "^8.0.0",<% } %> "gulp-env": "^0.4.0", "gulp-eslint": "^2.0.0", "gulp-imagemin": "^3.0.1", @@ -207,7 +207,7 @@ "proxyquire": "^1.0.1", "strip-ansi": "^4.0.0", "supertest": "^3.0.0"<% if(filters.ts) { %>, - "tslint": "^3.5.0"<% } %> + "tslint": "^5.7.0"<% } %> }, "engines": { "node": "^6.2.2", diff --git a/templates/app/client/tslint.json(ts) b/templates/app/client/tslint.json(ts) index 6809bfe0c..01bfb35a0 100644 --- a/templates/app/client/tslint.json(ts) +++ b/templates/app/client/tslint.json(ts) @@ -29,7 +29,6 @@ "no-trailing-whitespace": true, "no-unused-expression": true, "no-unused-variable": true, - "no-unreachable": true, "no-use-before-declare": true, "one-line": [true, "check-open-brace", @@ -58,4 +57,4 @@ "check-type" ] } -} \ No newline at end of file +} diff --git a/templates/app/gulpfile.babel.js b/templates/app/gulpfile.babel.js index 25eaa84c0..5e4e054e5 100644 --- a/templates/app/gulpfile.babel.js +++ b/templates/app/gulpfile.babel.js @@ -97,8 +97,8 @@ function whenServerReady(cb) { let lintClientScripts = lazypipe()<% if(filters.babel) { %> .pipe(plugins.eslint, `${clientPath}/.eslintrc`) .pipe(plugins.eslint.format);<% } %><% if(filters.ts) { %> - .pipe(plugins.tslint, require(`./${clientPath}/tslint.json`)) - .pipe(plugins.tslint.report, 'verbose', {emitError: false});<% } %> + .pipe(plugins.tslint, { formatter: 'verbose' }) + .pipe(plugins.tslint.report, {emitError: false});<% } %> const lintClientTestScripts = lazypipe() <%_ if(filters.babel) { -%> @@ -113,8 +113,8 @@ const lintClientTestScripts = lazypipe() .pipe(plugins.eslint.format); <%_ } -%> <%_ if(filters.ts) { -%> - .pipe(plugins.tslint, require(`./${clientPath}/tslint.json`)) - .pipe(plugins.tslint.report, 'verbose', {emitError: false}); + .pipe(plugins.tslint, { formatter: 'verbose' }) + .pipe(plugins.tslint.report, {emitError: false}); <%_ } -%> let lintServerScripts = lazypipe() From 77affc3af4a3356e4f9ab8efd539fe0dff7d45f9 Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Fri, 1 Sep 2017 15:07:48 -0400 Subject: [PATCH 4/5] chore(package): update some mo' --- templates/app/_package.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/templates/app/_package.json b/templates/app/_package.json index 946e5f9a5..b3e161ffe 100644 --- a/templates/app/_package.json +++ b/templates/app/_package.json @@ -44,7 +44,7 @@ "passport-google-oauth20": "^1.0.0",<% } %><% if(filters.ws) { %> "primus": "^7.0.1", "primus-emit": "^1.0.0", - "uws": "^0.14.5",<% } %> + "uws": "^8.14.1",<% } %> "serve-favicon": "^2.3.0", "shrink-ray": "^0.1.3" }, @@ -64,7 +64,7 @@ "@angular/platform-browser-dynamic": "^4.3.3", "@angular/router": "^4.3.3", <%#"@angular/material": "^2.0.0-alpha.10",%> - "@angularclass/hmr": "^1.2.1", + "@angularclass/hmr": "^2.1.3", <%_ if(filters.ts) { -%> "@types/core-js": "^0.9.41", <%_ if(filters.jasmine) { -%> @@ -125,7 +125,6 @@ "gulp": "^3.9.1", "gulp-babel": "^7.0.0",<% if(filters.ts) { %> "gulp-typescript": "~3.2.2", - "gulp-typings": "^1.3.6", "gulp-tslint": "^8.0.0",<% } %> "gulp-env": "^0.4.0", "gulp-eslint": "^2.0.0", @@ -134,7 +133,7 @@ "gulp-istanbul": "^1.1.1", "gulp-istanbul-enforcer": "^1.0.3", "gulp-load-plugins": "^1.0.0-rc.1", - "gulp-mocha": "^2.1.3", + "gulp-mocha": "^4.3.1", <%# "gulp-node-inspector": "^0.1.0", %> "gulp-plumber": "^1.0.1", "gulp-protractor": "^3.0.0", @@ -169,7 +168,7 @@ "null-loader": "^0.1.1", "postcss-loader": "^2.0.6", "raw-loader": "^0.5.1", - "style-loader": "^0.13.0", + "style-loader": "^0.18.2", <%_ if(filters.sass) { _%> "node-sass": "^4.5.3", "sass-loader": "^6.0.6",<% } %> @@ -202,7 +201,7 @@ "karma-chai-plugins": "~0.9.0",<% } if(filters.jasmine) { %> "jasmine-core": "^2.3.4", "karma-jasmine": "^1.0.2", - "jasmine-spec-reporter": "^2.4.0",<% } %> + "jasmine-spec-reporter": "^4.2.1",<% } %> "phantomjs-prebuilt": "^2.1.4", "proxyquire": "^1.0.1", "strip-ansi": "^4.0.0", From d32cd837fb2890208dd7950764bc059bff3a19a2 Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Fri, 1 Sep 2017 15:28:43 -0400 Subject: [PATCH 5/5] chore(package): update webpack, ngx-bootstrap --- templates/app/_package.json | 8 ++++---- templates/app/client/app/main/main.module.js | 2 +- templates/app/client/components/directives.module.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/app/_package.json b/templates/app/_package.json index b3e161ffe..474fa5e5a 100644 --- a/templates/app/_package.json +++ b/templates/app/_package.json @@ -79,7 +79,7 @@ <%_ } -%> "@types/node": "^8.0.26", "@types/selenium-webdriver": "^3.0.3", - "@types/webpack": "^2.2.15", + "@types/webpack": "^3.0.10", <%_ } -%> "angular2-universal": "2.1.0-rc.1", "angular2-jwt": "^0.2.3", @@ -91,7 +91,7 @@ <% if(filters.bootstrap) { %> "bootstrap": "~3.3.7", <% if(filters.uibootstrap) { %> - "ng2-bootstrap": "~1.1.16",<% } %> + "ngx-bootstrap": "~1.6.3",<% } %> <% if(filters.sass) { %> "bootstrap-sass": "~3.3.7",<% } %> <% if(filters.stylus) { %> @@ -151,9 +151,9 @@ "run-sequence": "^2.1.0", "lazypipe": "^1.0.1", <%# WEBPACK %> - "webpack": "^2.3.1", + "webpack": "^3.5.5", "webpack-dev-server": "^2.4.2", - "extract-text-webpack-plugin": "2.0.0", + "extract-text-webpack-plugin": "3.0.0", "html-webpack-plugin": "^2.24.1", "html-webpack-harddisk-plugin": "~0.1.0", <%_ if(filters.pug) { _%> diff --git a/templates/app/client/app/main/main.module.js b/templates/app/client/app/main/main.module.js index be854b84c..9c5e336c0 100644 --- a/templates/app/client/app/main/main.module.js +++ b/templates/app/client/app/main/main.module.js @@ -6,7 +6,7 @@ import { UIRouterModule } from 'ui-router-ng2';<% } %> <%_ if(filters.ngroute) { %> import { RouterModule, Routes } from '@angular/router';<% } %> <%_ if(filters.uibootstrap) { %> -import { TooltipModule } from 'ng2-bootstrap';<% } %> +import { TooltipModule } from 'ngx-bootstrap';<% } %> import { MainComponent } from './main.component'; <%_ if(filters.ws) { -%> diff --git a/templates/app/client/components/directives.module.js b/templates/app/client/components/directives.module.js index 5a00076b7..3c3232919 100644 --- a/templates/app/client/components/directives.module.js +++ b/templates/app/client/components/directives.module.js @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { CollapseModule } from 'ng2-bootstrap'; +import { CollapseModule } from 'ngx-bootstrap'; <%_ if (filters.uirouter) { -%> import { UIRouterModule } from 'ui-router-ng2';<% } %>