refactor: move transformStyle to compiler-dom

diff --git a/packages/compiler-core/__tests__/transforms/transformElement.spec.ts b/packages/compiler-core/__tests__/transforms/transformElement.spec.ts
index cc2f80df6b7e6c3929ae5713c1170532dc7d65aa..5af275be9436b1032503d54ca586177366bc17f5 100644 (file)
--- a/packages/compiler-core/__tests__/transforms/transformElement.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/transformElement.spec.ts
@@ -21,8 +21,8 @@ import {
   RootNode
 } from '../../src/ast'
 import { transformElement } from '../../src/transforms/transformElement'
+import { transformStyle } from '../../../compiler-dom/src/transforms/transformStyle'
 import { transformOn } from '../../src/transforms/vOn'
-import { transformStyle } from '../../src/transforms/transformStyle'
 import { transformBind } from '../../src/transforms/vBind'
 import { PatchFlags } from '@vue/shared'
 import { createObjectMatcher } from '../testUtils'

diff --git a/packages/compiler-core/src/index.ts b/packages/compiler-core/src/index.ts
index f126512fef1f50c730ee4a9fdb1fea7637fc6686..1ef90fa70d0e0e5092c1d50f423c137fddaf73e0 100644 (file)
--- a/packages/compiler-core/src/index.ts
+++ b/packages/compiler-core/src/index.ts
@@ -6,7 +6,6 @@ import { isString } from '@vue/shared'
 import { transformIf } from './transforms/vIf'
 import { transformFor } from './transforms/vFor'
 import { transformExpression } from './transforms/transformExpression'
-import { transformStyle } from './transforms/transformStyle'
 import { transformSlotOutlet } from './transforms/transfromSlotOutlet'
 import { transformElement } from './transforms/transformElement'
 import { transformOn } from './transforms/vOn'
@@ -54,7 +53,6 @@ export function baseCompile(
         : []),
       trackSlotScopes,
       optimizeText,
-      transformStyle,
       transformSlotOutlet,
       transformElement,
       ...(options.nodeTransforms || []) // user transforms

diff --git a/packages/compiler-core/__tests__/transforms/transformStyle.spec.ts b/packages/compiler-dom/__tests__/transforms/transformStyle.spec.ts
similarity index 90%
rename from packages/compiler-core/__tests__/transforms/transformStyle.spec.ts
rename to packages/compiler-dom/__tests__/transforms/transformStyle.spec.ts
index aeba73ff691ec7d411937f6640bdfaf21c83238e..b9410c7a542fe1e51cb9564c103ee80d7947c52e 100644 (file)
--- a/packages/compiler-core/__tests__/transforms/transformStyle.spec.ts
+++ b/packages/compiler-dom/__tests__/transforms/transformStyle.spec.ts
@@ -4,10 +4,10 @@ import {
   CompilerOptions,
   ElementNode,
   NodeTypes
-} from '../../src'
+} from '@vue/compiler-core'
+import { transformBind } from '../../../compiler-core/src/transforms/vBind'
+import { transformElement } from '../../../compiler-core/src/transforms/transformElement'
 import { transformStyle } from '../../src/transforms/transformStyle'
-import { transformBind } from '../../src/transforms/vBind'
-import { transformElement } from '../../src/transforms/transformElement'
 
 function transformWithStyleTransform(
   template: string,

diff --git a/packages/compiler-dom/src/index.ts b/packages/compiler-dom/src/index.ts
index da7059b58956e5155e57f34cb75db28a93e07053..17a53a3f480d0985dee2aae3637aeacd3d14943c 100644 (file)
--- a/packages/compiler-dom/src/index.ts
+++ b/packages/compiler-dom/src/index.ts
@@ -1,6 +1,7 @@
 import { baseCompile, CompilerOptions, CodegenResult } from '@vue/compiler-core'
 import { parserOptionsMinimal } from './parserOptionsMinimal'
 import { parserOptionsStandard } from './parserOptionsStandard'
+import { transformStyle } from './transforms/transformStyle'
 
 export function compile(
   template: string,
@@ -9,6 +10,7 @@ export function compile(
   return baseCompile(template, {
     ...options,
     ...(__BROWSER__ ? parserOptionsMinimal : parserOptionsStandard),
+    nodeTransforms: [transformStyle, ...(options.nodeTransforms || [])],
     directiveTransforms: {
       // TODO include DOM-specific directiveTransforms
       ...(options.directiveTransforms || {})

diff --git a/packages/compiler-core/src/transforms/transformStyle.ts b/packages/compiler-dom/src/transforms/transformStyle.ts
similarity index 93%
rename from packages/compiler-core/src/transforms/transformStyle.ts
rename to packages/compiler-dom/src/transforms/transformStyle.ts
index 47ce0b2a4430994aa405f16fcd71e977284eedf7..c612c8011b2e1d3c55c3648310dab2cd61e0f493 100644 (file)
--- a/packages/compiler-core/src/transforms/transformStyle.ts
+++ b/packages/compiler-dom/src/transforms/transformStyle.ts
@@ -1,5 +1,8 @@
-import { NodeTransform } from '../transform'
-import { NodeTypes, createSimpleExpression } from '../ast'
+import {
+  NodeTransform,
+  NodeTypes,
+  createSimpleExpression
+} from '@vue/compiler-core'
 
 // Parse inline CSS strings for static style attributes into an object.
 // This is a NodeTransform since it works on the static `style` attribute and

diff --git a/packages/compiler-dom/src/directives/vCloak.ts b/packages/compiler-dom/src/transforms/vCloak.ts
similarity index 100%
rename from packages/compiler-dom/src/directives/vCloak.ts
rename to packages/compiler-dom/src/transforms/vCloak.ts

diff --git a/packages/compiler-dom/src/directives/vHtml.ts b/packages/compiler-dom/src/transforms/vHtml.ts
similarity index 100%
rename from packages/compiler-dom/src/directives/vHtml.ts
rename to packages/compiler-dom/src/transforms/vHtml.ts

diff --git a/packages/compiler-dom/src/directives/vModel.ts b/packages/compiler-dom/src/transforms/vModel.ts
similarity index 100%
rename from packages/compiler-dom/src/directives/vModel.ts
rename to packages/compiler-dom/src/transforms/vModel.ts

diff --git a/packages/compiler-dom/src/directives/vOn.ts b/packages/compiler-dom/src/transforms/vOn.ts
similarity index 100%
rename from packages/compiler-dom/src/directives/vOn.ts
rename to packages/compiler-dom/src/transforms/vOn.ts

diff --git a/packages/compiler-dom/src/directives/vShow.ts b/packages/compiler-dom/src/transforms/vShow.ts
similarity index 100%
rename from packages/compiler-dom/src/directives/vShow.ts
rename to packages/compiler-dom/src/transforms/vShow.ts

diff --git a/packages/compiler-dom/src/directives/vText.ts b/packages/compiler-dom/src/transforms/vText.ts
similarity index 100%
rename from packages/compiler-dom/src/directives/vText.ts
rename to packages/compiler-dom/src/transforms/vText.ts