fixup! fixup! fixup! fixup! fixup! chore: min node version, dep updat…

…es and ts-loader in test matrix
TypeStrong · Nov 20, 2018 · b7b468f · b7b468f
1 parent e208025
commit b7b468f
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 56 deletions.
diff --git a/test/integration/index.spec.js b/test/integration/index.spec.js
@@ -43,24 +43,26 @@ describe('[INTEGRATION] index', function() {
       ? { happyPackMode: true, silent: true }
       : { transpileOnly: true, silent: true };
 
-    return webpack({
-      ...(webpackMajorVersion >= 4 ? { mode: 'development' } : {}),
-      context: path.resolve(__dirname, './project'),
-      entry: entryPoint,
-      output: {
-        path: path.resolve(__dirname, '../../tmp')
-      },
-      module: {
-        rules: [
-          {
-            test: /\.tsx?$/,
-            loader: 'ts-loader',
-            options: tsLoaderOptions
-          }
-        ]
-      },
-      plugins: [plugin]
-    });
+    return webpack(Object.assign(
+      webpackMajorVersion >= 4 ? { mode: 'development' } : {},
+      {
+        context: path.resolve(__dirname, './project'),
+        entry: entryPoint,
+        output: {
+            path: path.resolve(__dirname, '../../tmp')
+        },
+        module: {
+            rules: [
+            {
+                test: /\.tsx?$/,
+                loader: 'ts-loader',
+                options: tsLoaderOptions
+            }
+            ]
+        },
+        plugins: [plugin]
+      }
+    ));
   }
 
   /**

diff --git a/test/integration/vue.spec.js b/test/integration/vue.spec.js
@@ -26,45 +26,45 @@ describe('[INTEGRATION] vue', function() {
       Object.assign({}, options, { silent: true })
     );
 
-    compiler = webpack({
-      ...(webpackMajorVersion >= 4 ? { mode: 'development' } : {}),
-      context: path.resolve(__dirname, './vue'),
-      entry: './src/index.ts',
-      output: {
-        path: path.resolve(__dirname, '../../tmp')
-      },
-      resolve: {
-        extensions: ['.ts', '.js', '.vue', '.json'],
-        alias: {
-          '@': path.resolve(__dirname, './vue/src')
-        }
-      },
-      module: {
-        rules: [
-          {
-            test: /\.vue$/,
-            loader: 'vue-loader'
-          },
-          {
-            test: /\.ts$/,
-            loader: 'ts-loader',
-            options: {
-              appendTsSuffixTo: [/\.vue$/],
-              transpileOnly: true,
-              silent: true
-            }
-          },
-          {
-            test: /\.css$/,
-            loader: 'css-loader'
+    compiler = webpack(
+      Object.assign(
+        webpackMajorVersion >= 4 ? { mode: 'development' } : {},
+        {
+        context: path.resolve(__dirname, './vue'),
+        entry: './src/index.ts',
+        output: {
+          path: path.resolve(__dirname, '../../tmp')
+        },
+        resolve: {
+          extensions: ['.ts', '.js', '.vue', '.json'],
+          alias: {
+            '@': path.resolve(__dirname, './vue/src')
           }
-        ]
-      },
-      plugins: [
-        ...(webpackMajorVersion >= 4 ? [new VueLoaderPlugin()] : []),
-        plugin
-      ]
-    });
+        },
+        module: {
+          rules: [
+            {
+              test: /\.vue$/,
+              loader: 'vue-loader'
+            },
+            {
+              test: /\.ts$/,
+              loader: 'ts-loader',
+              options: {
+                appendTsSuffixTo: [/\.vue$/],
+                transpileOnly: true,
+                silent: true
+              }
+            },
+            {
+              test: /\.css$/,
+              loader: 'css-loader'
+            }
+          ]
+        },
+        plugins: webpackMajorVersion >= 4 ? [new VueLoaderPlugin(), plugin] : [plugin],
+      }
+    ));
 
     files = {
       'example.vue': path.resolve(compiler.context, 'src/example.vue'),