Skip to content

Commit

Permalink
chore: fix icon svg (#2742)
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiaoyatong
xiaoyatong authored Nov 13, 2024
1 parent 304fd2f commit c04c36a
Show file tree
Hide file tree
Showing 5 changed files with 2,140 additions and 2,122 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ node_modules
.idea
.eslintcache
.vite
.npmrc
/dist
/dist-demo
/libs
Expand Down
13 changes: 6 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"dependencies": {
"@babel/runtime": "^7.23.9",
"@nutui/icons-react": "^1.0.5",
"@nutui/icons-react-taro": "^2.0.0-beta.2",
"@nutui/icons-react-taro": "^2.0.0",
"@nutui/jdesign-icons-react-taro": "1.0.6-beta.2",
"@nutui/touch-emulator": "^1.0.0",
"@react-spring/web": "~9.6.1",
Expand All @@ -130,11 +130,11 @@
"@rollup/plugin-node-resolve": "15.2.3",
"@rollup/plugin-typescript": "^11.1.6",
"@swc/core": "^1.4.8",
"@tarojs/components": "4.0.0-beta.138",
"@tarojs/plugin-platform-alipay": "4.0.0-beta.138",
"@tarojs/plugin-platform-weapp": "4.0.0-beta.138",
"@tarojs/react": "4.0.0-beta.138",
"@tarojs/taro": "4.0.0-beta.138",
"@tarojs/components": "4.0.8-beta.0",
"@tarojs/plugin-platform-alipay": "4.0.8-beta.0",
"@tarojs/plugin-platform-weapp": "4.0.8-beta.0",
"@tarojs/react": "4.0.8-beta.0",
"@tarojs/taro": "4.0.8-beta.0",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^16.0.0",
"@types/fs-extra": "^11.0.4",
Expand Down Expand Up @@ -200,7 +200,6 @@
"react-color": "^2.19.3",
"react-dom": "^18.2.0",
"react-markdown": "^9.0.1",
"react-native": "0.72.3",
"react-refresh": "^0.14.0",
"react-router-dom": "^6.22.1",
"react-syntax-highlighter": "^15.5.0",
Expand Down
23 changes: 14 additions & 9 deletions packages/nutui-taro-demo/config/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ let plugins = !['harmony', 'jdharmony', 'rn', 'jdrn'].includes(
? ['@tarojs/plugin-html']
: []

if (
process.env.TARO_ENV === 'harmony'
) {
if (process.env.TARO_ENV === 'harmony') {
plugins.push('@tarojs/plugin-platform-harmony-ets')
}

Expand Down Expand Up @@ -50,7 +48,7 @@ if (process.env.TARO_ENV === 'jdharmony') {
plugins = ['@jdtaro/taro-platform-jdharmony']
}
if (process.env.TARO_ENV === 'jdharmony_cpp') {
plugins = ['@jdtaro/plugin-platform-jdharmony-cpp']
plugins = ['@jdtaro/plugin-platform-jdharmony-cpp']
}
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
Expand Down Expand Up @@ -127,13 +125,20 @@ const config = {
ohPackage: {
dependencies: {
'@jd-oh/taro_library': '2.0.70',
'@jd-oh/taro_cpp_library': '0.0.88-beta.0'
'@jd-oh/taro_cpp_library': '0.1.2-alpha.0',
},
},
// 将编译方式设置为使用 Vite 编译
compiler: { type: 'vite', vitePlugins: [injectScss()] },
// 【必填】鸿蒙主应用的绝对路径，例如：
projectPath: path.resolve(process.cwd(), isHarmony ? '../nutui-harmony' : isHarmonycpp ? '../nutui-jdharmonycpp' : '../nutui-jdharmony'),
projectPath: path.resolve(
process.cwd(),
isHarmony
? '../nutui-harmony'
: isHarmonycpp
? '../nutui-jdharmonycpp'
: '../nutui-jdharmony'
),
// 【可选】HAP 的名称，默认为 'entry'
hapName: isHarmony ? 'entry' : 'library',
useNesting: true,
Expand Down Expand Up @@ -223,9 +228,9 @@ const config = {
},
output: {
environment: {
asyncFunction: true
}
}
asyncFunction: true,
},
},
},
rn: {
appName: 'JDReactAPIDemos',
Expand Down
51 changes: 24 additions & 27 deletions packages/nutui-taro-demo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,44 +56,42 @@
"@dongdesign/inject-jd-platform-styles": "1.0.4",
"@jdreact/jdreact-jsbundle-commonpack": "1.0.425",
"@jdtaro/plugin-platform-jdhybrid": "0.2.1",
"@jdtaro/plugin-platform-jdrn": "2.0.0-beta.0",
"@jdtaro/taro-platform-jdharmony": "2.0.70",
"@jdtaro/plugin-platform-jdharmony-cpp": "0.0.93",
"@jdtaro/plugin-platform-jdharmony-cpp": "0.1.2-alpha.0",
"@nutui/replace-icons": "^1.0.0",
"@nutui/touch-emulator": "^1.0.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
"@tarojs/components": "4.0.0-beta.138",
"@tarojs/helper": "4.0.0-beta.138",
"@tarojs/plugin-framework-react": "4.0.0-beta.138",
"@tarojs/plugin-html": "4.0.0-beta.138",
"@tarojs/plugin-platform-alipay": "4.0.0-beta.138",
"@tarojs/plugin-platform-h5": "4.0.0-beta.138",
"@tarojs/plugin-platform-jd": "4.0.0-beta.138",
"@tarojs/plugin-platform-qq": "4.0.0-beta.138",
"@tarojs/plugin-platform-swan": "4.0.0-beta.138",
"@tarojs/plugin-platform-tt": "4.0.0-beta.138",
"@tarojs/plugin-platform-weapp": "4.0.0-beta.138",
"@tarojs/react": "4.0.0-beta.138",
"@tarojs/router": "4.0.0-beta.138",
"@tarojs/runtime": "4.0.0-beta.138",
"@tarojs/shared": "4.0.0-beta.138",
"@tarojs/taro": "4.0.0-beta.138",
"@tarojs/taro-h5": "4.0.0-beta.138",
"@tarojs/components": "4.0.8-beta.0",
"@tarojs/helper": "4.0.8-beta.0",
"@tarojs/plugin-framework-react": "4.0.8-beta.0",
"@tarojs/plugin-html": "4.0.8-beta.0",
"@tarojs/plugin-platform-alipay": "4.0.8-beta.0",
"@tarojs/plugin-platform-h5": "4.0.8-beta.0",
"@tarojs/plugin-platform-jd": "4.0.8-beta.0",
"@tarojs/plugin-platform-qq": "4.0.8-beta.0",
"@tarojs/plugin-platform-swan": "4.0.8-beta.0",
"@tarojs/plugin-platform-tt": "4.0.8-beta.0",
"@tarojs/plugin-platform-weapp": "4.0.8-beta.0",
"@tarojs/react": "4.0.8-beta.0",
"@tarojs/router": "4.0.8-beta.0",
"@tarojs/runtime": "4.0.8-beta.0",
"@tarojs/shared": "4.0.8-beta.0",
"@tarojs/taro": "4.0.8-beta.0",
"@tarojs/taro-h5": "4.0.8-beta.0",
"babel-plugin-import": "^1.13.8",
"lodash.isequal": "^4.5.0",
"lodash.kebabcase": "^4.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-native": "0.72.3",
"react-refresh": "^0.14.0",
"react-transition-group": "^4.4.5"
},
"devDependencies": {
"@babel/core": "^7.23.9",
"@tarojs/cli": "4.0.0-beta.138",
"@tarojs/plugin-platform-harmony-ets": "4.0.0-beta.138",
"@tarojs/vite-runner": "4.0.0-beta.138",
"@tarojs/webpack5-runner": "4.0.0-beta.138",
"@tarojs/cli": "4.0.8-beta.0",
"@tarojs/plugin-platform-harmony-ets": "4.0.8-beta.0",
"@tarojs/vite-runner": "4.0.8-beta.0",
"@tarojs/webpack5-runner": "4.0.8-beta.0",
"@types/react": "^18.2.57",
"@types/react-dom": "^18.2.19",
"@types/react-router-dom": "^5.3.3",
Expand All @@ -103,9 +101,9 @@
"@types/webpack-env": "^1.18.4",
"@typescript-eslint/eslint-plugin": "^7.0.2",
"@typescript-eslint/parser": "^7.0.2",
"babel-preset-taro": "4.0.0-beta.138",
"babel-preset-taro": "4.0.8-beta.0",
"eslint": "^8.56.0",
"eslint-config-taro": "4.0.0-beta.138",
"eslint-config-taro": "4.0.8-beta.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
Expand All @@ -114,7 +112,6 @@
"typescript": "^5.3.3"
},
"resolutions": {
"react-native-webview": "13.6.3",
"sass":"1.77.6"
}
}
Loading

0 comments on commit c04c36a

Please sign in to comment.