Merge branch 'feat_v3.x_datepickerview' into feat_datepickerview

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui-react-taro",
-  "version": "3.0.0-beta.15",
+  "version": "3.0.0",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/es/packages/nutui.react.build.js",
@@ -221,7 +221,7 @@
     "vinyl-fs": "^4.0.0",
     "vite": "^5.1.3",
     "vite-plugin-dts": "4.2.1",
-    "vitest": "^3.0.0",
+    "vitest": "^3.0.7",
     "vitest-canvas-mock": "^0.3.3",
     "yargs": "^17.7.2"
   },

packages/nutui-taro-demo/package.json

@@ -60,7 +60,7 @@
     "@dongdesign/inject-jd-platform-styles": "1.0.4",
     "@jdtaro/plugin-platform-jdhybrid": "0.2.1",
     "@jdtaro/taro-platform-jdharmony": "2.0.70",
-    "@jdtaro/plugin-platform-jdharmony-cpp": "0.1.22",
+    "@jdtaro/plugin-platform-jdharmony-cpp": "0.1.29-beta.0",
     "@nutui/replace-icons": "^1.0.0",
     "@nutui/touch-emulator": "^1.0.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",

scripts/build-taro.mjs

@@ -12,7 +12,7 @@ import { access, mkdir, readFile, writeFile } from 'fs/promises'
 import { basename, dirname, extname, join, relative, resolve } from 'path'
 import j from 'jscodeshift'
 import { readFileSync } from 'fs'
-import { relativeFilePath } from './relative-path.mjs'
+import { relativePath } from './relative-path.mjs'
 import { codeShift } from './build-comments-to-dts.mjs'
 import { generate } from './build-theme-typings.mjs'
 
@@ -59,7 +59,7 @@ const transform = (file, api, replace) => {
       return
     }
     const dir = join(__dirname, alias.replace('@/', '../src/'))
