@tuya-sat/micro-dev-loader 2.2.5 → 2.2.9

package/dist/plugins/theme/filterPlugin.d.ts

@@ -0,0 +1,9 @@
+import { Declaration } from "postcss";
+export declare const filterPlugin: {
+    (opts?: {}): {
+        postcssPlugin: string;
+        Rule(rule: any): void;
+        Declaration(decl: Declaration): void;
+    };
+    postcss: boolean;
+};

package/dist/plugins/theme/filterPlugin.js

@@ -0,0 +1,23 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const filterPlugin = (opts = {}) => {
+    return {
+        postcssPlugin: "filter",
+        Rule(rule) {
+            if (!rule.nodes.length) {
+                rule.remove();
+            }
+        },
+        Declaration(decl) {
+            //@ts-ignore
+            if (decl.variable && decl.parent.selector === "html") {
+                decl.remove();
+            }
+        },
+    };
+};
+filterPlugin.postcss = true;
+
+exports.filterPlugin = filterPlugin;

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

@@ -2,15 +2,9 @@ import { Compiler } from "webpack";
 export default class ThemePlugin {
     private stylePath;
     private pluginName;
-    private jsFilePrefix;
     private lessFiles;
     constructor(stylePath?: string);
     apply(compiler: Compiler): void;
-    getBundledLessFile(): Promise<string>;
     runCssbundle(): Promise<string>;
-    private getCustomeVarible;
-    getLessVarible(contentHash: any): Promise<{
-        fileName: string;
-        content: string;
-    }[]>;
+    filterCssVarible(css: string): string;
 }

package/dist/plugins/theme/index.js

@@ -3,28 +3,31 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var theme = require('antd/dist/theme');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var cheerio = require('cheerio');
 var less = require('less');
-var path = require('path');
 var fse = require('fs-extra');
-var bundle = require('./bundle.js');
 var microUtils = require('@tuya-sat/micro-utils');
