main to dev

.all-contributorsrc

@@ -544,6 +544,42 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "handsomezyw",
+      "name": "handsomezyw",
+      "avatar_url": "https://avatars.githubusercontent.com/u/34366225?v=4",
+      "profile": "https://github.com/handsomezyw",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "iamyoki",
+      "name": "Yoki",
+      "avatar_url": "https://avatars.githubusercontent.com/u/74389358?v=4",
+      "profile": "https://github.com/iamyoki",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "LadyChatterleyLover",
+      "name": "luopei",
+      "avatar_url": "https://avatars.githubusercontent.com/u/35223515?v=4",
+      "profile": "https://github.com/LadyChatterleyLover",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "wowCheng",
+      "name": "Mr.Cheng",
+      "avatar_url": "https://avatars.githubusercontent.com/u/69743874?v=4",
+      "profile": "https://github.com/wowCheng",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 10,

.github/workflows/auto-publish.yml

@@ -0,0 +1,56 @@
+name: Auto publish
+
+on:
+  push:
+    branches: ['dev']
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: CheckOut Code
+        uses: actions/checkout@master
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Get package version
+        uses: tyankatsu0105/read-package-version-actions@v1
+        id: package-version
+        with: 
+          path: packages/devui-vue
+
+      - name: Create a tag
+        uses: negz/create-tag@v1
+        with:
+          version: v${{ steps.package-version.outputs.version }}
+          message: 'Release v${{ steps.package-version.outputs.version }}'
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run Build Scripts
+        working-directory: packages/devui-vue/
+        run: |
+          ls
+          node -v
+          npm install pnpm -g
+          pnpm -v
+          pnpm i
+          pnpm run build:lib
+
+      - name: Publish
+        working-directory: packages/devui-vue/build
+        run: |
+          npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: v${{ steps.package-version.outputs.version }}
+          generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{  secrets.GIT_TOKEN  }}

.github/workflows/pull-request.yml

@@ -35,10 +35,10 @@ jobs:
         run: pnpm i
 
       - name: Build site
-        run: pnpm scripts run build
+        run: pnpm build
 
       - name: ESLint
         run: pnpm cli --filter vue-devui -- code-check -t eslint
 
       - name: Unit test
-        run: pnpm scripts run tests.test
+        run: pnpm cli --filter vue-devui -- code-check -t unit-test

.ls-lint.yml

@@ -16,6 +16,7 @@ ignore:
   - packages/devui-cli/node_modules
   # devui-theme
   - packages/devui-theme/dist
+  - packages/devui-theme/build
   - packages/devui-theme/node_modules
   - packages/devui-theme/src/styles-var
   # devui-vue

package.json

@@ -6,7 +6,9 @@
     "precommit": "lint-staged",
     "scripts": "better-scripts",
     "dev": "pnpm scripts run dev",
