Skip to content

Commit 5a8f613

Browse files
committed
wip(dom2): 重构 css 编译
1 parent f9ff378 commit 5a8f613

File tree

101 files changed

+161
-17356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+161
-17356
lines changed

packages/uni-app-uts/src/plugins/dom2/css.ts

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ import {
1919
resolveAppVue,
2020
resolveMainPathOnce,
2121
} from '@dcloudio/uni-cli-shared'
22-
import {
23-
type DOM2_APP_PLATFORM,
24-
DOM2_APP_TARGET,
25-
parse,
26-
} from '@dcloudio/uni-nvue-styler'
2722
import {
2823
type SourceMapInput,
2924
TraceMap,
@@ -39,6 +34,7 @@ export function uniAppCssPrePlugin(): Plugin {
3934
const name = 'uni:app-uvue-css-pre'
4035
const mainPath = resolveMainPathOnce(process.env.UNI_INPUT_DIR)
4136
const appUVuePath = resolveAppVue(process.env.UNI_INPUT_DIR)
37+
const { parseCss } = require('@dcloudio/compiler-vapor-dom2')
4238
return {
4339
name,
4440
// 需要提前,因为unocss会在configResolved读取vite:css-post插件
@@ -70,14 +66,7 @@ export function uniAppCssPrePlugin(): Plugin {
7066
async chunkCssCode(filename, cssCode) {
7167
// filename
7268
cssCode = parseAssets(config, cssCode)
73-
const { code, messages, fontFaces } = await parse(cssCode, {
74-
dom2: {
75-
platform: process.env.UNI_UTS_PLATFORM as DOM2_APP_PLATFORM,
76-
target: DOM2_APP_TARGET.DOM_C,
77-
},
78-
filename,
79-
logLevel: 'WARNING',
80-
type: 'uvue',
69+
const { code, messages, fontFaces } = await parseCss(cssCode, {
8170
platform: process.env.UNI_UTS_PLATFORM,
8271
})
8372
const isDom2Harmony =
@@ -186,6 +175,7 @@ export function uniAppCssPrePlugin(): Plugin {
186175

187176
export function uniAppCssPlugin(): Plugin {
188177
let resolvedConfig: ResolvedConfig
178+
const { parseCss } = require('@dcloudio/compiler-vapor-dom2')
189179
return {
190180
name: 'uni:app-uvue-css',
191181
apply: 'build',
@@ -204,14 +194,7 @@ export function uniAppCssPlugin(): Plugin {
204194
}
205195
source = parseAssets(resolvedConfig, source)
206196
// 仅做校验使用
207-
const { messages } = await parse(source, {
208-
dom2: {
209-
platform: process.env.UNI_UTS_PLATFORM as DOM2_APP_PLATFORM,
210-
target: DOM2_APP_TARGET.DOM_C,
211-
},
212-
filename,
213-
logLevel: 'WARNING',
214-
type: 'uvue',
197+
const { messages } = await parseCss(source, {
215198
platform: process.env.UNI_UTS_PLATFORM,
216199
})
217200
let cssSourceMap: SourceMapInput | undefined

packages/uni-cli-shared/lib/dom2/app/@vue/compiler-vapor-dom2/dist/compiler-vapor-dom2.cjs.js

Lines changed: 61 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/uni-cli-shared/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"@babel/parser": "catalog:",
2828
"@babel/types": "catalog:",
2929
"@dcloudio/uni-i18n": "workspace:*",
30+
"@dcloudio/uni-nvue-styler": "workspace:*",
3031
"@dcloudio/uni-shared": "workspace:*",
3132
"@intlify/core-base": "9.1.9",
3233
"@intlify/shared": "9.1.9",

packages/uni-nvue-styler/__tests__/__snapshots__/parse-inline-style.spec.ts.snap

Lines changed: 0 additions & 3 deletions
This file was deleted.

packages/uni-nvue-styler/__tests__/dom2/__snapshots__/parse.spec.ts.snap

Lines changed: 0 additions & 143 deletions
This file was deleted.

packages/uni-nvue-styler/__tests__/dom2/parse.spec.ts

Lines changed: 0 additions & 145 deletions
This file was deleted.

0 commit comments

Comments
 (0)