Merge pull request #702 from JeroenVinke/fix/tsconfig-webpack

fix(webpack): explicitly load the webpack typings
aurelia · Aug 19, 2017 · 815aa62 · 815aa62
2 parents 6464532 + 2357a62
commit 815aa62
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 22 deletions.
diff --git a/lib/commands/new/buildsystems/cli/transpilers/typescript.js b/lib/commands/new/buildsystems/cli/transpilers/typescript.js
@@ -8,7 +8,8 @@ module.exports = function(project) {
 
   project.addToContent(
     ProjectItem.resource('tslint.json', 'content/tslint.json'),
-    ProjectItem.resource('tsconfig.json', 'content/tsconfig.json'),
+    ProjectItem.resource('tsconfig.json', 'content/tsconfig.template.json')
+      .asTemplate(project.model),
     ProjectItem.directory('custom_typings')
   ).addToTasks(
     ProjectItem.resource('transpile.ts', 'tasks/transpile.ts')

diff --git a/lib/commands/new/buildsystems/webpack/transpilers/typescript.js b/lib/commands/new/buildsystems/webpack/transpilers/typescript.js
@@ -3,7 +3,8 @@ const ProjectItem = require('../../../../../project-item').ProjectItem;
 
 module.exports = function(project) {
   project.addToContent(
-    ProjectItem.resource('tsconfig.json', 'content/tsconfig.json'),
+    ProjectItem.resource('tsconfig.json', 'content/tsconfig.template.json')
+      .asTemplate(project.model),
     ProjectItem.directory('custom_typings')
       .add(
         ProjectItem.resource('fetch.d.ts', 'content/custom_typings_webpack/fetch.d.ts'),

diff --git a/lib/resources/content/tsconfig-webpack.json b/lib/resources/content/tsconfig-webpack.json
diff --git a/lib/resources/content/tsconfig.json → lib/resources/content/tsconfig.template.json b/lib/resources/content/tsconfig.json → lib/resources/content/tsconfig.template.json
@@ -13,6 +13,11 @@
     "moduleResolution": "node",
     "lib": ["es2017", "dom"]
   },
+  // @if bundler.id='webpack'
+  "files":[
+    "./node_modules/@types/webpack/index.d.ts"
+  ],
+  // @endif
   "exclude": [
     "node_modules",
     "aurelia_project"