From ecdaff45f12fb10151dc516bfc1f1e42a29ebe34 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Wed, 12 Dec 2018 17:11:30 +0200 Subject: [PATCH 1/3] refactor: remove dependency to `awesome-typescript-loader` --- dependencyManager.js | 1 - package.json | 1 - 2 files changed, 2 deletions(-) diff --git a/dependencyManager.js b/dependencyManager.js index 6fe1549a..bb3eb875 100644 --- a/dependencyManager.js +++ b/dependencyManager.js @@ -58,7 +58,6 @@ function removeObsoleteDeps(packageJson) { "uglifyjs-webpack-plugin", "@angular-devkit/core", "resolve-url-loader", - "awesome-typescript-loader", "sass-loader", ]; diff --git a/package.json b/package.json index 1a96e42c..9cf1a764 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,6 @@ }, "dependencies": { "@angular-devkit/core": "~7.1.0", - "awesome-typescript-loader": "~5.2.1", "clean-webpack-plugin": "~1.0.0", "copy-webpack-plugin": "~4.6.0", "css-loader": "~1.0.0", From 92d0a4943a63a5de9adf90b9ca1e088f17d09fda Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Wed, 12 Dec 2018 17:12:30 +0200 Subject: [PATCH 2/3] refactor: update TS demo app to use the new config --- demo/TypeScriptApp/webpack.config.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/demo/TypeScriptApp/webpack.config.js b/demo/TypeScriptApp/webpack.config.js index 4713954a..f292a54d 100644 --- a/demo/TypeScriptApp/webpack.config.js +++ b/demo/TypeScriptApp/webpack.config.js @@ -88,8 +88,8 @@ module.exports = env => { alias: { '~': appFullPath }, - // don't resolve symlinks to symlinked modules - symlinks: false + // resolve symlinks to symlinked modules + symlinks: true }, resolveLoader: { // don't resolve symlinks to symlinked loaders @@ -192,10 +192,14 @@ module.exports = env => { { test: /\.ts$/, use: { - loader: "awesome-typescript-loader", - options: { configFileName: "tsconfig.tns.json" }, + loader: "ts-loader", + options: { + configFile: "tsconfig.tns.json", + allowTsInNodeModules: true, + }, } }, + ] }, plugins: [ From 74d2ec35e2cfa84042868376790a598b5a4fa917 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Wed, 12 Dec 2018 17:13:33 +0200 Subject: [PATCH 3/3] feat: use `ts-loader` instead of `awesome-typescript-loader` --- templates/webpack.typescript.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/webpack.typescript.js b/templates/webpack.typescript.js index b3873812..fd3bdb28 100644 --- a/templates/webpack.typescript.js +++ b/templates/webpack.typescript.js @@ -86,8 +86,8 @@ module.exports = env => { alias: { '~': appFullPath }, - // don't resolve symlinks to symlinked modules - symlinks: false + // resolve symlinks to symlinked modules + symlinks: true }, resolveLoader: { // don't resolve symlinks to symlinked loaders @@ -190,8 +190,11 @@ module.exports = env => { { test: /\.ts$/, use: { - loader: "awesome-typescript-loader", - options: { configFileName: "tsconfig.tns.json" }, + loader: "ts-loader", + options: { + configFile: "tsconfig.tns.json", + allowTsInNodeModules: true, + }, } }, ]