update angular and libs

This commit is contained in:
Kyle Spearrin 2018-09-11 17:30:44 -04:00
parent 67b187f884
commit 335e0dd575
7 changed files with 1559 additions and 1949 deletions

View File

@ -24,6 +24,10 @@ function webfonts() {
.pipe(gulp.dest(paths.cssDir));
};
function cleanupNodeTypes() {
return del(['./jslib/node_modules/@types/node/']);
}
function version() {
fs.writeFileSync(paths.build + 'version.json', '{"version":"' + package.version + '"}');
}
@ -31,5 +35,7 @@ function version() {
gulp.task('clean', clean);
gulp.task('webfonts', ['clean'], webfonts);
gulp.task('prebuild', ['webfonts']);
gulp.task('cleanupNodeTypes', cleanupNodeTypes);
gulp.task('predist', ['cleanupNodeTypes']);
gulp.task('version', version);
gulp.task('postdist', ['version']);

2
jslib

@ -1 +1 @@
Subproject commit d0ad8650605ec506704ed76f13f40fd4d33cffcd
Subproject commit b6ee31879f07a0115099001afd7e7ac367edad2c

3408
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -15,78 +15,77 @@
"build:selfhost:prod": "gulp prebuild && cross-env SELF_HOST=true NODE_ENV=production webpack --config webpack.config.js",
"build:selfhost:prod:watch": "gulp prebuild && cross-env SELF_HOST=true NODE_ENV=production webpack-serve --config webpack.config.js",
"clean:l10n": "git push origin --delete l10n_master",
"dist": "npm run build:prod && gulp postdist",
"dist:selfhost": "npm run build:selfhost:prod && gulp postdist",
"dist": "gulp predist && npm run build:prod && gulp postdist",
"dist:selfhost": "gulp predist && npm run build:selfhost:prod && gulp postdist",
"deploy": "npm run dist && gh-pages -d build",
"deploy:preview": "npm run dist && gh-pages -d build -r git@github.com:kspearrin/web-preview.git",
"lint": "tslint src/**/*.ts || true",
"lint:fix": "tslint src/**/*.ts --fix"
},
"devDependencies": {
"@angular/compiler-cli": "5.2.0",
"@ngtools/webpack": "1.10.2",
"@types/jquery": "^3.3.2",
"@angular/compiler-cli": "^6.1.7",
"@ngtools/webpack": "^6.2.1",
"@types/jquery": "^3.3.6",
"@types/lunr": "^2.1.6",
"@types/node": "8.0.19",
"@types/node-forge": "0.6.10",
"@types/papaparse": "4.1.33",
"@types/node-forge": "^0.7.5",
"@types/papaparse": "^4.5.3",
"@types/webcrypto": "^0.0.28",
"@types/webpack": "^4.4.11",
"angular2-template-loader": "^0.6.2",
"clean-webpack-plugin": "^0.1.19",
"copy-webpack-plugin": "^4.5.1",
"cross-env": "^5.1.4",
"css-loader": "^0.28.11",
"copy-webpack-plugin": "^4.5.2",
"cross-env": "^5.2.0",
"css-loader": "^1.0.0",
"del": "^3.0.0",
"extract-text-webpack-plugin": "next",
"file-loader": "^1.1.11",
"file-loader": "^2.0.0",
"gh-pages": "^1.2.0",
"gulp": "^3.9.1",
"gulp-google-webfonts": "^2.0.0",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^3.2.0",
"node-sass": "^4.9.2",
"sass-loader": "^7.0.2",
"style-loader": "^0.21.0",
"ts-loader": "^4.3.1",
"tslint": "^5.10.0",
"node-sass": "^4.9.3",
"sass-loader": "^7.1.0",
"style-loader": "^0.23.0",
"ts-loader": "^5.1.0",
"tslint": "^5.11.0",
"tslint-loader": "^3.6.0",
"typescript": "^2.7.2",
"webpack": "^4.10.2",
"webpack-cli": "^3.0.2",
"webpack-serve": "^1.0.2"
"webpack": "^4.18.0",
"webpack-cli": "^3.1.0",
"webpack-serve": "^2.0.2"
},
"dependencies": {
"@angular/animations": "5.2.0",
"@angular/common": "5.2.0",
"@angular/compiler": "5.2.0",
"@angular/core": "5.2.0",
"@angular/forms": "5.2.0",
"@angular/http": "5.2.0",
"@angular/platform-browser": "5.2.0",
"@angular/platform-browser-dynamic": "5.2.0",
"@angular/router": "5.2.0",
"@angular/upgrade": "5.2.0",
"@angular/animations": "6.1.7",
"@angular/common": "6.1.7",
"@angular/compiler": "6.1.7",
"@angular/core": "6.1.7",
"@angular/forms": "6.1.7",
"@angular/http": "6.1.7",
"@angular/platform-browser": "6.1.7",
"@angular/platform-browser-dynamic": "6.1.7",
"@angular/router": "6.1.7",
"@angular/upgrade": "6.1.7",
"@aspnet/signalr": "1.0.3",
"@aspnet/signalr-protocol-msgpack": "1.0.3",
"angular2-toaster": "4.0.2",
"angulartics2": "5.0.1",
"angular2-toaster": "6.1.0",
"angulartics2": "6.3.0",
"bootstrap": "4.1.3",
"core-js": "2.4.1",
"core-js": "2.5.7",
"duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
"font-awesome": "4.7.0",
"jquery": "3.3.1",
"lunr": "2.3.3",
"mousetrap": "1.6.1",
"ngx-infinite-scroll": "0.8.4",
"node-forge": "0.7.1",
"papaparse": "4.3.5",
"ngx-infinite-scroll": "6.0.1",
"node-forge": "0.7.6",
"papaparse": "4.6.0",
"popper.js": "1.14.4",
"qrious": "4.0.2",
"rxjs": "5.5.6",
"rxjs": "6.3.2",
"sweetalert": "2.1.0",
"web-animations-js": "2.3.1",
"webcrypto-shim": "0.1.4",
"whatwg-fetch": "^2.0.4",
"zone.js": "0.8.19"
"whatwg-fetch": "3.0.0",
"zone.js": "0.8.26"
}
}

