@tuya-sat/micro-dev-loader 3.0.0-beta.3 → 3.0.0

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import ThemePlugin from "./plugins/theme";
-import LocalesPlugin from "./plugins/locales";
 declare const filterCssVariableLoader: string;
 declare const changeAntdGlobalImport: string;
 declare const changeTuyaSatComponentImport: string;
-export { ThemePlugin, LocalesPlugin, filterCssVariableLoader, changeAntdGlobalImport, changeTuyaSatComponentImport, };
+export { ThemePlugin, filterCssVariableLoader, changeAntdGlobalImport, changeTuyaSatComponentImport, };

package/dist/index.js

@@ -3,14 +3,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var index = require('./plugins/theme/index.js');
-var index$1 = require('./plugins/locales/index.js');
 
 const filterCssVariableLoader = require.resolve("./loader/filterCssVariableLoader");
 const changeAntdGlobalImport = require.resolve("./loader/changeAntdGlobalImport");
 const changeTuyaSatComponentImport = require.resolve("./loader/changeTuyaSatComponentImport");
 
 exports.ThemePlugin = index["default"];
-exports.LocalesPlugin = index$1["default"];
 exports.changeAntdGlobalImport = changeAntdGlobalImport;
 exports.changeTuyaSatComponentImport = changeTuyaSatComponentImport;
 exports.filterCssVariableLoader = filterCssVariableLoader;

package/dist/less/plugin/dark.variable.less

