Skip to content

Commit

Permalink
Merge branch 'V3.0' into hxy/tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex-huxiyang authored Nov 22, 2024
2 parents 3be619c + f27d5bb commit 7d676ce
Show file tree
Hide file tree
Showing 224 changed files with 1,027 additions and 10,501 deletions.
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"dev:taro:jdharmony": "pnpm run clone:jdharmony && pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev:jdharmony",
"dev:taro:jdharmonycpp": "pnpm run clone:jdharmony cpp && pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev:jdharmonycpp",
"dev:taro:jdhybrid": "pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev:jdhybrid",
"dev:taro:jdrn": "pnpm run clone:rn && pnpm --dir ./packages/nutui-taro-demo dev:jdrn & pnpm run gulp:watch",
"dev:taro:jdrn": "pnpm run clone:rn && pnpm --dir ./packages/nutui-taro-demo dev:jdrn",
"dev:taro:rn:dark": "THEME=dark pnpm dev:taro:rn",
"dev:taro:weapp:jmapp": "pnpm --dir ./packages/nutui-taro-demo && npm run dev:weapp:jmapp",
"build": "npm run checked && node scripts/build.mjs",
Expand All @@ -83,7 +83,6 @@
"generate:themes-dev": "node scripts/generate-themes-dev.js",
"generate:file:taro": "node scripts/taro/generate-nutui-taro.js",
"generate:file:taro:pages": "node scripts/taro/generate-taro-pages.js",
"gulp:watch": "gulp watch --environment",
"lint": "eslint ./src/packages/*/",
"lint:fix": "eslint --fix ./src/packages",
"postpublish": "node scripts/postpublish.js",
Expand All @@ -104,7 +103,7 @@
"dependencies": {
"@babel/runtime": "^7.23.9",
"@nutui/icons-react": "^1.0.5",
"@nutui/icons-react-taro": "^2.0.0",
"@nutui/icons-react-taro": "^2.0.1",
"@nutui/jdesign-icons-react-taro": "1.0.6-beta.2",
"@nutui/touch-emulator": "^1.0.0",
"@react-spring/web": "~9.6.1",
Expand Down
1,013 changes: 503 additions & 510 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions scripts/build-taro.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,6 @@ async function buildCSS(p) {
`import './style.css'`,
)

// copy harmonycss
if (file.indexOf('countup') === -1) {
await copy(join(__dirname, '../', file.replace('scss', 'harmony.css')), join('dist/cjs', cssPath, 'style/style.harmony.css'))
await copy(join(__dirname, '../', file.replace('scss', 'harmony.css')), join('dist/es', cssPath, 'style/style.harmony.css'))
}

// 删除 import
// 写入 style.scss
const atRules = []
Expand Down
2 changes: 1 addition & 1 deletion scripts/properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -7625,7 +7625,7 @@
"版本号": "2.0.0",
"表格名": "Props",
"第一列": "onClick",
"第二列": "文本点击是触发",
"第二列": "文本点击时触发",
"第三列": "`() => void`",
"第四列": "-"
},
Expand Down
64 changes: 0 additions & 64 deletions scripts/replace-css-var.js

This file was deleted.

12 changes: 6 additions & 6 deletions src/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"author": "hanyuxinting"
},
{
"version": "2.0.0",
"version": "3.0.0",
"name": "Icon",
"type": "component",
"cName": "图标",
Expand Down Expand Up @@ -353,7 +353,7 @@
"author": "hx"
},
{
"version": "2.0.0",
"version": "3.0.0",
"name": "Tabbar",
"type": "component",
"cName": "标签栏",
Expand Down Expand Up @@ -470,7 +470,7 @@
"author": "ailululu"
},
{
"version": "2.0.0",
"version": "3.0.0",
"name": "Checkbox",
"type": "component",
"cName": "复选按钮",
Expand All @@ -481,7 +481,7 @@
"author": "oasis"
},
{
"version": "2.0.0",
"version": "3.0.0",
"name": "CheckboxGroup",
"type": "component",
"cName": "多选按钮组",
Expand Down Expand Up @@ -632,7 +632,7 @@
"author": "vickyYe"
},
{
"version": "2.0.0",
"version": "3.0.0",
"name": "Rate",
"type": "component",
"cName": "评分",
Expand Down Expand Up @@ -913,7 +913,7 @@
"author": "swag~jun"
},
{
"version": "2.0.0",
"version": "3.0.0",
"name": "AnimatingNumbers",
"type": "component",
"cName": "数字动画",
Expand Down
70 changes: 0 additions & 70 deletions src/packages/actionsheet/actionsheet.harmony.css

This file was deleted.

2 changes: 1 addition & 1 deletion src/packages/actionsheet/demo.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { useTranslate } from '../../sites/assets/locale'
import { useTranslate } from '@/sites/assets/locale'

import Demo1 from './demos/h5/demo1'
import Demo2 from './demos/h5/demo2'
Expand Down
48 changes: 0 additions & 48 deletions src/packages/address/address.harmony.css

This file was deleted.

2 changes: 1 addition & 1 deletion src/packages/address/demo.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { useTranslate } from '../../sites/assets/locale'
import { useTranslate } from '@/sites/assets/locale'
import Demo1 from './demos/h5/demo1'
import Demo2 from './demos/h5/demo2'
import Demo3 from './demos/h5/demo3'
Expand Down
Loading

0 comments on commit 7d676ce

Please sign in to comment.