Fix pkg version

.github/workflows/auto-publish.yml

@@ -1,72 +1,71 @@
-# 工作流名称
 name: Auto Publish
-# 运行时显示的名称
 run-name: Auto Publish
 
-# 触发条件配置
 on:
   push:
     tags:
       - 'v*'
 
-# 定义工作流中的作业
 jobs:
   build:
-    # 指定运行环境为最新版本的ubuntu
     runs-on: ubuntu-latest
     steps:
-      # 步骤1: 检出代码
       - name: CheckOut Code
         uses: actions/checkout@v4
         with:
           ref: ${{ github.ref_name }}
 
-      # 步骤2: 设置pnpm包管理器
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
 
-      # 步骤3: 设置Node.js环境
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20 # 使用Node.js 20版本
-          registry-url: 'https://registry.npmjs.org' # 设置npm registry地址
+          node-version: 20
 
-      # 步骤4: 获取pnpm缓存目录路径
       - name: Get pnpm store directory
         id: pnpm-cache
         run: |
           echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      # 步骤5: 配置pnpm缓存
       - uses: actions/cache@v3
         name: Setup pnpm cache
         with:
           path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
-          # 使用操作系统类型和pnpm-lock.yaml的哈希值作为缓存键
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      # 步骤6: 安装项目依赖
       - name: Install dependencies
         run: pnpm i --no-frozen-lockfile
 
-      # 步骤7: 构建组件
       - name: Run Build Components
         run: pnpm build && pnpm build:theme
 
-      # 步骤8: 发布组件到NPM
-      - name: Publish components
-        run: pnpm pub && pnpm pub:theme
+      - name: Publish @opentiny/vue-mobile
+        run: |
+          TOKEN=$(printf '%s' "$NODE_AUTH_TOKEN" | tr -d '[:space:]')
+          npm config set registry https://registry.npmjs.org/
+          npm config set //registry.npmjs.org/:_authToken "$TOKEN"
+          npm publish --access=public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        working-directory: packages/mobile
+
+      - name: Publish @opentiny/vue-theme-mobile
+        run: |
+          TOKEN=$(printf '%s' "$NODE_AUTH_TOKEN" | tr -d '[:space:]')
+          npm config set registry https://registry.npmjs.org/
+          npm config set //registry.npmjs.org/:_authToken "$TOKEN"
+          npm publish --access=public
         env:
-          # 使用NPM令牌进行身份验证
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        working-directory: packages/theme-mobile/dist
 
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{ github.ref_name }}
           generate_release_notes: true
         env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "opentiny-vue-mobile",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.0.2-alpha.1",
   "private": true,
   "packageManager": "pnpm@9.14.2",
   "description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.",

packages/demos/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opentiny/vue-mobile-demos",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.0.2-alpha.1",
   "description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.",
   "author": "OpenTiny Team",
   "license": "MIT",

packages/theme-mobile/build/gulp-dist.js

@@ -1,33 +1,107 @@
-/**
- * 打包 src 目录到 dist 目录
- */
-
 const gulp = require('gulp')
 const less = require('gulp-less')
 const cssmin = require('gulp-clean-css')
 const prefixer = require('gulp-autoprefixer')
 const fg = require('fast-glob')
 const fs = require('node:fs')
+const path = require('path')
 
 const source = '../src'
 const dist = '../dist'
 
-// 将所有组件下的index.less合并到src下的index.less
-const fileList = fg.sync('../src/*/index.less')
-const importStr = fileList
-  .map((filePath) => filePath.replace('../src/', './'))
-  .map((path) => `@import '${path}';`)
-  .join('\n')
-const note = fs.readFileSync('../src/index.less', { encoding: 'utf-8' }).match(/(^\/\*\*.+?\*\/)/s)[0]
-fs.writeFileSync('../src/index.less', `${note}\n\n${importStr}`)
+function resolveVueTheme(importPath) {
+  const candidates = [
+    '@opentiny/vue-theme/' + importPath.replace(/\.css$/, '.less'),
+    '@opentiny/vue-theme/' + importPath
+  ]
+  for (const c of candidates) {
+    try {
+      const resolved = require.resolve(c, {
+        paths: [
+          path.resolve(__dirname, '../'),
+          path.resolve(__dirname, '../../')
+        ]
+      })
+      if (fs.existsSync(resolved)) {
+        return resolved.replace(/\\/g, '/')
+      }
+    } catch (e) {
+      continue
+    }
+  }
+  return null
+}
+
+const VueThemeResolver = {
+  install: function(less, pluginManager) {
+    pluginManager.addPreProcessor({
+      process: function(src, extra) {
+        return src.replace(
+          /@import\s+["']@opentiny\/vue-theme\/([^"']+)["']/g,
+          function(match, importPath) {
+            const resolved = resolveVueTheme(importPath)
+            if (resolved) {
+              // 关键修复：如果是 .css 文件，直接内联内容，彻底绕过 less 的路径解析
+              // pnpm store 路径中的 + 号会被 less URL 解码成空格，导致绝对路径失效
+              if (resolved.endsWith('.css')) {
+                try {
+                  return fs.readFileSync(resolved, 'utf-8')
+                } catch (e) {
+                  console.warn('Warning: Cannot read ' + resolved, e.message)
+                  return match
+                }
+              }
+              return '@import "' + resolved + '"'
+            }
+            console.warn('Warning: Cannot resolve @opentiny/vue-theme/' + importPath)
+            return match
+          }
+        )
+      }
+    })
+  }
+}
+
+function mergeIndexLess() {
+  const indexLessPath = path.resolve(__dirname, '../src/index.less')
+
+  if (!fs.existsSync(indexLessPath)) {
+    throw new Error(`index.less not found at ${indexLessPath}`)
+  }
+
+  const fileList = fg.sync(path.resolve(__dirname, '../src/*/index.less'))
+  const importStr = fileList
+    .map((filePath) => path.relative(path.dirname(indexLessPath), filePath))
+    .map((p) => `@import './${p.replace(/\\/g, '/')}';`)
+    .join('\n')
+
+  const content = fs.readFileSync(indexLessPath, { encoding: 'utf-8' })
+  const match = content.match(/(^\/\*\*.+?\*\/)/s)
+
+  let note = ''
+  if (match) {
+    note = match[0]
+  } else {
+    console.warn('Warning: No JSDoc comment block found at top of index.less')
+  }
+
+  const output = `${note}\n\n${importStr}`.trim() + '\n'
+  fs.writeFileSync(indexLessPath, output)
+}
 
 gulp.task('compile', () => {
+  mergeIndexLess()
+
   return gulp
     .src([`${source}/**/index.less`, `${source}/index.less`])
-    .pipe(less())
+    .pipe(
+      less({
+        plugins: [VueThemeResolver]
+      })
+    )
     .pipe(
       prefixer({
-        borwsers: ['last 1 version', '> 1%', 'not ie <= 8'],
+        overrideBrowserslist: ['last 1 version', '> 1%', 'not ie <= 8'],
         cascade: true,
         remove: true
       })
@@ -48,4 +122,4 @@ gulp.task('copyimage', () => {
   return gulp.src([`${source}/images/**`]).pipe(gulp.dest(`${dist}/images`))
 })
 
-gulp.task('build', gulp.series('compile', 'copycssvar', 'copysvgs', 'copyimage'))
+gulp.task('build', gulp.series('compile', 'copycssvar', 'copysvgs', 'copyimage'))