@tuya-sat/micro-script 2.0.0-rc.6 → 2.1.0

package/dist/config/webpack.common.js

@@ -18,6 +18,7 @@ const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 const html_webpack_plugin_1 = __importDefault(require("html-webpack-plugin"));
 const css_minimizer_webpack_plugin_1 = __importDefault(require("css-minimizer-webpack-plugin"));
+const micro_dev_loader_1 = require("@tuya-sat/micro-dev-loader");
 const paths_1 = __importDefault(require("./paths"));
 function getCommonConfig({ isDev, isBuild, }) {
     const { name: packageName } = require(paths_1.default.appPkg);
@@ -104,6 +105,12 @@ function getCommonConfig({ isDev, isBuild, }) {
             runtimeChunk: "single",
             splitChunks: {
                 cacheGroups: {
+                    // vendorCss: {
+                    //   test: /(\/node_modules\/[\s\S]+(.less|.css)$)|(\/src\/styles\/global.less)/,
+                    //   name: "light",
+                    //   chunks: "all",
+                    //   priority: 2,
+                    // },
                     vendor: {
                         test: /[\\/]node_modules[\\/]/,
                         name: "vendors-others",
@@ -139,7 +146,8 @@ function getCommonConfig({ isDev, isBuild, }) {
                     filename: "static/css/[name].[contenthash:8].css",
                     chunkFilename: "static/css/[name].[contenthash:8].chunk.css",
                 }),
-        ].filter(Boolean),
+            isBuild && false && new micro_dev_loader_1.ThemePlugin(),
+        ].filter((value) => Boolean(value)),
     };
 }
 exports.default = getCommonConfig;

package/dist/framework/react.config.js

@@ -52,19 +52,6 @@ const reactConfig = ({ isDev, isBuild, currentFramework, isTs, }) => {
                         },
                     ],
                 },
-                isDev &&
-                    process.env.START_IN_MAIN !== "true" && {
-                    test: isTs ? paths_1.default.ReactTsEntryFile : paths_1.default.ReactJsEntryFile,
-                    include: paths_1.default.appSrc,
-                    use: [
-                        {
-                            loader: require.resolve("@tuya-sat/micro-dev-loader"),
-                            options: {
-                                microFramework: currentFramework,
-                            },
-                        },
-                    ],
-                },
             ].filter((value) => Boolean(value)),
         },
         plugins: [

package/dist/framework/vue.config.js

@@ -50,19 +50,6 @@ const vueConfig = ({ isDev, isBuild, currentFramework, isTs, }) => {
                         },
                     ],
                 },