View File

@ -183,7 +183,7 @@ registerLocaleData(localeZhCn, 'zh-CN');
clearQueryParams: true,
},
}),
ToasterModule,
ToasterModule.forRoot(),
],
declarations: [
AcceptOrganizationComponent,

View File

@ -22,6 +22,7 @@
"node_modules",
"dist",
"build",
"jslib/node_modules",
"jslib/dist",
"jslib/spec",
"jslib/src/electron",

View File

@ -14,7 +14,7 @@ if (process.env.NODE_ENV == null) {
const ENV = process.env.ENV = process.env.NODE_ENV;
const extractCss = new ExtractTextPlugin({
filename: '[name].[chunkhash].css',
filename: '[name].[hash].css',
disable: false,
allChunks: true,
});
@ -73,7 +73,7 @@ const plugins = [
path.resolve(__dirname, 'build/*'),
]),
// ref: https://github.com/angular/angular/issues/20357
new webpack.ContextReplacementPlugin(/\@angular(\\|\/)core(\\|\/)esm5/,
new webpack.ContextReplacementPlugin(/\@angular(\\|\/)core(\\|\/)fesm5/,
path.resolve(__dirname, './src')),
new HtmlWebpackPlugin({
template: './src/index.html',
@ -136,7 +136,9 @@ const serve = {
cert: fs.readFileSync('dev-server' + certSuffix + '.pem'),
},
// host: '192.168.1.9',
hot: false,
// host client has issues. ref: https://github.com/webpack-contrib/webpack-serve/issues/233
// hotClient: false,
};
const config = {
@ -174,7 +176,7 @@ const config = {
modules: [path.resolve('node_modules')],
},
output: {
filename: '[name].[chunkhash].js',
filename: '[name].[hash].js',
path: path.resolve(__dirname, 'build'),
},
module: { rules: moduleRules },