@@ -564,7 +564,7 @@ html {
 // ---
 @anchor-bg: transparent;
 @anchor-border-color: @border-color-split;
-@anchor-link-top: 7px;
+@anchor-link-top: 7px; // 注意，一些版本可能会有样式问题
 @anchor-link-left: 16px;
 @anchor-link-padding: @anchor-link-top 0 @anchor-link-top @anchor-link-left;
 
@@ -616,7 +616,7 @@ html {
 @modal-header-title-line-height: 22px;
 @modal-header-title-font-size: @font-size-lg;
 @modal-header-border-color-split: @border-color-split;
-@modal-header-close-size: 56px;
+@modal-header-close-size: @modal-header-title-line-height + 2 * @modal-header-padding-vertical;
 @modal-content-bg: @component-background;
 @modal-heading-color: @heading-color;
 @modal-close-color: @text-color-secondary;
@@ -629,6 +629,7 @@ html {
 @modal-mask-bg: fade(@black, 45%);
 @modal-confirm-body-padding: 32px 32px 24px;
 @modal-confirm-title-font-size: @font-size-lg;
+@modal-border-radius: @border-radius-base;
 
 // Progress
 // --
@@ -927,7 +928,7 @@ html {
 @breadcrumb-font-size: @font-size-base;
 @breadcrumb-icon-font-size: @font-size-base;
 @breadcrumb-link-color: @text-color-secondary;
-@breadcrumb-link-color-hover: @primary-5;
+@breadcrumb-link-color-hover: @text-color;
 @breadcrumb-separator-color: @text-color-secondary;
 @breadcrumb-separator-margin: 0 @padding-xs;
 
@@ -1418,3 +1419,11 @@ html {
 // Mentions
 // ---
 @mentions-dropdown-bg: @popover-background;
+
+// Segmented
+// ---
+@segmented-bg: fade(@black, 25%);
+@segmented-hover-bg: fade(@black, 45%);
+@segmented-selected-bg: #333333;
+@segmented-label-color: fade(@white, 65%);
+@segmented-label-hover-color: fade(@white, 85%);

package/dist/less/plugin/file.js

@@ -4,19 +4,18 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var path = require('path');
-var fse = require('fs-extra');
 var less = require('less');
+var patch = require('../utils/patch.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var fse__default = /*#__PURE__*/_interopDefaultLegacy(fse);
 
 class HandleImport extends less.FileManager {
     constructor() {
         super(...arguments);
         this.interceptReg = /antd\/(es|lib)\/style\/themes\/variable\.less$/;
-        this.darkVariableContent = fse__default["default"].readFileSync(require.resolve("./dark.variable.less"), "utf-8");
+        this.darkVariableContent = patch.getDarkLessContent();
     }
     loadFile(filename, currentDirectory, options, environment) {
         const _super = Object.create(null, {
@@ -25,7 +24,7 @@ class HandleImport extends less.FileManager {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             if (filename.startsWith("~")) {
                 let filenamed = filename.replace("~", "");
-                const fullPath = require.resolve(filenamed);
+                const fullPath = require.resolve(filenamed, { paths: [currentDirectory] });
                 if (this.interceptReg.test(fullPath)) {
                     return {
                         filename: fullPath,

package/dist/less/utils/patch.d.ts

@@ -0,0 +1,2 @@
+export declare function patchLessForAntd(version: string, content: string): string;
+export declare function getDarkLessContent(): string;

package/dist/less/utils/patch.js

@@ -0,0 +1,28 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var path = require('path');
+var semver = require('semver');
+var fse = require('fs-extra');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
+var fse__default = /*#__PURE__*/_interopDefaultLegacy(fse);
+
+function patchLessForAntd(version, content) {
+    if (semver.gte(version, "4.20.6")) {
+        return `${content}@anchor-link-top: 4px;\n`;
+    }
+    return content;
+}
+function getDarkLessContent() {
+    const antdPkgPath = require.resolve('antd/package.json', { paths: [process.cwd()] });
+    const { version } = fse__default["default"].readJSONSync(antdPkgPath);
+    const originDarkVariableContent = fse__default["default"].readFileSync(path__default["default"].join(__dirname, '../plugin/dark.variable.less'), "utf-8");
+    return patchLessForAntd(version, originDarkVariableContent);
+}
+
+exports.getDarkLessContent = getDarkLessContent;
+exports.patchLessForAntd = patchLessForAntd;

package/dist/plugins/theme/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
+var crypto = require('crypto');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var cheerio = require('cheerio');
 var less = require('less');
@@ -34,9 +35,13 @@ class ThemePlugin {
                     name: this.pluginName,
                     stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL,
                 }, (assets, callback) => tslib.__awaiter(this, void 0, void 0, function* () {
-                    const [pathname] = Object.entries(assets).find(([pathname]) => {
+                    const lightAsset = Object.entries(assets).find(([pathname]) => {
                         return /\/light\.[\s\S]+?\.css$/.test(pathname);
                     });
+                    if (!lightAsset) {
+                        return callback();
+                    }
+                    const [pathname] = lightAsset;
                     const chunk = compilation.namedChunks.get("light");
                     compilation.chunkGraph.getChunkModules(chunk).forEach((item) => {
                         this.lessFiles.push(item.nameForCondition());
@@ -45,8 +50,8 @@ class ThemePlugin {
                         return new RawSource(this.filterCssVarible(source.source().toString())[0]);
                     });
                     const [content, storeHtmlVariable] = yield this.runCssbundle();
-                    const { contenthash } = compilation.assetsInfo.get(pathname);
-                    const darkCssFileName = `dark.${contenthash}.css`;
+                    const darkHash = crypto.createHash("sha256").update(content).digest("hex").substring(0, 8);
+                    const darkCssFileName = `dark.${darkHash}.css`;
                     compilation.emitAsset(`${this.stylePath}/${darkCssFileName}`, new RawSource(content));
                     HtmlWebpackPlugin__default["default"].getHooks(compilation).beforeAssetTagGeneration.tapAsync(this.pluginName, (data, cb) => {
                         HtmlWebpackPlugin__default["default"].getHooks(compilation).beforeEmit.tapAsync(this.pluginName, (data, cb) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-dev-loader",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0",
   "main": "dist/index.js",
   "license": "MIT",
   "scripts": {
@@ -14,7 +14,7 @@
     "@babel/generator": "7.17.7",
     "@babel/plugin-syntax-typescript": "7.16.7",
     "@babel/template": "7.16.7",
-    "@tuya-sat/micro-utils": "3.0.0-beta.3",
+    "@tuya-sat/micro-utils": "3.0.0",
     "cheerio": "1.0.0-rc.10",
     "ejs": "3.1.6",
     "fs-extra": "10.0.1",
@@ -25,6 +25,7 @@
     "loader-utils": "3.2.0",
     "path": "0.12.7",
     "postcss": "8.4.12",
+    "semver": "7.3.5",
     "tslib": "2.3.1"
   },
   "devDependencies": {

package/dist/plugins/locales/index.d.ts

@@ -1,9 +0,0 @@
-import { Compiler } from "webpack";
-export default class LocalsPlugin {
-    private localesOriginPath;
-    private localesTargetPath;
-    private pluginName;
-    private localesFiles;
-    constructor(localesOriginPath?: string, localesTargetPath?: string);
-    apply(compiler: Compiler): void;
-}

package/dist/plugins/locales/index.js

@@ -1,66 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var tslib = require('tslib');
-var fs = require('fs');
-var path = require('path');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
-
-class LocalsPlugin {
-    constructor(localesOriginPath = "./src/lang", localesTargetPath = "./_locales/ui") {
-        this.localesOriginPath = localesOriginPath;
-        this.localesTargetPath = localesTargetPath;
-        this.pluginName = "LocalsPlugin";
-        this.localesFiles = [];
-    }
-    apply(compiler) {
-        const isProduction = process.env.NODE_ENV === "production";
-        if (isProduction) {
-            compiler.hooks.thisCompilation.tap(this.pluginName, (compilation) => {
-                compilation.hooks.processAssets.tapAsync({
-                    name: this.pluginName,
-                    stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL,
-                }, (assets, callback) => tslib.__awaiter(this, void 0, void 0, function* () {
-                    const filenames = yield fs__default["default"].readdirSync(this.localesOriginPath);
-                    fs__default["default"].existsSync(this.localesTargetPath) &&
-                        fs__default["default"].rmdirSync(path.resolve(this.localesTargetPath), {
-                            recursive: true,
-                        });
-                    fs__default["default"].mkdirSync(path.resolve(this.localesTargetPath));
-                    const jiti = require("jiti")(path.resolve(this.localesOriginPath));
-                    filenames.forEach((v) => tslib.__awaiter(this, void 0, void 0, function* () {
-                        var _a;
-                        if (v.substring(0, 5) === "index")
-                            return;
-                        const lang = v.split(".")[0];
-                        const content = jiti(`./${v}`);
-                        const resObj = {};
-                        const recursive = (value, prefix, key) => {
-                            if (typeof value === "object") {
-                                prefix += `.${key}`;
-                                Object.keys(value).forEach((k) => {
-                                    recursive(value[k], prefix, k);
-                                });
-                            }
-                            else {
-                                key = `${prefix}.${key}`.substring(2);
-                                resObj[key] = value;
-                                return;
-                            }
-                        };
-                        recursive((_a = content.default) === null || _a === void 0 ? void 0 : _a.translation, "", "");
-                        const resJson = JSON.stringify(resObj);
-                        fs__default["default"].appendFileSync(path.resolve(`${this.localesTargetPath}/${lang}.json`), resJson);
-                    }));
-                    callback();
-                }));
-            });
-        }
-    }
-}
-
-exports["default"] = LocalsPlugin;