Skip to content

Commit a534a5e

Browse files
committed
Merge remote-tracking branch 'upstream/V3.0' into 3.0-rate
2 parents 7513f61 + e576eee commit a534a5e

File tree

6 files changed

+922
-3731
lines changed

6 files changed

+922
-3731
lines changed

packages/nutui-taro-demo/config/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const path = require('path')
2-
const injectScss = require('../plugins/inject-scss')
32

43
let fileStr = `src/styles/variables.scss`
54
let themeStr = `src/styles/theme-default.scss`
@@ -71,7 +70,7 @@ const config = {
7170
},
7271
sourceRoot: 'src',
7372
outputRoot: `dist/${process.env.TARO_ENV === 'h5' ? 'demo' : process.env.TARO_ENV}`,
74-
plugins: [path.resolve(__dirname, '../plugins/inject-scss.js'), ...plugins],
73+
plugins: [...plugins],
7574
compiler: 'webpack5',
7675
alias:
7776
process.env.TARO_ENV === 'rn' || process.env.TARO_ENV === 'jdrn'
@@ -129,7 +128,7 @@ const config = {
129128
},
130129
},
131130
// 将编译方式设置为使用 Vite 编译
132-
compiler: { type: 'vite', vitePlugins: [injectScss()] },
131+
compiler: { type: 'vite' },
133132
// 【必填】鸿蒙主应用的绝对路径,例如:
134133
projectPath: path.resolve(
135134
process.cwd(),

packages/nutui-taro-demo/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@
112112
"typescript": "^5.3.3"
113113
},
114114
"resolutions": {
115-
"sass":"1.77.6"
115+
"sass": "1.77.6",
116+
"@tarojs/api": "4.0.8-beta.0",
117+
"@tarojs/components": "4.0.8-beta.0"
116118
}
117119
}

packages/nutui-taro-demo/plugins/inject-scss.js

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

0 commit comments

Comments
 (0)