-                isDev &&
-                    process.env.START_IN_MAIN !== "true" && {
-                    test: isTs ? paths_js_1.default.vueTsEntryFile : paths_js_1.default.vueJsEntryFile,
-                    include: paths_js_1.default.appSrc,
-                    use: [
-                        {
-                            loader: require.resolve("@tuya-sat/micro-dev-loader"),
-                            options: {
-                                microFramework: currentFramework,
-                            },
-                        },
-                    ],
-                },
             ].filter((value) => Boolean(value)),
         },
         plugins: [

package/dist/module/bundleServer.d.ts

@@ -5,5 +5,5 @@ export declare function createServerCompiler(): webpack.Compiler;
 export declare function runBundleServer({ port, compiler, internalDevConfig, }: {
     port: number;
     compiler: Compiler;
-    internalDevConfig?: Pick<Configuration, "open" | "setupMiddlewares">;
+    internalDevConfig?: Pick<Configuration, "open" | "setupMiddlewares" | "allowedHosts">;
 }): Promise<void>;

package/dist/module/main/fakeSaasInfo.js

@@ -7,10 +7,10 @@ const micro_utils_1 = require("@tuya-sat/micro-utils");
 const uuid_1 = require("uuid");
 const paths_1 = __importDefault(require("../../config/paths"));
 function mockSaasInfo(app, microPort) {
-    const oem_micro_app_id = (0, uuid_1.v4)();
+    const manifest = (0, micro_utils_1.parseManifest)();
     const entry_id = (0, uuid_1.v4)();
+    const oem_micro_app_id = manifest.universalId;
     const baseUrl = `/apps/${oem_micro_app_id}`;
-    const manifest = (0, micro_utils_1.parseManifest)();
     app.get("/api/saas-info", (req, res) => {
         const lang = parseCookie(req.headers["cookie"], "main-i18next");
         const app = consturctApp(manifest, oem_micro_app_id, baseUrl, lang, microPort);
@@ -68,7 +68,7 @@ function consturctApp(manifest, oem_micro_app_id, baseUrl, lang, port) {
 function consturctPermissions() {
     delete require.cache[paths_1.default.microConfig];
     const { mockPermissions = [] } = require(paths_1.default.microConfig).debuggerConfig || {};
-    return mockPermissions;
+    return mockPermissions.map((code) => ({ permission_group: code }));
 }
 function pickText(texts, lang) {
     return lang === "en" ? texts[1] : texts[0];

package/dist/module/main/staticMain.d.ts

@@ -1,6 +1,7 @@
 import { Express } from "express";
 import type { Config } from "@tuya-sat/micro-dev-proxy";
 export interface DebuggerConfig extends Config {
+    mockPermissions?: string[];
     base?: string;
 }
 export default function staticMain(app: Express, debuggerConfig: DebuggerConfig): void;

package/dist/module/main/staticMain.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const cheerio_1 = __importDefault(require("cheerio"));
 const axios_1 = __importDefault(require("axios"));
 const fakeSaas_1 = __importDefault(require("./fakeSaas"));
-const defaultBase = "https://static1.tuyacn.com/static/sdf-gw/v1.0.1.22";
+const defaultBase = "https://static1.tuyacn.com/static/sdf-gw/v1.0.1.22/";
 function staticMain(app, debuggerConfig) {
     app.get([
         "/",

package/dist/scripts/start.js

@@ -12,35 +12,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const chalk_1 = __importDefault(require("chalk"));
 const portfinder_1 = __importDefault(require("portfinder"));
-const micro_dev_loader_1 = require("@tuya-sat/micro-dev-loader");
-const micro_utils_1 = require("@tuya-sat/micro-utils");
 const mock_1 = __importDefault(require("../module/mock"));
 const bundleServer_1 = require("../module/bundleServer");
 const proxy_1 = __importDefault(require("../module/proxy"));
-const needLayout = !(0, micro_utils_1.isMobile)();
-const internalDevConfig = {
-    open: true,
-    setupMiddlewares(middleware, { app }) {
-        needLayout && micro_dev_loader_1.LayoutMockPlugin.useLayoutStatic(app);
-        (0, mock_1.default)(app);
-        (0, proxy_1.default)(app);
-        return middleware;
-    },
-};
 (() => __awaiter(void 0, void 0, void 0, function* () {
     let defaultPort = 9000;
+    console.log(chalk_1.default.yellow("如果是pc端的微应用调试，请勿使用该命令，考虑使用`start --main`或`start --main --proxy`"));
     //检测端口占用情况
     const port = yield portfinder_1.default.getPortPromise({
         port: defaultPort,
         stopPort: defaultPort + 100,
     });
     const compiler = (0, bundleServer_1.createServerCompiler)();
-    needLayout && new micro_dev_loader_1.LayoutMockPlugin().apply(compiler);
     (0, bundleServer_1.runBundleServer)({
         port,
         compiler,
-        internalDevConfig,
+        internalDevConfig: {
+            open: true,
+            setupMiddlewares(middleware, { app }) {
+                (0, mock_1.default)(app);
+                (0, proxy_1.default)(app);
+                return middleware;
+            },
+        },
     });
 }))().catch((err) => {
     console.log(err);

package/dist/scripts/startInMain.js

@@ -36,6 +36,9 @@ const bundleServer_1 = require("../module/bundleServer");
     (0, bundleServer_1.runBundleServer)({
         port: bundledServerPort,
         compiler,
+        internalDevConfig: {
+            allowedHosts: "all",
+        },
     });
 }))().catch((err) => {
     console.log(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "2.0.0-rc.6",
+  "version": "2.1.0",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -15,61 +15,57 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@babel/core": "^7.15.8",
-    "@babel/preset-env": "^7.15.8",
-    "@babel/preset-react": "^7.14.5",
-    "@babel/preset-typescript": "^7.15.0",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
-    "@tuya-sat/micro-dev-loader": "2.0.0-rc.6",
-    "@tuya-sat/micro-dev-proxy": "2.0.0-rc.6",
-    "@tuya-sat/micro-utils": "2.0.0-rc.6",
-    "babel-loader": "^8.2.2",
-    "babel-plugin-import": "^1.13.3",
+    "@babel/core": "7.17.8",
+    "@babel/preset-env": "7.16.11",
+    "@babel/preset-react": "7.16.7",
+    "@babel/preset-typescript": "7.16.7",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
+    "@tuya-sat/micro-dev-loader": "2.1.0",
+    "@tuya-sat/micro-dev-proxy": "2.1.0",
+    "@tuya-sat/micro-utils": "2.1.0",
+    "babel-loader": "8.2.4",
+    "babel-plugin-import": "1.13.3",
     "chalk": "4.1.2",
-    "cheerio": "^1.0.0-rc.10",
-    "copy-webpack-plugin": "^9.0.1",
-    "css-loader": "^6.4.0",
-    "css-minimizer-webpack-plugin": "^3.2.0",
-    "express": "^4.17.2",
-    "fork-ts-checker-webpack-plugin": "^6.4.0",
-    "html-webpack-plugin": "^5.3.2",
-    "http-proxy-middleware": "^2.0.1",
-    "joi": "^17.6.0",
-    "less": "^4.1.2",
-    "less-loader": "^10.1.0",
-    "mini-css-extract-plugin": "^2.4.2",
-    "open": "^8.4.0",
+    "cheerio": "1.0.0-rc.10",
+    "copy-webpack-plugin": "10.2.4",
+    "css-loader": "6.7.1",
+    "css-minimizer-webpack-plugin": "3.4.1",
+    "express": "4.17.3",
+    "fork-ts-checker-webpack-plugin": "7.2.1",
+    "html-webpack-plugin": "5.5.0",
+    "http-proxy-middleware": "2.0.4",
+    "joi": "17.6.0",
+    "less": "4.1.2",
+    "less-loader": "10.2.0",
+    "mini-css-extract-plugin": "2.6.0",
+    "open": "8.4.0",
     "ora": "5.4.1",
-    "path-to-regexp": "^6.2.0",
-    "portfinder": "^1.0.28",
-    "postcss": "^8.4.5",
-    "postcss-loader": "^6.2.1",
-    "postcss-preset-env": "^7.4.2",
-    "react-refresh": "^0.10.0",
-    "resolve-url-loader": "^4.0.0",
-    "sass": "^1.42.1",
-    "sass-loader": "^12.1.0",
-    "style-loader": "^3.3.0",
-    "svg-url-loader": "^7.1.1",
-    "tsconfig-paths-webpack-plugin": "^3.5.1",
-    "url-loader": "^4.1.1",
-    "uuid": "^8.3.2",
-    "vue-loader": "16.8.2",
-    "webpack": "^5.58.1",
-    "webpack-dev-server": "^4.3.1",
-    "webpack-merge": "^5.8.0"
+    "path-to-regexp": "6.2.0",
+    "portfinder": "1.0.28",
+    "postcss": "8.4.12",
+    "postcss-loader": "6.2.1",
+    "postcss-preset-env": "7.4.3",
+    "react-refresh": "0.11.0",
+    "resolve-url-loader": "5.0.0",
+    "sass": "1.49.9",
+    "sass-loader": "12.6.0",
+    "style-loader": "3.3.1",
+    "svg-url-loader": "7.1.1",
+    "tsconfig-paths-webpack-plugin": "3.5.2",
+    "url-loader": "4.1.1",
+    "uuid": "8.3.2",
+    "vue-loader": "17.0.0",
+    "webpack": "5.70.0",
+    "webpack-dev-server": "4.7.4",
+    "webpack-merge": "5.8.0"
   },
   "devDependencies": {
-    "@types/express": "^4.17.13",
-    "@types/jest": "^27.4.1",
-    "@types/uuid": "^8.3.4",
-    "@types/webpack-dev-server": "^4.5.0",
-    "jest": "^27.5.1",
-    "ts-jest": "^27.1.3",
-    "typescript": "^4.4.4"
-  },
-  "peerDependencies": {
-    "@tuya-sat/micro-dev-component": "^2.0.0-rc.6"
+    "@types/express": "4.17.13",
+    "@types/jest": "27.4.1",
+    "@types/uuid": "8.3.4",
+    "jest": "27.5.1",
+    "ts-jest": "27.1.3",
+    "typescript": "4.6.2"
   },
   "keywords": [
     "saturn-project",
@@ -79,6 +75,5 @@
     "saas",
     "cloud",
     "tuya"
-  ],
-  "stableVersion": "1.1.4"
+  ]
 }