Skip to content

Commit 5088911

Browse files
committed
upgrade typescrript fix #6051
1 parent 0d7f0a5 commit 5088911

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

generators/client/templates/angular/_package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<%_ } _%>
110110
"tslint": "5.5.0",
111111
"tslint-loader": "3.5.3",
112-
"typescript": "2.3.4",
112+
"typescript": "2.4.1",
113113
<%_ if (useSass) { _%>
114114
"sass-loader": "6.0.6",
115115
"node-sass": "4.5.3",
@@ -133,8 +133,8 @@
133133
"node": ">=6.9.0"
134134
},
135135
"scripts": {
136-
"lint": "tslint '<%= MAIN_SRC_DIR%>app/**/*.ts' '<%= TEST_SRC_DIR%>**/*.ts'",
137-
"lint:fix": "tslint '<%= MAIN_SRC_DIR%>app/**/*.ts' '<%= TEST_SRC_DIR%>**/*.ts' --fix",
136+
"lint": "tslint --type-check --project './tsconfig.json' -e 'node_modules/**'",
137+
"lint:fix": "<%= clientPackageManager %> run lint -- --fix",
138138
"ngc": "ngc -p tsconfig-aot.json",
139139
"cleanup": "rimraf <%= BUILD_DIR %>{aot,www}",
140140
"start": "<%= clientPackageManager %> run webpack:dev",
@@ -147,7 +147,7 @@
147147
"webpack-dev-server": "node --max_old_space_size=4096 node_modules/webpack-dev-server/bin/webpack-dev-server.js",
148148
"webpack": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack.js",
149149
"test": "karma start src/test/javascript/karma.conf.js",
150-
"test:watch": "karma start src/test/javascript/karma.conf.js --watch",
150+
"test:watch": "<%= clientPackageManager %> test -- --watch",
151151
<%_ if (protractorTests) { _%>
152152
"e2e": "protractor <%= TEST_SRC_DIR %>protractor.conf.js",
153153
"postinstall": "webdriver-manager update && node node_modules/phantomjs-prebuilt/install.js"

generators/client/templates/angular/_tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"experimentalDecorators": true,
2727
"removeComments": false,
2828
"noImplicitAny": false,
29+
"skipLibCheck": true,
2930
"suppressImplicitAnyIndexErrors": true,
3031
"outDir": "<%= DIST_DIR %>app",
3132
"lib": ["es6", "dom"],

0 commit comments

Comments
 (0)