Skip to content

Commit 35b48e5

Browse files
shlomiassafjoshwiens
authored andcommitted
feat: use import() construct via ng-router-loader@2.0.0 (PatrickJS#1387)
* feat: use import() construct via ng-router-loader@2.0.0 fix: upgrade webpack-dll-bundles-plugin * refactor: verbose ts loader definition The definition of the `*.ts` loader is getting more complex. We need AOT compliance so we use `angular2-template-loader` We need lazy loading so we use `ng-router-loader` And of course, we need to compile TS to JS, `awesome-typescript-loader` We can't explain all that in the configuration file but we can use Webpack 2 new loader syntax and use objects instead of literal string to configure the loaders.
1 parent 37ca5c2 commit 35b48e5

File tree

2 files changed

+26
-7
lines changed

2 files changed

+26
-7
lines changed

config/webpack.common.js

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,25 +93,44 @@ module.exports = function (options) {
9393
rules: [
9494

9595
/*
96-
* Typescript loader support for .ts and Angular 2 async routes via .async.ts
97-
* Replace templateUrl and stylesUrl with require()
96+
* Typescript loader support for .ts
97+
*
98+
* Component Template/Style integration using `angular2-template-loader`
99+
* Angular 2 lazy loading (async routes) via `ng-router-loader`
100+
*
101+
* `ng-router-loader` expects vanilla JavaScript code, not TypeScript code. This is why the
102+
* order of the loader matter.
98103
*
99104
* See: https://github.com/s-panferov/awesome-typescript-loader
100105
* See: https://github.com/TheLarkInn/angular2-template-loader
106+
* See: https://github.com/shlomiassaf/ng-router-loader
101107
*/
102108
{
103109
test: /\.ts$/,
104110
use: [
105-
'@angularclass/hmr-loader?pretty=' + !isProd + '&prod=' + isProd,
106-
'awesome-typescript-loader?{configFileName: "tsconfig.webpack.json"}',
107-
'angular2-template-loader',
108111
{
112+
loader: '@angularclass/hmr-loader',
113+
options: {
114+
pretty: !isProd,
115+
prod: isProd
116+
}
117+
},
118+
{ // MAKE SURE TO CHAIN VANILLA JS CODE, I.E. TS COMPILATION OUTPUT.
109119
loader: 'ng-router-loader',
110120
options: {
111-
loader: 'async-system',
121+
loader: 'async-import',
112122
genDir: 'compiled',
113123
aot: AOT
114124
}
125+
},
126+
{
127+
loader: 'awesome-typescript-loader',
128+
options: {
129+
configFileName: 'tsconfig.webpack.json'
130+
}
131+
},
132+
{
133+
loader: 'angular2-template-loader'
115134
}
116135
],
117136
exclude: [/\.(spec|e2e)\.ts$/]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
"karma-remap-coverage": "^0.1.4",
124124
"karma-sourcemap-loader": "^0.3.7",
125125
"karma-webpack": "2.0.1",
126-
"ng-router-loader": "^1.0.2",
126+
"ng-router-loader": "^2.0.0",
127127
"ngc-webpack": "1.1.0",
128128
"node-sass": "^4.2.0",
129129
"npm-run-all": "^4.0.0",

0 commit comments

Comments
 (0)