build: enable multiple tsconfig.json

RNGeek · Sep 15, 2018 · 920309e · 920309e
1 parent be251bb
commit 920309e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 9 deletions.
diff --git a/src/app/tsconfig.json b/src/app/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "lib": ["esnext", "dom"]
+  }
+}
diff --git a/src/typings/element-ui.d.ts → src/app/typings/element-ui.d.ts b/src/typings/element-ui.d.ts → src/app/typings/element-ui.d.ts
diff --git a/src/typings/vue-shims.d.ts → src/app/typings/vue-shims.d.ts b/src/typings/vue-shims.d.ts → src/app/typings/vue-shims.d.ts
diff --git a/src/worker/tsconfig.json b/src/worker/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "lib": ["esnext", "webworker"]
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -3,7 +3,6 @@
     /* Basic Options */
     // "outDir": "./dist",
     "target": "es5",
-    "lib": ["esnext", "dom", "webworker"],
     "declaration": false,
 
     /* Module Options */

diff --git a/webpack.config.js b/webpack.config.js
@@ -17,14 +17,6 @@ const WORKER_PATH = '/worker.js'
 const baseConfig = {
   module: {
     rules: [
-      {
-        test: /\.ts$/,
-        loader: 'ts-loader',
-        options: {
-          appendTsSuffixTo: [/\.vue$/],
-        },
-        include: [srcPath],
-      },
       { test: /\.vue$/, loader: 'vue-loader' },
       {
         test: /\.css$/,
@@ -61,6 +53,20 @@ const appConfig = webpackMerge(baseConfig, {
     filename: '[name].[hash].js',
   },
 
+  module: {
+    rules: [
+      {
+        test: /\.ts$/,
+        loader: 'ts-loader',
+        options: {
+          appendTsSuffixTo: [/\.vue$/],
+          configFile: resolve(appPath, './tsconfig.json'),
+        },
+        include: [srcPath],
+      },
+    ],
+  },
+
   plugins: [
     new HtmlWebpackPlugin({
       filename: resolve(distPath, './index.html'),
@@ -86,6 +92,19 @@ const searchWorkerConfig = webpackMerge(baseConfig, {
     path: distPath,
     filename: 'worker.js',
   },
+
+  module: {
+    rules: [
+      {
+        test: /\.ts$/,
+        loader: 'ts-loader',
+        options: {
+          configFile: resolve(workerPath, './tsconfig.json'),
+        },
+        include: [srcPath],
+      },
+    ],
+  },
 })
 
 module.exports = [appConfig, searchWorkerConfig]