-    "build": "pnpm scripts run build"
+    "build": "pnpm scripts run build",
+    "build:lib": "pnpm scripts run build:lib",
+    "test": "pnpm scripts run tests.test"
   },
   "devDependencies": {
     "@commitlint/cli": "^11.0.0",

packages/devui-theme/src/theme-collection/extend-theme-vue.scss

@@ -7,7 +7,7 @@ body[ui-theme='deep-theme'],
 body[ui-theme='galaxy-theme'] {
   // TODO: 组件支持全局配置默认尺寸参数后删除
   // button default size change to '32px'
-  .#{$devui-prefix}-button:not(.#{$devui-prefix}-button--xs):not(.#{$devui-prefix}-button--sm):not(.#{$devui-prefix}-button--lg) {
+  .#{$devui-prefix}-button:not(.#{$devui-prefix}-button--sm):not(.#{$devui-prefix}-button--lg) {
     height: 32px;
     line-height: 32px;
   }

packages/devui-vue/devui-cli/commands/build-volar-support.js

@@ -0,0 +1,67 @@
+const path = require("path");
+const {
+  buildComponentItem,
+  buildGlobalDTSEnd,
+  buildGlobalDTSStart,
+  buildComponents,
+  buildDirectiveItem,
+  buildDirective,
+  buildServiceItem,
+  buildService
+} = require('../templates/dts');
+const { writeFileSync } = require('fs');
+const { useRelationTree } = require("../composables/use-relation-tree");
+const { bigCamelCase } = require('../shared/utils');
+
+/**
+ * @param {Record<string,any>} replaceIdentifier
+ * @param {string[]} readyToReleaseComponentName
+ */
+exports.volarSupport = (replaceIdentifier, readyToReleaseComponentName) => {
+  const componentDTSItem = [];
+  const directiveDTSItem = [];
+  const serviceDTSItem = [];
+  const componentPath = readyToReleaseComponentName.map((name) => path.resolve('./devui', name, 'index.ts'));
+  const tree = useRelationTree(componentPath);
+  tree.forEachChild((foldNode) => {
+    foldNode.forEachChild((node) => {
+      let nodeName = node.name.replace(/\$/gim, '').replace(/directive/gim, '');
+      let reference = nodeName;
+      const needToTransform = replaceIdentifier?.[foldNode.name]?.[node.name] !== undefined;
+      if (!node.isComponet){
+        const hasType = new RegExp(node.type, 'gim');
+        if (!hasType.test(reference)){
+          reference += `-${node.type}`;
+        }
+        reference = bigCamelCase(reference);
+      }
+      if (needToTransform){
+        reference = replaceIdentifier[foldNode.name][node.name]?.['reference'];
+        nodeName = replaceIdentifier[foldNode.name][node.name]?.['exportKey'];
+      }
+      if (node.type === 'component'){
+        componentDTSItem.push(buildComponentItem(bigCamelCase(nodeName), reference));
+      }
+      if (node.type === 'directive'){
+        directiveDTSItem.push(buildDirectiveItem(nodeName, reference));
+      }
+      if (node.type === 'service'){
+        serviceDTSItem.push(buildServiceItem(nodeName, reference));
+      }
+    });
+  });
+  const template = `
+${buildGlobalDTSStart()}
+${buildComponents(componentDTSItem.join('\n'))}
+${buildDirective(directiveDTSItem.join('\n'))}
+${buildService(serviceDTSItem.join('\n'))}
+${buildGlobalDTSEnd()}
+`;
+  try {
+    writeFileSync('./build/global.d.ts', template);
+  } catch (e) {
+    console.log(e.message);
+    return false;
+  }
+  return true;
+};

packages/devui-vue/devui-cli/commands/build.js

@@ -6,7 +6,11 @@ const vue = require('@vitejs/plugin-vue');
 const vueJsx = require('@vitejs/plugin-vue-jsx');
 const nuxtBuild = require('./build-nuxt-auto-import');
 const { isReadyToRelease } = require('../shared/utils');
-
+const { execSync } = require('child_process');
+const { volarSupport } = require('./build-volar-support');
+const logger = require('../shared/logger');
+const replaceIdentifierPath = path.resolve(__dirname,'../replaceIdentifer.json');
+const replaceIdentifier = JSON.parse(fs.readFileSync(replaceIdentifierPath).toString());
 const entryDir = path.resolve(__dirname, '../../devui');
 const outputDir = path.resolve(__dirname, '../../build');
 
@@ -67,7 +71,8 @@ const createPackageJson = (name) => {
   "version": "0.0.0",
   "main": "index.umd.js",
   "module": "index.es.js",
-  "style": "style.css"
+  "style": "style.css",
+  "types": "../types/${name}/index.d.ts"
 }`;
 
   fsExtra.outputFile(path.resolve(outputDir, `${name}/package.json`), fileStr, 'utf-8');
@@ -81,15 +86,31 @@ exports.build = async () => {
     const isDir = fs.lstatSync(componentDir).isDirectory();
     return isDir && fs.readdirSync(componentDir).includes('index.ts');
   });
-
+  const readyToReleaseComponentName = [];
   for (const name of components) {
     if (!isReadyToRelease(name)) {
       continue;
     }
+    readyToReleaseComponentName.push(name);
     await buildSingle(name);
     createPackageJson(name);
     nuxtBuild.createAutoImportedComponent(name);
   }
-
+  // 生成global.d.ts
+  try {
+    execSync(`pnpm run build:components:dts`);
+  } catch {}
   nuxtBuild.createNuxtPlugin();
+  logger.success('准备生成global.d.ts');
+  const volarSupportbuildState = volarSupport(replaceIdentifier, readyToReleaseComponentName);
+  fs.writeFileSync('./build/index.d.ts', `
+export * from './types/vue-devui';
+import _default from './types/vue-devui';
+export default _default;
+`);
+  if (volarSupportbuildState){
+    logger.success('global.d.ts生成成功');
+  } else {
+    logger.error('global.d.ts生成失败, 因为发生错误');
+  }
 };

packages/devui-vue/devui-cli/commands/code-check.js

@@ -5,17 +5,11 @@ const chalk = require('chalk');
 const { isReadyToRelease } = require('../shared/utils');
 
 const log = console.log;
-
 const chalkEslint = chalk.hex('#4b32c3');
-
 const chalkUnitTest = chalk.hex('#99425b');
-
 const chalkError = chalk.hex('#F66F6A');
-
 const chalkSuccess = chalk.hex('#3DCCA6');
-
 const entryDir = path.resolve(__dirname, '../../devui');
-
 const unitTestFailedComponents = [];
 
 const completeComponents = fs.readdirSync(entryDir).filter((name) => {
@@ -87,8 +81,16 @@ const unitTestSome = async (components) => {
 };
 
 const unitTestAll = async () => {
-  for (const name of completeComponents) {
-    await unitTestSingle(name);
+  // 单个组件执行单元测试，总耗时太长
+  // for (const name of completeComponents) {
+  //   await unitTestSingle(name);
+  // }
+
+  const unitTestResult = await shell.exec('pnpm --filter vue-devui test --reporter default');
+  // 解决单元测试报错，但PR合入门禁不中断问题
+  if (/failed|ERR_/.test(unitTestResult.stderr)) {
+    shell.echo(chalkError('Error: Unit test failed.'));
+    shell.exit(1);
   }
 
   log(chalkSuccess('\nCongratulations, all components have passed the unit test!'));

packages/devui-vue/devui-cli/commands/release.js

@@ -17,7 +17,7 @@ const getVersion = (version) => {
 };
 
 const createPackageJson = async (version) => {
-  package.version = getVersion(version);
+  // package.version = getVersion(version);
   package.dependencies = omit(package.dependencies, 'vue');
   const fileStr = JSON.stringify(omit(package, 'scripts', 'devDependencies'), null, 2);
   await fsExtra.outputFile(path.resolve(outputDir, `package.json`), fileStr, 'utf-8');

packages/devui-vue/devui-cli/composables/use-extra.js

@@ -0,0 +1,57 @@
+const ts = require('typescript');
+/**
+ *
+ * @param {string} code node full text.
+ * @returns {RegExpMatchArray  | null}
+ */
+function extraComponentName(code){
+  const regexp = /app\.component\(((?<components>.*)\.name), (?<fileName>.*)\)/;
+  const groups = regexp.exec(code)?.groups;
+  if (groups?.components){
+    return groups.components;
+  }
+}
+/**
+ *
+    app.directive('file-drop', fileDropDirective);
+ * @param {string} code
+ */
+function extraDirective(code){
+  const regexp = /app\.directive\('(?<directiveName>.*), ?(?<fileName>.*)\);/;
+  const groups = regexp.exec(code)?.groups;
+  if (groups?.fileName){
+    return groups.fileName;
+  }
+}
+
+function extraGlobalProperties(code) {
+  const globalPropertiesReg = /app\.config\.globalProperties\.(?<serviceName>\$.*) = (?<serviceFileName>.*);/;
+  const provideReg = /app\.provide\((?<serviceName>.*)\..*, ?new? ?(?<instanceName>.*)\((?<param>.*)\);/gm;
+  const groups = globalPropertiesReg.exec(code)?.groups || provideReg.exec(code);
+  if (groups?.serviceName){
+    return groups.serviceName;
+  }
+}
+
+function extraValue(code){
+  return extraComponentName(code) ?? extraDirective(code) ?? extraGlobalProperties(code);
+}
+/**
+ *
+ * @param {string} code
+ */
+function extraType(code){
+  const isDirective = /app\.directive/.test(code);
+  const isComponent = /app\.component/.test(code);
+  const isGlobalProperties = /app\.config\.globalProperties/.test(code);
+  const isProvide = /app\.provide/.test(code);
+  if (isDirective) {return 'directive';}
+  if (isComponent) {return 'component';}
+  if (isGlobalProperties || isProvide) {return 'service';}
+}
+
+exports.extra = extraValue;
+exports.extraType = extraType;
+exports.extraDirective = extraDirective;
+exports.extraComponentName = extraComponentName;
+exports.extraGlobalProperties = extraGlobalProperties;