Skip to content

Commit b85c307

Browse files
oasis-cloudoasis-cloud
authored
chore: update alias (#2908)
* chore: update alias * chore: update alias * chore: update lockfile
1 parent b3ccaa2 commit b85c307

File tree

15 files changed

+374
-269
lines changed

15 files changed

+374
-269
lines changed

‎package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "@nutui/nutui-react-taro",
3-
"version": "3.0.0-beta.10",
2+
"name": "@dongdesign/components",
3+
"version": "3.0.0-beta.1",
44
"style": "dist/style.css",
55
"main": "dist/nutui.react.umd.js",
66
"module": "dist/es/packages/nutui.react.build.js",
@@ -40,10 +40,7 @@
4040
"LICENSE",
4141
"CHANGELOG.md"
4242
],
43-
"publishConfig": {
44-
"access": "public",
45-
"registry": "https://registry.npmjs.org/"
46-
},
43+
4744
"scripts": {
4845
"add": "node scripts/create-component-mode.js && npm run prepare",
4946
"add:taro:config": "node scripts/taro/generate-taro-route.js",

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

Lines changed: 51 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -80,41 +80,57 @@ const config = {
8080
exclude: ['@nutui/icons-react-taro'],
8181
},
8282
},
83-
alias:
84-
process.env.TARO_ENV === 'rn' || process.env.TARO_ENV === 'jdrn'
85-
? {
86-
'@nutui/nutui-react-taro/dist/locales/en-US': path.resolve(
87-
__dirname,
88-
'../nutui-react/locales/en-US.ts'
89-
),
90-
'@/packages': path.resolve(__dirname, '../nutui-react/packages'),
91-
'@/sites': path.resolve(__dirname, '../nutui-react/sites'),
92-
'@/locales': path.resolve(__dirname, '../nutui-react/locales'),
93-
'@/utils': path.resolve(__dirname, '../nutui-react/utils'),
94-
'@nutui/nutui-react-taro': path.resolve(
95-
__dirname,
96-
'../nutui-react/packages/nutui.react.rn.ts'
97-
),
98-
'@nutui/icons-react-taro': path.resolve(
99-
__dirname,
100-
'../nutui-react/packages/nutui.react.rn.ts'
101-
),
102-
'@styles': path.resolve(__dirname, '../styles'),
103-
}
104-
: {
105-
'@nutui/nutui-react-taro/dist/locales/en-US': path.resolve(
106-
__dirname,
107-
'../../../src/locales/en-US.ts'
108-
),
109-
'@/packages': path.resolve(__dirname, '../../../src/packages'),
110-
'@/sites': path.resolve(__dirname, '../../../src/sites'),
111-
'@/locales': path.resolve(__dirname, '../../../src/locales'),
112-
'@/utils': path.resolve(__dirname, '../../../src/utils'),
113-
'@nutui/nutui-react-taro': path.resolve(
114-
__dirname,
115-
'../../../src/packages/nutui.react.taro.ts'
116-
),
117-
},
83+
alias: {
84+
'@nutui/nutui-react-taro/dist/es/lottie/animation/light/loading.json':
85+
path.resolve(
86+
__dirname,
87+
'../../../src/packages/lottie/animation/light/loading.json'
88+
),
89+
'@nutui/nutui-react-taro/dist/es/lottie/animation/light/global.json':
90+
path.resolve(
91+
__dirname,
92+
'../../../src/packages/lottie/animation/light/global.json'
93+
),
94+
'@nutui/nutui-react-taro/dist/es/lottie/animation/light/pulltorefresh.json':
95+
path.resolve(
96+
__dirname,
97+
'../../../src/packages/lottie/animation/light/pulltorefresh.json'
98+
),
99+
100+
'@nutui/nutui-react-taro/dist/es/lottie/animation/dark/loading.json':
101+
path.resolve(
102+
__dirname,
103+
'../../../src/packages/lottie/animation/dark/loading.json'
104+
),
105+
'@nutui/nutui-react-taro/dist/es/lottie/animation/dark/global.json':
106+
path.resolve(
107+
__dirname,
108+
'../../../src/packages/lottie/animation/dark/global.json'
109+
),
110+
'@nutui/nutui-react-taro/dist/es/lottie/animation/dark/pulltorefresh.json':
111+
path.resolve(
112+
__dirname,
113+
'../../../src/packages/lottie/animation/dark/pulltorefresh.json'
114+
),
115+
'@nutui/nutui-react-taro/dist/es/lottie/animation/dark/pulltorefresh-white.json':
116+
path.resolve(
117+
__dirname,
118+
'../../../src/packages/lottie/animation/dark/pulltorefresh-white.json'
119+
),
120+
121+
'@nutui/nutui-react-taro/dist/locales/en-US': path.resolve(
122+
__dirname,
123+
'../../../src/locales/en-US.ts'
124+
),
125+
'@/packages': path.resolve(__dirname, '../../../src/packages'),
126+
'@/sites': path.resolve(__dirname, '../../../src/sites'),
127+
'@/locales': path.resolve(__dirname, '../../../src/locales'),
128+
'@/utils': path.resolve(__dirname, '../../../src/utils'),
129+
'@nutui/nutui-react-taro': path.resolve(
130+
__dirname,
131+
'../../../src/packages/nutui.react.taro.ts'
132+
),
133+
},
118134
sass: {
119135
resource: [
120136
path.resolve(__dirname, '../../../', fileStr),

‎packages/nutui-taro-demo/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@
8686
"babel-plugin-import": "^1.13.8",
8787
"lodash.isequal": "^4.5.0",
8888
"lodash.kebabcase": "^4.1.1",
89+
"lottie-miniprogram": "^1.0.12",
90+
"lottie-react": "^2.4.0",
8991
"react": "^18.2.0",
9092
"react-dom": "^18.2.0",
9193
"react-refresh": "^0.14.0",

‎pnpm-lock.yaml

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

‎src/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@
11941194
"taro": true,
11951195
"v15": true,
11961196
"author": "swag~jun",
1197-
"dd": false
1197+
"dd": true
11981198
},
11991199
{
12001200
"version": "3.0.0",

‎src/packages/configprovider/types.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ export type NutCSSVariables =
66
| 'nutuiColorPrimaryDisabled'
77
| 'nutuiBrand3'
88
| 'nutuiBrand1'
9-
| 'nutuiRed6'
10-
| 'nutuiGray8'
11-
| 'nutuiRed3'
9+
| 'nutuiColorPrimaryIcon'
10+
| 'nutuiColorPrimaryIconDisabled'
11+
| 'nutuiColorPrimarySpecialdisabled'
1212
| 'nutuiColorDefault'
1313
| 'nutuiColorDefaultPressed'
1414
| 'nutuiColorDefaultLight'

‎src/packages/loading/demos/h5/demo1.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import { Cell, Loading } from '@nutui/nutui-react'
3-
import data from '../../../lottie/animation/light/loading.json'
3+
import data from '@nutui/nutui-react/dist/es/lottie/animation/light/loading.json'
44

55
const Demo1 = () => {
66
return (

‎src/packages/loading/demos/taro/demo1.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import { Cell, Loading } from '@nutui/nutui-react-taro'
3-
import data from '@/packages/lottie/animation/light/loading.json'
3+
import data from '@nutui/nutui-react-taro/dist/es/lottie/animation/light/loading.json'
44

55
const Demo1 = () => {
66
return (

‎src/packages/lottie/demos/h5/demo1.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react'
22
import { Cell, Lottie } from '@nutui/nutui-react'
3-
import lightLoading from '../../animation/light/loading.json'
4-
import lightGlobal from '../../animation/light/global.json'
5-
import lightPull from '../../animation/light/pulltorefresh.json'
3+
import lightLoading from '@nutui/nutui-react/dist/es/lottie/animation/light/loading.json'
4+
import lightGlobal from '@nutui/nutui-react/dist/es/lottie/animation/light/global.json'
5+
import lightPull from '@nutui/nutui-react/dist/es/lottie/animation/light/pulltorefresh.json'
66

77
const Demo1 = () => {
88
return (

‎src/packages/lottie/demos/h5/demo2.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react'
22
import { Cell, Lottie } from '@nutui/nutui-react'
3-
import darkLoading from '../../animation/dark/loading.json'
4-
import darkGlobal from '../../animation/dark/global.json'
5-
import darkPull from '../../animation/dark/pulltorefresh.json'
3+
import darkLoading from '@nutui/nutui-react/dist/es/lottie/animation/dark/loading.json'
4+
import darkGlobal from '@nutui/nutui-react/dist/es/lottie/animation/dark/global.json'
5+
import darkPull from '@nutui/nutui-react/dist/es/lottie/animation/dark/pulltorefresh.json'
66

77
const Demo2 = () => {
88
return (

0 commit comments

Comments
 (0)