test: fix edgeCase test case

vuejs · Apr 25, 2023 · d851c84 · d851c84
1 parent ef589df
commit d851c84
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/test/edgeCases.spec.ts b/test/edgeCases.spec.ts
@@ -1,5 +1,5 @@
 import * as path from 'path'
-import webpack = require('webpack')
+import webpack from 'webpack'
 import { mfs, bundle, mockBundleAndRun, normalizeNewline } from './utils'
 
 // @ts-ignore
@@ -30,8 +30,11 @@ function assertComponent({
 test('vue rule with include', async () => {
   const result = await mockBundleAndRun({
     entry: 'basic.vue',
-    modify: (config) => {
-      config!.module!.rules[0] = {
+    modify: (config: any) => {
+      const i = config.module.rules.findIndex((r) =>
+        r.test.toString().includes('vue')
+      )
+      config.module.rules[i] = {
         test: /\.vue$/,
         include: /fixtures/,
         loader: 'vue-loader',
@@ -70,8 +73,11 @@ test('test-less oneOf rules', async () => {
 test('normalize multiple use + options', async () => {
   await bundle({
     entry: 'basic.vue',
-    modify: (config) => {
-      config!.module!.rules[0] = {
+    modify: (config: any) => {
+      const i = config.module.rules.findIndex((r) =>
+        r.test.toString().includes('vue')
+      )
+      config!.module!.rules[i] = {
         test: /\.vue$/,
         use: [
           {
@@ -88,7 +94,10 @@ test('should not duplicate css modules value imports', async () => {
   const { window, exports } = await mockBundleAndRun({
     entry: './test/fixtures/duplicate-cssm.js',
     modify: (config: any) => {
-      config!.module!.rules[1] = {
+      const i = config.module.rules.findIndex((r) =>
+        r.test.toString().includes('css')
+      )
+      config.module.rules[i] = {
         test: /\.css$/,
         use: [
           'style-loader',
@@ -136,8 +145,11 @@ test('html-webpack-plugin', async () => {
 test('usage with null-loader', async () => {
   await mockBundleAndRun({
     entry: 'basic.vue',
-    modify: (config) => {
-      config!.module!.rules[1] = {
+    modify: (config: any) => {
+      const i = config.module.rules.findIndex((r) =>
+        r.test.toString().includes('css')
+      )
+      config.module.rules[i] = {
         test: /\.css$/,
         use: ['null-loader'],
       }

diff --git a/test/utils.ts b/test/utils.ts
@@ -31,6 +31,10 @@ const baseConfig: webpack.Configuration = {
         test: /\.vue$/,
         loader: 'vue-loader',
       },
+      {
+        test: /\.css$/,
+        use: ['style-loader', 'css-loader'],
+      },
       {
         test: /\.ts$/,
         loader: process.env.WEBPACK4
@@ -41,10 +45,6 @@ const baseConfig: webpack.Configuration = {
           appendTsSuffixTo: [/\.vue$/],
         },
       },
-      {
-        test: /\.css$/,
-        use: ['style-loader', 'css-loader'],
-      },
     ],
   },
   plugins: [