Merge branch 'develop' into ci/check-email

Author: liweijie0812

.eslintignore

@@ -1,5 +1,3 @@
 **/*.wxs
-src/common/lib
 miniprogram_dist
 node_modules
-common

.github/workflows/pkg-pr-new.yml

@@ -0,0 +1,24 @@
+name: Publish_Any_Commit
+on:
+  push:
+    branches: [develop]
+  pull_request:
+    branches: [develop]
+
+jobs:
+  build:
+    if: ${{ github.repository == 'Tencent/tdesign-miniprogram' && !startsWith(github.head_ref, 'release/') }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - run: npm install
+
+      - run: npm run build
+
+      - run: npx pkg-pr-new publish --compact

.github/workflows/typos-config.toml

@@ -5,6 +5,7 @@ actived = "actived"
 Colum = "Colum"
 ded = "ded"
 destory ="destory"
+nd = "nd"
 
 [files]
 extend-exclude = ["CHANGELOG.md"]

CHANGELOG.md

@@ -1,4 +1,4 @@
-@import '../../../src/common/index.less';
+@import '../../../src/common/style/index.less';
 
 .demo-block {
   margin: @spacer-4 0 0;

example/components/demo-block/index.less

@@ -1,3 +1,3 @@
-/* eslint-disable */
 const gulpError = `gulpErrorPlaceHolder`;
+
 export default gulpError;

example/utils/gulpError.js

@@ -1,7 +1,7 @@
 {
   "name": "tdesign-miniprogram",
   "purename": "tdesign",
-  "version": "1.8.6",
+  "version": "1.9.0",
   "description": "tdesign-miniprogram",
   "title": "tdesign-miniprogram",
   "main": "miniprogram_dist/index.js",
@@ -66,6 +66,7 @@
     "commitizen": "^4.2.4",
     "cross-env": "^7.0.2",
     "cz-conventional-changelog": "^3.3.0",
+    "dayjs": "^1.10.7",
     "del": "^6.1.1",
     "eslint": "^7.0.0",
     "eslint-config-airbnb-base": "^14.2.1",
@@ -76,14 +77,19 @@
     "gray-matter": "^4.0.3",
     "gulp": "^4.0.2",
     "gulp-changed": "^4.0.2",
+    "gulp-clean-css": "^4.3.0",
+    "gulp-htmlmin": "^5.0.1",
     "gulp-if": "^3.0.0",
+    "gulp-insert": "^0.5.0",
+    "gulp-jsonminify": "^1.1.0",
     "gulp-less": "^5.0.0",
     "gulp-mp-npm": "^1.9.7",
     "gulp-plumber": "^1.2.1",
     "gulp-rename": "^2.0.0",
     "gulp-replace": "^1.0.0",
     "gulp-replace-task": "^2.0.1",
     "gulp-sourcemaps": "^3.0.0",
+    "gulp-terser": "^2.1.0",
     "gulp-typescript": "^6.0.0-alpha.1",
     "husky": "^7.0.4",
     "jest": "^26.6.3",
@@ -92,6 +98,7 @@
     "less": "^4.1.1",
     "lint-staged": "^10.0.0-1",
     "lodash": "^4.17.21",
+    "merge2": "^1.4.1",
     "miniprogram-api-typings": "^3.4.6",
     "miniprogram-automator": "^0.10.0",
     "miniprogram-simulate": "^1.6.0",
@@ -104,6 +111,9 @@
     "tdesign-icons-view": "^0.3.2",
     "tdesign-publish-cli": "^0.0.12",
     "tdesign-site-components": "^0.15.2",
+    "tdesign-theme-generator": "^1.1.0",
+    "tinycolor2": "^1.4.2",
+    "tslib": "^2.8.1",
     "typescript": "~4.7.2",
     "vite": "^2.7.6",
     "vite-plugin-tdoc": "^2.0.1",
@@ -122,9 +132,5 @@
     "{src,example}/**/*.{js,ts}": [
       "eslint --fix"
     ]
-  },
-  "dependencies": {
-    "dayjs": "^1.10.7",
-    "tinycolor2": "^1.4.2"
   }
 }

package.json

@@ -1,18 +1,27 @@
+const path = require('path');
 const gulp = require('gulp');
 const del = require('del');
 const replace = require('gulp-replace');
 const plumber = require('gulp-plumber');
 const changed = require('gulp-changed');
 const gulpTs = require('gulp-typescript');
+const merge2 = require('merge2');
 const sourcemaps = require('gulp-sourcemaps');
 const gulpLess = require('gulp-less');
