Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8747782
fix: demo增加header
irisSong Jun 27, 2024
f133e8e
fix: rn copy脚本修改
irisSong Jun 28, 2024
feb2f3d
Merge remote-tracking branch 'upstream/dev-harmony' into dev-harmony
irisSong Jun 28, 2024
c4a6a12
fix(countdown): taro不区分四端实现方式
irisSong Jun 28, 2024
fee1fa3
fix: 合并主分支
irisSong Jul 5, 2024
92f2a6c
Merge remote-tracking branch 'upstream/dev-harmony' into dev-harmony
irisSong Jul 15, 2024
cab093a
fix: rn分支可以跑所有端+简化rn流程
irisSong Jul 17, 2024
dc1e3b9
Merge branch 'dev-harmony' into dev-harmony-optimize-rn
irisSong Jul 19, 2024
53e2bc9
fix: 暂时只把hybird合并到rn分支
irisSong Jul 19, 2024
a95a57c
fix: 恢复配置
irisSong Jul 19, 2024
e853f33
fix: cr修改和冲突修复
irisSong Jul 22, 2024
c12046e
Merge branch 'dev-harmony' into dev-harmony-optimize-rn
irisSong Jul 22, 2024
3a0296c
feat: 创建harmony壳工程
irisSong Jul 22, 2024
7d85b70
chore: 合并主分支
irisSong Jul 22, 2024
e92d4b9
chore: 合并主分支
irisSong Jul 22, 2024
a5dabc0
feat: jdharmony壳工程
irisSong Jul 23, 2024
bbb3398
feat: 拷贝文件和更新文件分离
irisSong Jul 23, 2024
6517c9c
chore: 更新依赖
irisSong Jul 23, 2024
0a100b8
chore: 更新依赖
irisSong Jul 23, 2024
9de42cd
chore: rn分支和其他分支合并
irisSong Jul 23, 2024
e8074ad
fix: 删除nutui-taro-demo-rn文件夹
irisSong Jul 23, 2024
eb7acb3
fix: 未适配的不更新入口
irisSong Jul 23, 2024
7e2cf7a
fix: 更新壳工程文件
irisSong Jul 23, 2024
bc5af8c
fix: 解决breaking change for sass@1.77.7
irisSong Jul 23, 2024
771f20a
chore: 合并dev-harmony分支
irisSong Jul 23, 2024
8077876
fix: 删除无用文件
irisSong Jul 23, 2024
6a50514
fix: 删除壳工程
irisSong Jul 23, 2024
9e2a85c
feat: 隐藏jdhybird的提示页面+taro依赖升级
irisSong Jul 24, 2024
f74ed13
feat: harmony壳工程自动下载
irisSong Jul 24, 2024
5e89ea3
feat: 取消demo入口自动化创建
irisSong Jul 24, 2024
9f984a9
Merge branch 'dev-harmony' into dev-harmony-update
xiaoyatong Jul 24, 2024
3e451c2
feat: 删除demo样式文件+harmony clone路径变更
irisSong Jul 24, 2024
07df26c
Merge branch 'dev-harmony-update' of https://github.com/irisSong/nutu…
irisSong Jul 24, 2024
820286a
fix: 恢复分享函数+demo列表页class格式修改
irisSong Jul 24, 2024
a36f316
feat: jdharmony相关配置更新
irisSong Jul 24, 2024
5a8ba69
fix: 移除git地址
irisSong Jul 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ iconfont.js
**/nutui.react.build.taro.ts
**/app.config.ts
packages/nutui-taro-demo/**/*
packages/nutui-taro-demo-rn/**/*
packages/nutui-harmony/**/*
packages/nutui-jdharmony/**/*
packages/nutui-templates/**/*
packages/nutui-codemod/test/*
packages/nutui-codemod/transforms/__test__/*
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ package-lock.json
/tsc/test
/site_docs
/coverage
/packages/nutui-jdharmony

# local env files
.env.local
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ gulp.task('watch', function () {
)
})
argvs.forEach((argv) => {
const targetBaseUrl = `${process.cwd()}/packages/nutui-taro-demo-rn/nutui-react/packages/${argv}`
const targetBaseUrl = `${process.cwd()}/packages/nutui-taro-demo/nutui-react/packages/${argv}`
gulp.task(`${argv}copyDemo`, function (path) {
console.log(path, 'path')
return gulp
Expand Down
19 changes: 11 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,19 @@
"dev:rtl": "VITE_RTL=rtl vite --open --force",
"dev:jmapp": "VITE_APP_PROJECT_ID=jmapp vite --open --force",
"dev:theme": "npm run generate:themes-dev && npm run checked && vite --force --config vite.config.theme.ts",
"dev:taro:weapp": "pnpm --dir ./packages/nutui-taro-demo dev:weapp",
"dev:taro:jd": "pnpm --dir ./packages/nutui-taro-demo dev:jd",
"dev:taro:weapp": "pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev:weapp",
"dev:taro:jd": "pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev:jd",
"build:taro:jd": "pnpm --dir ./packages/nutui-taro-demo build:jd",
"dev:taro:h5": "pnpm --dir ./packages/nutui-taro-demo dev:h5",
"dev:taro:h5": "pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev:h5",
"dev:taro:h5:jmapp": "pnpm --dir ./packages/nutui-taro-demo dev:h5:jmapp",
"dev:taro:alipay": "pnpm --dir ./packages/nutui-taro-demo dev:alipay",
"dev:taro:harmony": "pnpm --dir ./packages/nutui-taro-demo dev:harmony",
"dev:taro:jdharmony": "pnpm --dir ./packages/nutui-taro-demo dev:jdharmony",
"dev:taro:jdhybrid": "pnpm --dir ./packages/nutui-taro-demo-rn dev:jdhybrid",
"rn:copy": "node ./scripts/rn/copy-file.js",
"dev:taro:jdrn": "pnpm run rn:copy && pnpm --dir ./packages/nutui-taro-demo-rn dev:jdrn & pnpm run gulp:watch",
"dev:taro:harmony": "pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev:harmony",
"dev:taro:jdharmony": "pnpm run clone:jdharmony && pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev:jdharmony",
"dev:taro:jdhybrid": "pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev:jdhybrid",
"clone:jdharmony": "node ./scripts/harmony/clone-jdharmony.js",
"update:taro:entry": "node ./scripts/rn/update-taro-entry",
"clone:rn": "pnpm run update:taro:entry && node ./scripts/rn/copy-file.js",
"dev:taro:jdrn": "pnpm run clone:rn && pnpm --dir ./packages/nutui-taro-demo dev:jdrn & pnpm run gulp:watch",
"dev:taro:rn:dark": "THEME=dark pnpm dev:taro:rn",
"gulp:watch": "gulp watch --environment",
"dev:taro:weapp:jmapp": "pnpm --dir ./packages/nutui-taro-demo && npm run dev:weapp:jmapp",
Expand Down Expand Up @@ -207,6 +209,7 @@
"vite-plugin-dts": "3.6.4",
"vitest": "^1.4.0",
"vitest-canvas-mock": "^0.3.3",
"simple-git": "^3.25.0",
"yargs": "^17.7.2"
},
"peerDependencies": {
Expand Down
12 changes: 0 additions & 12 deletions packages/nutui-taro-demo-rn/.editorconfig

This file was deleted.

7 changes: 0 additions & 7 deletions packages/nutui-taro-demo-rn/.eslintrc

This file was deleted.

8 changes: 0 additions & 8 deletions packages/nutui-taro-demo-rn/.gitignore

This file was deleted.

17 changes: 0 additions & 17 deletions packages/nutui-taro-demo-rn/ReadMe.md

This file was deleted.

17 changes: 0 additions & 17 deletions packages/nutui-taro-demo-rn/babel.config.js

This file was deleted.

43 changes: 0 additions & 43 deletions packages/nutui-taro-demo-rn/config/dev.js

This file was deleted.

Loading