test: fix tests for preserving ruleNames

yyx990803 · yyx990803 · commit 6010eb22fff3 · 2018-08-14T10:34:52.000-04:00
diff --git a/packages/@vue/cli-service/__tests__/Service.spec.js b/packages/@vue/cli-service/__tests__/Service.spec.js
@@ -233,6 +233,28 @@ test('api: configureWebpack returning object', () => {
   expect(config.output.path).toBe('test-dist-3')
 })
 
+test('api: configureWebpack preserve ruleNames', () => {
+  const service = createMockService([
+    {
+      id: 'babel',
+      apply: require('@vue/cli-plugin-babel')
+    },
+    {
+      id: 'test',
+      apply: api => {
+        api.configureWebpack({
+          module: {
+            rules: []
+          }
+        })
+      }
+    }
+  ])
+
+  const config = service.resolveWebpackConfig()
+  expect(config.module.rules[0].__ruleNames).toEqual(['js'])
+})
+
 test('api: configureDevServer', () => {
   const cb = () => {}
   const service = createMockService([{
diff --git a/packages/@vue/cli-service/lib/Service.js b/packages/@vue/cli-service/lib/Service.js
@@ -234,8 +234,8 @@ module.exports = class Service {
     // vue inspect works properly.
     if (config !== original) {
       cloneRuleNames(
-        config.module.rules,
-        original.module.rules
+        config.module && config.module.rules,
+        original.module && original.module.rules
       )
     }
 
@@ -352,14 +352,15 @@ function removeSlash (config, key) {
 }
 
 function cloneRuleNames (to, from) {
+  if (!to || !from) {
+    return
+  }
   from.forEach((r, i) => {
     if (to[i]) {
       Object.defineProperty(to[i], '__ruleNames', {
         value: r.__ruleNames
       })
-      if (to[i].oneOf && r.oneOf) {
-        cloneRuleNames(to[i].oneOf, r.oneOf)
-      }
+      cloneRuleNames(to[i].oneOf, r.oneOf)
     }
   })
 }

Original file line number	Diff line number	Diff line change
`@@ -234,8 +234,8 @@ module.exports = class Service {`
`234`	`234`	`// vue inspect works properly.`
`235`	`235`	`if (config !== original) {`
`236`	`236`	`cloneRuleNames(`
`237`		`- config.module.rules,`
`238`		`- original.module.rules`
	`237`	`+ config.module && config.module.rules,`
	`238`	`+ original.module && original.module.rules`
`239`	`239`	`)`
`240`	`240`	`}`
`241`	`241`
`@@ -352,14 +352,15 @@ function removeSlash (config, key) {`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`function cloneRuleNames (to, from) {`
	`355`	`+ if (!to \|\| !from) {`
	`356`	`+ return`
	`357`	`+ }`
`355`	`358`	`from.forEach((r, i) => {`
`356`	`359`	`if (to[i]) {`
`357`	`360`	`Object.defineProperty(to[i], '__ruleNames', {`
`358`	`361`	`value: r.__ruleNames`
`359`	`362`	`})`
`360`		`- if (to[i].oneOf && r.oneOf) {`
`361`		`- cloneRuleNames(to[i].oneOf, r.oneOf)`
`362`		`- }`
	`363`	`+ cloneRuleNames(to[i].oneOf, r.oneOf)`
`363`	`364`	`}`
`364`	`365`	`})`
`365`	`366`	`}`