+var postcss = require('postcss');
+var path = require('path');
+var filterPlugin = require('./filterPlugin.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var HtmlWebpackPlugin__default = /*#__PURE__*/_interopDefaultLegacy(HtmlWebpackPlugin);
 var cheerio__default = /*#__PURE__*/_interopDefaultLegacy(cheerio);
 var less__default = /*#__PURE__*/_interopDefaultLegacy(less);
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 var fse__default = /*#__PURE__*/_interopDefaultLegacy(fse);
+var postcss__default = /*#__PURE__*/_interopDefaultLegacy(postcss);
+var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
+// const darkfile
+const darkVariableFile = require.resolve("./dark.variable.less");
+const darkVariableContent = fse__default["default"].readFileSync(darkVariableFile, "utf-8");
 class ThemePlugin {
     constructor(stylePath = "static/css") {
         this.stylePath = stylePath;
         this.pluginName = "ThemePlugin";
-        this.jsFilePrefix = "static/js";
         this.lessFiles = [];
     }
     apply(compiler) {
@@ -43,22 +46,16 @@ class ThemePlugin {
                     compilation.chunkGraph.getChunkModules(chunk).forEach((item) => {
                         this.lessFiles.push(item.nameForCondition());
                     });
+                    compilation.updateAsset(pathname, (source) => {
+                        return new RawSource(this.filterCssVarible(source.source().toString()));
+                    });
                     const content = yield this.runCssbundle();
-                    const lessContent = yield this.getBundledLessFile();
                     const { contenthash } = compilation.assetsInfo.get(pathname);
                     const darkCssFileName = `dark.${contenthash}.css`;
-                    const lessFileName = `theme.${contenthash}.less`;
-                    const lessVarible = yield this.getLessVarible(contenthash);
                     compilation.emitAsset(`${this.stylePath}/${darkCssFileName}`, new RawSource(content));
-                    compilation.emitAsset(`${this.stylePath}/${lessFileName}`, new RawSource(lessContent));
-                    lessVarible.forEach(({ fileName, content }) => {
-                        compilation.emitAsset(fileName, new RawSource(content));
-                    });
                     HtmlWebpackPlugin__default["default"].getHooks(compilation).beforeAssetTagGeneration.tapAsync(this.pluginName, (data, cb) => {
-                        const { publicPath } = data.assets;
                         HtmlWebpackPlugin__default["default"].getHooks(compilation).beforeEmit.tapAsync(this.pluginName, (data, cb) => {
                             const $ = cheerio__default["default"].load(data.html);
-                            const firstJs = $("script")[0];
                             $("link").map(function () {
                                 const reg = /(?<=\/)light.([\s\S]+?).css$/;
                                 const href = $(this).attr("href");
@@ -66,11 +63,6 @@ class ThemePlugin {
                                     $(this).attr("id", "micro-default-theme-css");
                                     $(`<link href="${href}" rel="stylesheet/light" id="micro-light-theme-css">`).insertBefore($(this));
                                     $(`<link href="${href.replace(reg, darkCssFileName)}" rel="stylesheet/dark" id="micro-dark-theme-css">`).insertBefore($(this));
-                                    lessVarible.forEach(({ fileName }) => {
-                                        const src = path__default["default"].join(publicPath, fileName);
-                                        $(`<script src="${src}" type="javascript/less" />`).insertBefore(firstJs);
-                                    });
-                                    $(`<link href="${href.replace(reg, lessFileName)}" rel="stylesheet/less" id="micro-theme-less">`).insertBefore(firstJs);
                                 }
                             });
                             data.html = $.html();
@@ -83,28 +75,15 @@ class ThemePlugin {
             });
         }
     }
-    getBundledLessFile() {
-        return tslib.__awaiter(this, void 0, void 0, function* () {
-            let fakefile = "";
-            const cwd = process.cwd();
-            this.lessFiles.forEach((file) => {
-                const relativePath = path__default["default"].relative(cwd, file);
-                fakefile += `@import "${relativePath}";\n`;
-            });
-            const file = yield bundle["default"](fakefile, path__default["default"].resolve(cwd, "fake.less"), Object.assign(Object.assign({}, theme.getThemeVariables({ dark: true })), { "entry-name": "light" }));
-            return file;
-        });
-    }
     runCssbundle() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const lessTasks = this.lessFiles.map((file) => {
                 let bufferString = fse__default["default"].readFileSync(file, "utf-8");
+                bufferString = `${bufferString}`;
                 return less__default["default"].render(bufferString, {
                     filename: file,
                     javascriptEnabled: true,
-                    modifyVars: Object.assign(Object.assign(Object.assign({}, theme.getThemeVariables({
-                        dark: true,
-                    })), microUtils.theme.getAntdOverWriteFile().dark), { "entry-name": "dark" }),
+                    modifyVars: Object.assign(Object.assign({}, microUtils.theme.getAntdOverWriteFile().dark), { "entry-name": "dark", "root-entry-name": "variable" }),
                     plugins: [createHandleImportPlugin()],
                 });
             });
@@ -113,38 +92,12 @@ class ThemePlugin {
             cssContents.forEach((content) => {
                 singleCssContent += content.css + "\n";
             });
-            return singleCssContent;
+            return this.filterCssVarible(singleCssContent);
         });
     }
-    getCustomeVarible() {
-        return tslib.__awaiter(this, void 0, void 0, function* () {
-            return [
-                yield microUtils.theme.getCustomLightVaribleFile(),
-                yield microUtils.theme.getCustomDarkVaribleFile(),
-            ];
-        });
-    }
-    getLessVarible(contentHash) {
-        return tslib.__awaiter(this, void 0, void 0, function* () {
-            let antdLightVarible = theme.getThemeVariables();
-            let antdDarkVarible = theme.getThemeVariables({ dark: true });
-            const antdOverWriteVarible = microUtils.theme.getAntdOverWriteFile();
-            delete antdDarkVarible.hack;
-            delete antdLightVarible.hack;
-            const [customLightVarible, customDarkVarible] = yield this.getCustomeVarible();
-            let lightLessVarible = Object.assign(Object.assign(Object.assign({}, antdLightVarible), antdOverWriteVarible.light), customLightVarible);
-            let darkLessVarible = Object.assign(Object.assign(Object.assign({}, antdDarkVarible), antdOverWriteVarible.dark), customDarkVarible);
-            return [
-                {
-                    fileName: `${this.jsFilePrefix}/dark.${contentHash}.less.js`,
-                    content: `window.darkLessVarible = ${JSON.stringify(darkLessVarible)}`,
-                },
-                {
-                    fileName: `${this.jsFilePrefix}/light.${contentHash}.less.js`,
-                    content: `window.lightLessVarible = ${JSON.stringify(lightLessVarible)}`,
-                },
-            ];
-        });
+    filterCssVarible(css) {
+        //@ts-ignore
+        return postcss__default["default"]([filterPlugin.filterPlugin]).process(css).css;
     }
 }
 function createHandleImportPlugin() {
@@ -162,7 +115,17 @@ class HandleImport extends less.FileManager {
         });
         return tslib.__awaiter(this, void 0, void 0, function* () {
             if (filename.startsWith("~")) {
-                return _super.loadFile.call(this, filename.replace("~", ""), currentDirectory, options, environment);
+                let filenamed = filename.replace("~", "");
+                let fullPath = path__default["default"].join(currentDirectory, filename);
+                if (fullPath.endsWith("style/themes/variable.less")) {
+                    return {
+                        filename: filenamed.startsWith("antd")
+                            ? require.resolve(filenamed)
+                            : fullPath,
+                        contents: darkVariableContent,
+                    };
+                }
+                return _super.loadFile.call(this, filenamed, currentDirectory, options, environment);
             }
             return _super.loadFile.call(this, filename, currentDirectory, options, environment);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-dev-loader",
-  "version": "2.2.5",
+  "version": "2.2.9",
   "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": "2.2.5",
+    "@tuya-sat/micro-utils": "2.2.9",
     "cheerio": "1.0.0-rc.10",
     "ejs": "3.1.6",
     "fs-extra": "10.0.1",
@@ -23,7 +23,8 @@
     "less-bundle-promise": "1.0.11",
     "loader-utils": "3.2.0",
     "path": "0.12.7",
-    "tslib": "^2.3.1"
+    "postcss": "8.4.12",
+    "tslib": "2.3.1"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "21.0.2",
@@ -32,7 +33,7 @@
     "@types/less": "3.0.3",
     "jest": "27.5.1",
     "rollup": "2.70.1",
-    "rollup-plugin-copy": "3.4.0",
+    "rollup-copy-smartly": "1.0.2",
     "rollup-plugin-delete": "2.0.0",
     "rollup-plugin-typescript2": "0.31.2",
     "ts-jest": "27.1.3",

package/dist/plugins/theme/bundle.js

@@ -1,123 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-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);
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-
-const stringLiteralRegex = /.*(?:'|")(.*)(?:'|").*/;
-const lessFileRegex = /.less$/;
-const cssFileRegex = /.css$/;
-const imports = [];
-const writers = [];
-const output = [];
-function buildContents(lines, filePath, lessVarible) {
-    let currentLines = [];
-    let line;
-    let hashPath;
-    let imported;
-    let file;
-    let splitLines;
-    if (typeof imports[filePath] === "undefined") {
-        imports[filePath] = true;
-    }
-    for (var index = 0; index < lines.length; ++index) {
-        line = lines[index].trim();
-        if (line.indexOf("@import ") === 0) {
-            // We found an import statement
-            if (currentLines.length > 0) {
-                writers.push(new Writer(currentLines));
-                currentLines = [];
-            }
-            imported = line.replace(stringLiteralRegex, "$1");
-            //处理变量路径(目前，处理不了文件内的变量)
-            imported = imported.replace(/\@\{([^}]+)\}/, (match, p1) => {
-                if (lessVarible[p1] !== undefined) {
-                    return lessVarible[p1];
-                }
-                return p1;
-            });
-            if (!(lessFileRegex.test(imported) || cssFileRegex.test(imported))) {
-                imported += ".less";
-            }
-            if (imported.match(/^~/)) {
-                hashPath = require.resolve(imported.replace("~", ""));
-            }
-            else {
-                hashPath = path__default["default"].resolve(filePath, "..", imported);
-            }
-            if (typeof imports[hashPath] === "undefined") {
-                imports[hashPath] = true;
-                file = fs__default["default"].readFileSync(hashPath, "utf8");
-                splitLines = file.split(/\r\n|\n/);
-                splitLines[0] = splitLines[0].trim();
-                buildContents(splitLines, hashPath, lessVarible);
-            }
-            continue;
-        }
-        currentLines.push(lines[index]);
-    }
-    // Push all remaining lines
-    writers.push(new Writer(currentLines));
-    return index;
-}
-function compress(data, path, lessVarible) {
-    return new Promise(function (resolve, reject) {
-        var splitLines = data.split(/\r\n|\n/);
-        splitLines[0] = splitLines[0].trim();
-        buildContents(splitLines, path, lessVarible);
-        let previousLine = "";
-        writers.forEach((writer) => {
-            previousLine = writer.write(output, previousLine);
-        });
-        while (!output[output.length - 1]) {
-            output.pop();
-        }
-        // Make sure the file ends in a new line.
-        if (!!output[output.length - 1].trim()) {
-            output.push("");
-        }
-        resolve(output.join("\n"));
-    });
-}
-class Writer {
-    /**
-     * Creates a new Writer.
-     *
-     * @param operator The array of lines to associate with this writer.
-     */
-    constructor(operator) {
-        if (Array.isArray(operator)) {
-            this.__lines = operator;
-            return;
-        }
-    }
-    /**
-     * Writes the lines for this writer into the output array.
-     *
-     * @param output The output lines to which the Writer's lines should be appended.
-     * @param previousLine The previous line that was added to output.
-     */
-    write(output, previousLine) {
-        // If this writer has a module associated with it, we want to first add the
-        // lines for the module before adding the lines for this writer.
-        var trim;
-        // Add every line to the output.
-        this.__lines.forEach((line) => {
-            trim = line.trim();
-            if (!previousLine && !trim) {
-                return;
-            }
-            output.push(line);
-            previousLine = trim;
-        });
-        return previousLine;
-    }
-}
-
-exports["default"] = compress;