Skip to content

Commit c481d24

Browse files
xiaoyatongxiaoyatong
authored
Merge branch 'V3.0' into 3.0-countdown
2 parents 6791a73 + 71dd5f1 commit c481d24

File tree

181 files changed

+676
-10220
lines changed

Some content is hidden

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

181 files changed

+676
-10220
lines changed

‎package.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"dev:taro:jdharmony": "pnpm run clone:jdharmony && pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev:jdharmony",
6767
"dev:taro:jdharmonycpp": "pnpm run clone:jdharmony cpp && pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev:jdharmonycpp",
6868
"dev:taro:jdhybrid": "pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev:jdhybrid",
69-
"dev:taro:jdrn": "pnpm run clone:rn && pnpm --dir ./packages/nutui-taro-demo dev:jdrn & pnpm run gulp:watch",
69+
"dev:taro:jdrn": "pnpm run clone:rn && pnpm --dir ./packages/nutui-taro-demo dev:jdrn",
7070
"dev:taro:rn:dark": "THEME=dark pnpm dev:taro:rn",
7171
"dev:taro:weapp:jmapp": "pnpm --dir ./packages/nutui-taro-demo && npm run dev:weapp:jmapp",
7272
"build": "npm run checked && node scripts/build.mjs",
@@ -83,7 +83,6 @@
8383
"generate:themes-dev": "node scripts/generate-themes-dev.js",
8484
"generate:file:taro": "node scripts/taro/generate-nutui-taro.js",
8585
"generate:file:taro:pages": "node scripts/taro/generate-taro-pages.js",
86-
"gulp:watch": "gulp watch --environment",
8786
"lint": "eslint ./src/packages/*/",
8887
"lint:fix": "eslint --fix ./src/packages",
8988
"postpublish": "node scripts/postpublish.js",
@@ -104,7 +103,7 @@
104103
"dependencies": {
105104
"@babel/runtime": "^7.23.9",
106105
"@nutui/icons-react": "^1.0.5",
107-
"@nutui/icons-react-taro": "^2.0.0",
106+
"@nutui/icons-react-taro": "^2.0.1",
108107
"@nutui/jdesign-icons-react-taro": "1.0.6-beta.2",
109108
"@nutui/touch-emulator": "^1.0.0",
110109
"@react-spring/web": "~9.6.1",

‎pnpm-lock.yaml‎

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

‎scripts/build-taro.mjs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,6 @@ async function buildCSS(p) {
290290
`import './style.css'`,
291291
)
292292

293-
// copy harmonycss
294-
if (file.indexOf('countup') === -1) {
295-
await copy(join(__dirname, '../', file.replace('scss', 'harmony.css')), join('dist/cjs', cssPath, 'style/style.harmony.css'))
296-
await copy(join(__dirname, '../', file.replace('scss', 'harmony.css')), join('dist/es', cssPath, 'style/style.harmony.css'))
297-
}
298-
299293
// 删除 import
300294
// 写入 style.scss
301295
const atRules = []

‎scripts/replace-css-var.js‎

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

‎src/config.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"author": "hanyuxinting"
106106
},
107107
{
108-
"version": "2.0.0",
108+
"version": "3.0.0",
109109
"name": "Icon",
110110
"type": "component",
111111
"cName": "图标",
@@ -353,7 +353,7 @@
353353
"author": "hx"
354354
},
355355
{
356-
"version": "2.0.0",
356+
"version": "3.0.0",
357357
"name": "Tabbar",
358358
"type": "component",
359359
"cName": "标签栏",
@@ -727,7 +727,7 @@
727727
"author": "lzz"
728728
},
729729
{
730-
"version": "2.0.0",
730+
"version": "3.0.0",
731731
"name": "Dialog",
732732
"type": "component",
733733
"cName": "对话框",

‎src/packages/actionsheet/actionsheet.harmony.css‎

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

‎src/packages/actionsheet/demo.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { useTranslate } from '../../sites/assets/locale'
2+
import { useTranslate } from '@/sites/assets/locale'
33

44
import Demo1 from './demos/h5/demo1'
55
import Demo2 from './demos/h5/demo2'

‎src/packages/address/address.harmony.css‎

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

‎src/packages/address/demo.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { useTranslate } from '../../sites/assets/locale'
2+
import { useTranslate } from '@/sites/assets/locale'
33
import Demo1 from './demos/h5/demo1'
44
import Demo2 from './demos/h5/demo2'
55
import Demo3 from './demos/h5/demo3'

0 commit comments

Comments
 (0)