-    path.node.source.value = relativeFilePath(file.path, dir)?.replace(
+    path.node.source.value = relativePath(dir, file.path)?.replace(
       '.taro',
       '',
     )
@@ -232,32 +232,23 @@ async function buildUMD() {
 
 async function buildAllCSS() {
   // 拷贝styles
-  async function copyStyles() {
-    await copy(
-      resolve(__dirname, '../src/styles'),
-      resolve(__dirname, `../${dist}/styles`),
-    )
-
+  async function generateAllStyles() {
+    const projectID = process.env.VITE_APP_PROJECT_ID
     const content = [
-      `@import './styles/theme-default.scss';`,
-      `@import './styles/variables.scss';`,
+      `@import './styles/variables${projectID ? `-${projectID}` : ''}.scss';`,
       `@import './styles/mixins/index.scss';`,
       `@import './styles/animation/index.scss';`,
     ]
-    const projectID = process.env.VITE_APP_PROJECT_ID
-    if (projectID) {
-      content[1] = `@import '../variables-${projectID}.scss';`
-    }
     const scssFiles = await glob([`${dist}/es/packages/**/*.scss`])
     scssFiles.forEach((file) => {
       content.push(
-        `@import '${relativeFilePath(`/${dist}/style.scss`, '/' + file)}';`,
+        `@import '${relativePath('/' + file, `/${dist}/style.scss`)}';`,
       )
     })
     dest(`${dist}/style.scss`, content.join('\n'))
   }
 
-  await copyStyles()
+  await generateAllStyles()
   await vite.build({
     logLevel: 'error',
     resolve: {
@@ -277,6 +268,25 @@ async function buildAllCSS() {
 }
 
 async function buildThemeCSS() {
+  const files = await glob([`${dist}/styles/theme-*.scss`], {
+    ignore: [`${dist}/types/src/**/*.taro.d.ts`],
+  })
+  const projectID = process.env.VITE_APP_PROJECT_ID
+  const inputFiles = {}
+  files.forEach(filePath => {
+    const themeName = basename(filePath, 'scss').replace('theme-', '')
+    if (!projectID) {
+      inputFiles[themeName] = `./${filePath}`
+    } else {
+      if (themeName === projectID) {
+        inputFiles['default'] = `./${filePath}`
+      }
+      if (themeName === `${projectID}-dark`) {
+        inputFiles['dark'] = `./${filePath}`
+      }
+    }
+  })
+
   await vite.build({
     logLevel: 'error',
     resolve: {
@@ -285,16 +295,14 @@ async function buildThemeCSS() {
     build: {
       emptyOutDir: false,
       rollupOptions: {
+        input: inputFiles,
         output: [
           {
             dir: `${dist}/styles/themes`,
-            assetFileNames: 'default.css',
+            assetFileNames: '[name].css',
           },
         ],
       },
-      lib: {
-        entry: `./${dist}/styles/themes/default.scss`,
-      },
     },
   })
 }
@@ -305,21 +313,6 @@ async function copyStyles() {
     resolve(__dirname, '../src/styles'),
     resolve(__dirname, `../${dist}/styles`),
   )
-
-  let content = [
-    `@import '../theme-default.scss';`,
-    `@import '../theme-dark.scss';`,
-    `@import '../jd-font';`,
-  ]
-  const projectID = process.env.VITE_APP_PROJECT_ID
-  if (projectID) {
-    content = [
-      `@import '../theme-${projectID}.scss';`,
-      `@import '../jd-font';`,
-    ]
-  }
-
-  dest(`${dist}/styles/themes/default.scss`, content.join('\n'))
 }
 
 // 构建样式
@@ -443,6 +436,8 @@ async function copyReleaseFiles() {
   const npmPublishDir = dist.replace('dist', '')
   await copy(join(__dirname, '../README.md'), join(`${npmPublishDir}/README.md`))
   await copy(join(__dirname, '../CHANGELOG.md'), join(`${npmPublishDir}/CHANGELOG.md`))
+  await copy(join(__dirname, '../src/packages/lottie/animation'), join(`${npmPublishDir}/dist/es/packages/lottie/animation`))
+  await copy(join(__dirname, '../src/packages/lottie/animation'), join(`${npmPublishDir}/dist/cjs/packages/lottie/animation`))
   await writeFile(join(__dirname, `../${npmPublishDir}/package.json`), generateReleasePackageJson())
 }
 
@@ -484,8 +479,6 @@ console.time('Build Declaration')
 await buildDeclaration()
 console.timeEnd('Build Declaration')
 
-// await exportProps()
-
 await deleteAsync([
   `${dist}/es/packages/nutui.react.js`,
   `${dist}/es/packages/nutui.react.d.ts`,

scripts/build.mjs

@@ -12,7 +12,7 @@ import { access, mkdir, readFile, writeFile } from 'fs/promises'
 import { basename, dirname, extname, join, relative, resolve } from 'path'
 import j from 'jscodeshift'
 import { readFileSync } from 'fs'
-import { relativeFilePath } from './relative-path.mjs'
+import { relativePath } from './relative-path.mjs'
 import { codeShift } from './build-comments-to-dts.mjs'
 import { generate } from './build-theme-typings.mjs'
 
@@ -120,7 +120,7 @@ async function buildDeclaration() {
             : ''
         if (!importAlias) return
         const dir = join(__dirname, importAlias.replace('@/', '../src/'))
-        path.node.source.value = relativeFilePath(file.path, dir)
+        path.node.source.value = relativePath(dir, file.path)
       })
       .toSource()
   }
@@ -177,35 +177,26 @@ async function buildUMD(p) {
     },
   })
 }
-
+// 针对不同包构建全量的 style
 async function buildAllCSS() {
   // 拷贝styles
-  async function copyStyles() {
-    await copy(
-      resolve(__dirname, '../src/styles'),
-      resolve(__dirname, `../${dist}/styles`),
-    )
-
+  async function generateAllStyles() {
+    const projectID = process.env.VITE_APP_PROJECT_ID
     const content = [
-      `@import './styles/theme-default.scss';`,
-      `@import './styles/variables.scss';`,
+      `@import './styles/variables${projectID ? `-${projectID}` : ''}.scss';`,
       `@import './styles/mixins/index.scss';`,
       `@import './styles/animation/index.scss';`,
     ]
-    const projectID = process.env.VITE_APP_PROJECT_ID
-    if (projectID) {
-      content[1] = `@import '../variables-${projectID}.scss';`
-    }
     const scssFiles = await glob([`${dist}/es/packages/**/*.scss`])
     scssFiles.forEach((file) => {
       content.push(
-        `@import '${relativeFilePath(`/${dist}/style.scss`, '/' + file)}';`,
+        `@import '${relativePath('/' + file, `/${dist}/style.scss`)}';`,
       )
     })
     dest(`${dist}/style.scss`, content.join('\n'))
   }
 
-  await copyStyles()
+  await generateAllStyles()
   await vite.build({
     logLevel: 'error',
     resolve: {
@@ -225,6 +216,30 @@ async function buildAllCSS() {
 }
 
 async function buildThemeCSS() {
+  const files = await glob([`${dist}/styles/theme-*.scss`], {
+    ignore: [`${dist}/types/src/**/*.taro.d.ts`],
+  })
+  const projectID = process.env.VITE_APP_PROJECT_ID
+  const inputFiles = {}
+  // nuitui 官方包包含全部主题文件，包括：
+  // default.css 默认明亮主题
+  // dark.css 默认暗黑主题
+  // jmapp.css、jrkf.css 主题
+  // 例如：jmapp 包只包含 jmapp 的主题文件，且是默认主题文件。
+  files.forEach(filePath => {
+    const themeName = basename(filePath, 'scss').replace('theme-', '')
+    if (!projectID) {
+      inputFiles[themeName] = `./${filePath}`
+    } else {
+      if (themeName === projectID) {
+        inputFiles['default'] = `./${filePath}`
+      }
+      if (themeName === `${projectID}-dark`) {
+        inputFiles['dark'] = `./${filePath}`
+      }
+    }
+  })
+
   await vite.build({
     logLevel: 'error',
     resolve: {
@@ -233,41 +248,23 @@ async function buildThemeCSS() {
     build: {
       emptyOutDir: false,
       rollupOptions: {
+        input: inputFiles,
         output: [
           {
             dir: `${dist}/styles/themes`,
-            assetFileNames: 'default.css',
+            assetFileNames: '[name].css',
           },
         ],
       },
-      lib: {
-        entry: `./${dist}/styles/themes/default.scss`,
-      },
     },
   })
 }
 
-// 拷贝styles
 async function copyStyles() {
   await copy(
     resolve(__dirname, '../src/styles'),
     resolve(__dirname, `../${dist}/styles`),
   )
-
-  let content = [
-    `@import '../theme-default.scss';`,
-    `@import '../theme-dark.scss';`,
-    `@import '../jd-font';`,
-  ]
-  const projectID = process.env.VITE_APP_PROJECT_ID
-  if (projectID) {
-    content = [
-      `@import '../theme-${projectID}.scss';`,
-      `@import '../jd-font';`,
-    ]
-  }
-
-  dest(`${dist}/styles/themes/default.scss`, content.join('\n'))
 }
 
 // 构建样式
@@ -384,6 +381,8 @@ async function copyReleaseFiles() {
   const npmPublishDir = dist.replace('dist', '')
   await copy(join(__dirname, '../README.md'), join(`${npmPublishDir}/README.md`))
   await copy(join(__dirname, '../CHANGELOG.md'), join(`${npmPublishDir}/CHANGELOG.md`))
+  await copy(join(__dirname, '../src/packages/lottie/animation'), join(`${npmPublishDir}/dist/es/packages/lottie/animation`))
+  await copy(join(__dirname, '../src/packages/lottie/animation'), join(`${npmPublishDir}/dist/cjs/packages/lottie/animation`))
   await writeFile(join(__dirname, `../${npmPublishDir}/package.json`), generateReleasePackageJson())
 }
 
@@ -438,4 +437,4 @@ console.timeEnd('Build JSDoc')
 
 console.time('Copy package.json readme.md')
 await copyReleaseFiles()
-console.timeEnd('Copy package.json readme.md')
+console.timeEnd('Copy package.json readme.md')

scripts/relative-path.mjs

@@ -1,33 +1,21 @@
-import * as path from 'path'
+import { resolve } from 'path'
 
-export function relativeFilePath(from, to) {
-  if (
-    (from[0] === path.sep && to[0] !== path.sep) ||
-    (from[0] !== path.sep && to[0] === path.sep)
-  ) {
-    return ''
-  }
-
-  if (from[from.length - 1] === path.sep || to[to.length - 1] === path.sep) {
-    return ''
-  }
+export function relativePath(target, source) {
+  const resolveSource = resolve(source)
+  const resolveTarget = resolve(target)
 
-  const fromPath = from.split(path.sep)
-  const toPath = to.split(path.sep)
-
-  let i = 0
-  while (i < fromPath.length - 1) {
-    if (toPath[i] === undefined || fromPath[i] !== toPath[i]) {
-      break
-    }
-    ++i
+  let str = resolveTarget.substr(0, resolve(resolveTarget).lastIndexOf('/'))
+  while (resolveSource.indexOf(str) == -1) {
+    str = str.substr(0, str.lastIndexOf('/'))
   }
 
-  const val = toPath.slice(i).join(path.sep)
-
-  if (i === fromPath.length - 1) {
-    return '.' + path.sep + val
+  const remain = resolveSource.replace(str+'/', '')
+  const matchedSlash = remain.match(/\//g)
+  let res = ''
+  if (!matchedSlash) {
+    res = resolveTarget.replace(str+'/', './')
+  } else {
+    res = resolveTarget.replace(str+'/', '../'.repeat(matchedSlash.length))
   }
-
-  return `..${path.sep}`.repeat(fromPath.length - 1 - i) + val
-}
+  return res
+}

scripts/replace-css-var.js

@@ -22,7 +22,7 @@ const variables = fs.readFileSync(
 
 const theme = fs.readFileSync(
   path.join(__dirname, '../src/styles/theme-default.scss'),
-).toString()
+).toString().replace('@import "./jd-font";', '').replace(`@import './jd-font';`, '')
 
 const exclude = ['icon']
 components.forEach((component) => {