feat(nuxt-ts): typescript support improvements (nuxt#4750)

kevinmarrec · pi0 · commit dfaffc0183fb · 2019-01-12T23:51:21.000+03:30
diff --git a/examples/typescript-vuex/tsconfig.json b/examples/typescript-vuex/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "esnext",
     "module": "esnext",
     "moduleResolution": "node",
-    "lib": ["es2015", "dom"],
+    "lib": ["esnext", "esnext.asynciterable", "dom"],
     "esModuleInterop": true,
     "experimentalDecorators": true,
     "allowJs": true,
diff --git a/examples/typescript/tsconfig.json b/examples/typescript/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "esnext",
     "module": "esnext",
     "moduleResolution": "node",
-    "lib": ["es2015", "dom"],
+    "lib": ["esnext", "esnext.asynciterable", "dom"],
     "esModuleInterop": true,
     "experimentalDecorators": true,
     "allowJs": true,
diff --git a/packages/cli/src/utils/index.js b/packages/cli/src/utils/index.js
@@ -9,7 +9,7 @@ import chalk from 'chalk'
 import prettyBytes from 'pretty-bytes'
 import env from 'std-env'
 
-export const requireModule = esm(module, {
+export const requireModule = process.env.NUXT_TS ? require : esm(module, {
   cache: false,
   cjs: {
     cache: true,
diff --git a/packages/webpack/src/config/base.js b/packages/webpack/src/config/base.js
@@ -185,6 +185,10 @@ export default class WebpackBaseConfig {
       this.nuxt,
       { isServer: this.isServer, perfLoader }
     )
+    const babelLoader = {
+      loader: require.resolve('babel-loader'),
+      options: this.getBabelOptions()
+    }
 
     return [
       {
@@ -224,23 +228,22 @@ export default class WebpackBaseConfig {
           // item in transpile can be string or regex object
           return !this.modulesToTranspile.some(module => module.test(file))
         },
-        use: perfLoader.js().concat({
-          loader: require.resolve('babel-loader'),
-          options: this.getBabelOptions()
-        })
+        use: perfLoader.js().concat(babelLoader)
       },
       {
         test: /\.ts$/i,
-        loader: 'ts-loader',
-        options: this.loaders.ts
+        use: [
+          babelLoader,
+          {
+            loader: 'ts-loader',
+            options: this.loaders.ts
+          }
+        ]
       },
       {
         test: /\.tsx$/i,
         use: [
-          {
-            loader: require.resolve('babel-loader'),
-            options: this.getBabelOptions()
-          },
+          babelLoader,
           {
             loader: 'ts-loader',
             options: this.loaders.tsx
diff --git a/test/fixtures/typescript/tsconfig.json b/test/fixtures/typescript/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "esnext",
     "module": "esnext",
     "moduleResolution": "node",
     "lib": ["esnext", "esnext.asynciterable", "dom"],

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`		`- "target": "es5",`
	`3`	`+ "target": "esnext",`
`4`	`4`	`"module": "esnext",`
`5`	`5`	`"moduleResolution": "node",`
`6`	`6`	`"lib": ["esnext", "esnext.asynciterable", "dom"],`