Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Angular 9 #11262

Merged
merged 12 commits into from Mar 2, 2020
28 changes: 12 additions & 16 deletions generators/client/templates/angular/package.json.ejs
Expand Up @@ -27,14 +27,14 @@
"node_modules"
],
"dependencies": {
"@angular/common": "9.0.0",
"@angular/compiler": "9.0.0",
"@angular/core": "9.0.0",
"@angular/forms": "9.0.0",
"@angular/localize": "^9.0.0",
"@angular/platform-browser": "9.0.0",
"@angular/platform-browser-dynamic": "9.0.0",
"@angular/router": "9.0.0",
"@angular/common": "9.0.4",
"@angular/compiler": "9.0.4",
"@angular/core": "9.0.4",
"@angular/forms": "9.0.4",
"@angular/localize": "^9.0.4",
vishal423 marked this conversation as resolved.
Show resolved Hide resolved
"@angular/platform-browser": "9.0.4",
"@angular/platform-browser-dynamic": "9.0.4",
"@angular/router": "9.0.4",
"@fortawesome/angular-fontawesome": "0.6.0",
"@fortawesome/fontawesome-svg-core": "1.2.26",
"@fortawesome/free-solid-svg-icons": "5.12.0",
Expand All @@ -45,7 +45,6 @@
<%_ if (clientTheme !== 'none') { _%>
"bootswatch": "4.4.1",
<%_ } _%>
"core-js": "3.5.0",
"moment": "2.24.0",
"ng-jhipster": "0.12.0",
"ngx-cookie": "4.0.2",
Expand All @@ -61,9 +60,9 @@
"zone.js": "0.10.2"
},
"devDependencies": {
"@angular/cli": "9.0.1",
"@angular/compiler-cli": "9.0.0",
"@ngtools/webpack": "9.0.1",
"@angular/cli": "9.0.4",
"@angular/compiler-cli": "9.0.4",
"@ngtools/webpack": "9.0.4",
"@openapitools/openapi-generator-cli": "1.0.10-4.2.3",
<%_ if (protractorTests) { _%>
"@types/chai": "4.2.7",
Expand All @@ -83,12 +82,10 @@
"@typescript-eslint/eslint-plugin": "2.11.0",
"@typescript-eslint/eslint-plugin-tslint": "2.11.0",
"@typescript-eslint/parser": "2.11.0",
"angular2-template-loader": "0.6.2",
"autoprefixer": "9.7.3",
"base-href-webpack-plugin": "2.0.0",
"browser-sync": "2.26.7",
"browser-sync-webpack-plugin": "2.2.2",
"cache-loader": "4.1.0",
<%_ if (protractorTests) { _%>
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
Expand All @@ -102,7 +99,6 @@
"eslint-config-prettier": "6.7.0",
"eslint-loader": "3.0.3",
"file-loader": "5.0.2",
"fork-ts-checker-webpack-plugin": "3.1.1",
"friendly-errors-webpack-plugin": "1.7.0",
"generator-jhipster": "<%= packagejs.version %>",
"html-loader": "0.5.5",
Expand Down Expand Up @@ -146,7 +142,7 @@
<%_ if (protractorTests) { _%>
"ts-node": "8.5.4",
<%_ } _%>
"tslint": "5.20.1",
"tslint": "6.0.0",
"typescript": "3.7.5",
<%_ otherModules.forEach(module => { _%>
"<%= module.name %>": "<%= module.version %>",
Expand Down
Expand Up @@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-%>
import 'core-js/proposals/reflect-metadata';
import 'zone.js/dist/zone';
import '@angular/localize/init';
vishal423 marked this conversation as resolved.
Show resolved Hide resolved
require('../manifest.webapp');
4 changes: 1 addition & 3 deletions generators/client/templates/angular/tsconfig.json.ejs
Expand Up @@ -40,10 +40,8 @@
},
"angularCompilerOptions": {
"genDir": "<%= AOT_DIR %>",
"skipMetadataEmit": true,
"fullTemplateTypeCheck": true,
"preserveWhitespaces": true,
"enableIvy": true
"preserveWhitespaces": true
}
}

Expand Up @@ -20,7 +20,6 @@ const webpack = require('webpack');
const writeFilePlugin = require('write-file-webpack-plugin');
const webpackMerge = require('webpack-merge');
const BrowserSyncPlugin = require('browser-sync-webpack-plugin');
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin');
const SimpleProgressWebpackPlugin = require('simple-progress-webpack-plugin');
const WebpackNotifierPlugin = require('webpack-notifier');
Expand Down Expand Up @@ -107,7 +106,6 @@ module.exports = (options) => webpackMerge(commonConfig({ env: ENV }), {
format: options.stats === 'minimal' ? 'compact' : 'expanded'
}),
new FriendlyErrorsWebpackPlugin(),
new ForkTsCheckerWebpackPlugin(),
new BrowserSyncPlugin({
https: options.tls,
host: 'localhost',
Expand Down