+const cssmin = require('gulp-clean-css');
+const gulpInsert = require('gulp-insert');
+const jsmin = require('gulp-terser');
+const jsonmin = require('gulp-jsonminify');
+const wxmlmin = require('gulp-htmlmin');
 const rename = require('gulp-rename');
 const replaceTask = require('gulp-replace-task');
 const mpNpm = require('gulp-mp-npm');
 const gulpIf = require('gulp-if');
 
 const config = require('./config');
 
+const baseCssPath = path.resolve(__dirname, '../src/common/style/index.wxss');
+
 const isProduction = process.env.NODE_ENV === 'production';
 
 // set displayName
@@ -35,20 +44,32 @@ const generateConfigReplaceTask = (replaceConfig, options = {}) => {
   });
 };
 
+const isComponentFolder = (dir) => {
+  return dir === 'src';
+};
+
+const ignoreFilesForDTS = (file) => {
+  return ['props.d.ts', 'type.d.ts'].includes(file.basename);
+};
+
 /* return gulpfile base tasks */
 module.exports = (src, dist, moduleName) => {
   const tsProject = gulpTs.createProject('tsconfig.json', {
     declaration: true,
     removeComments: isProduction,
+    importHelpers: true,
+    noEmitHelpers: true,
   });
 
   // options
   const ignore = ['**/__test__', '**/__test__/**', '**/_example/**', '**/_common/**'];
   const srcOptions = { base: src, ignore };
   const watchOptions = { events: ['add', 'change'] };
   const gulpErrorPath = 'example/utils/gulpError.js';
+
   // 文件匹配路径
   const globs = {
+    wxml: `${src}/**/*.wxml`, // 匹配 wxml 文件
     ts: `${src}/**/*.ts`, // 匹配 ts 文件
     js: `${src}/**/*.js`, // 匹配 js 文件
     wxs: `${src}/**/*.wxs`, // 匹配 wxs 文件
@@ -57,15 +78,18 @@ module.exports = (src, dist, moduleName) => {
     wxss: `${src}/**/*.wxss`, // 匹配 wxss 文件
     md: `${src}/**/*.md`, // 匹配 md 文件
   };
+
   // 匹配需要拷贝的文件
   globs.copy = [
     `${src}/**`,
+    `!${globs.wxml}`,
     `!${globs.ts}`,
     `!${globs.js}`,
     `!${globs.wxs}`,
     `!${globs.json}`,
     `!${globs.less}`,
     `!${globs.wxss}`,
+    `!${globs.md}`,
     '!**/_example/**',
   ];
 
@@ -104,11 +128,30 @@ module.exports = (src, dist, moduleName) => {
       .pipe(changed(dist)) // 过滤掉未改变的文件
       .pipe(gulp.dest(dist));
 
+  /** `gulp wxml`
+   * 处理 wxml
+   * */
+  tasks.wxml = () =>
+    gulp
+      .src(globs.wxml, { ...srcOptions, since: since(tasks.wxml) })
+      .pipe(
+        gulpIf(
+          isComponentFolder(src) && isProduction,
+          wxmlmin({
+            removeComments: true,
+            collapseWhitespace: true,
+            keepClosingSlash: true,
+            caseSensitive: true,
+          }),
+        ),
+      )
+      .pipe(gulp.dest(dist));
+
   /** `gulp ts`
    * 处理ts
    * */
-  tasks.ts = () =>
-    gulp
+  tasks.ts = () => {
+    const tsResult = gulp
       .src(globs.ts, srcOptions)
       .pipe(
         plumber({
@@ -119,10 +162,17 @@ module.exports = (src, dist, moduleName) => {
       )
       .pipe(generateConfigReplaceTask(config, { stringify: true }))
       .pipe(gulpIf(!isProduction, sourcemaps.init()))
-      .pipe(tsProject()) // 编译ts
-      .pipe(mpNpm())
-      .pipe(gulpIf(!isProduction, sourcemaps.write('.')))
-      .pipe(gulp.dest(dist));
+      .pipe(tsProject()); // 编译ts
+
+    return merge2(
+      tsResult.js
+        .pipe(mpNpm())
+        .pipe(gulpIf(isComponentFolder(src) && isProduction, jsmin()))
+        .pipe(sourcemaps.write('.'))
+        .pipe(gulp.dest(dist)),
+      tsResult.dts.pipe(gulpIf((file) => !isProduction || !ignoreFilesForDTS(file), gulp.dest(dist))),
+    );
+  };
 
   /** `gulp js`
    * 处理js
@@ -131,6 +181,7 @@ module.exports = (src, dist, moduleName) => {
     gulp
       .src(globs.js, { ...srcOptions, since: since(tasks.js) })
       .pipe(generateConfigReplaceTask(config, { stringify: true }))
+      .pipe(gulpIf(isComponentFolder(src) && isProduction, jsmin()))
       .pipe(gulp.dest(dist));
 
   /** `gulp wxs`
@@ -145,7 +196,11 @@ module.exports = (src, dist, moduleName) => {
   /** `gulp json`
    * 处理json
    * */
-  tasks.json = () => gulp.src(globs.json, { ...srcOptions, dot: true, since: since(tasks.json) }).pipe(gulp.dest(dist));
+  tasks.json = () =>
+    gulp
+      .src(globs.json, { ...srcOptions, dot: true, since: since(tasks.json) })
+      .pipe(gulpIf(isComponentFolder(src) && isProduction, jsonmin()))
+      .pipe(gulp.dest(dist));
 
   /** `gulp less`
    * 处理less
@@ -164,6 +219,21 @@ module.exports = (src, dist, moduleName) => {
       .pipe(generateConfigReplaceTask(config, { stringify: false }))
       .pipe(gulpIf(!isProduction, sourcemaps.init()))
       .pipe(gulpLess()) // 编译less
+      .pipe(gulpIf(isComponentFolder(src) && isProduction, cssmin()))
+      .pipe(
+        gulpIf(
+          isComponentFolder(src),
+          gulpInsert.transform((contents, file) => {
+            if (!file.path.includes(`src${path.sep}common`)) {
+              const relativePath = path
+                .relative(path.normalize(`${file.path}${path.sep}..`), baseCssPath)
+                .replace(/\\/g, '/');
+              contents = `@import '${relativePath}';${contents}`;
+            }
+            return contents;
+          }),
+        ),
+      )
       .pipe(rename({ extname: '.wxss' }))
       .pipe(gulpIf(!isProduction, sourcemaps.write('.')))
       .pipe(gulp.dest(dist));
@@ -187,14 +257,15 @@ module.exports = (src, dist, moduleName) => {
   tasks.build = gulp.series(
     tasks.clear,
     tasks.resetError,
-    gulp.parallel(tasks.copy, tasks.ts, tasks.js, tasks.wxs, tasks.json, tasks.less, tasks.wxss),
+    gulp.parallel(tasks.copy, tasks.wxml, tasks.ts, tasks.js, tasks.wxs, tasks.json, tasks.less, tasks.wxss),
   );
 
   /** `gulp watch`
    * 监听
    * */
   tasks.watch = () => {
     gulp.watch(globs.copy, watchOptions, tasks.copy);
+    gulp.watch(globs.wxml, watchOptions, tasks.wxml);
     gulp.watch(globs.ts, watchOptions, gulp.series(tasks.resetError, tasks.ts));
     gulp.watch(globs.js, watchOptions, tasks.js);
     gulp.watch(globs.wxs, watchOptions, tasks.wxs);

script/gulpfile.base.js

@@ -10,10 +10,8 @@
 </template>
 
 <script>
-import siteConfig from './site.config';
-import { changeThemeMode } from './theme/dark';
-
 import { defineComponent } from 'vue';
+import siteConfig from './site.config';
 
 const { docs, enDocs } = JSON.parse(JSON.stringify(siteConfig).replace(/component:.+/g, ''));
 
@@ -43,25 +41,6 @@ const docsMap = {
   en: sortDocs(enDocs),
 };
 
-function watchHtmlMode(callback = () => {}) {
-  const targetNode = document.documentElement;
-  const config = { attributes: true };
-
-  const observerCallback = (mutationsList) => {
-    for (const mutation of mutationsList) {
-      if (mutation.attributeName === 'theme-mode') {
-        const themeMode = mutation.target.getAttribute('theme-mode') || 'light';
-        if (themeMode) callback(themeMode);
-      }
-    }
-  };
-
-  const observer = new MutationObserver(observerCallback);
-  observer.observe(targetNode, config);
-
-  return observer;
-}
-
 export default defineComponent({
   data() {
     return {
@@ -88,7 +67,7 @@ export default defineComponent({
       window.scrollTo(0, 0);
     };
     this.$refs.tdDocSearch.docsearchInfo = { indexName: 'tdesign_doc_miniprogram' };
-    watchHtmlMode(changeThemeMode);
+    this.initThemeGenerator();
   },
 
   watch: {
@@ -106,6 +85,11 @@ export default defineComponent({
         callback();
       });
     },
+    initThemeGenerator() {
+      const generator = document.createElement('td-theme-generator');
+      generator.setAttribute('device', 'mini-program');
+      document.body.appendChild(generator);
+    },
   },
 });
 </script>

site/app.vue

@@ -1,6 +1,8 @@
 import { createApp } from 'vue';
 // eslint-disable-next-line import/no-duplicates
 import { registerLocaleChange } from 'tdesign-site-components';
+import 'tdesign-theme-generator';
+
 import app from './app.vue';
 import router from './router';