@tuya-sat/micro-script 3.0.0-beta.15 → 3.0.0-beta.16

package/dist/module/bundleServer.d.ts

@@ -1,9 +1,9 @@
-import webpack, { Compiler } from "webpack";
-import { Configuration } from "webpack-dev-server";
+import webpack, { Compiler } from 'webpack';
+import { Configuration } from 'webpack-dev-server';
 export declare type CustomDevServer = (value: Configuration) => typeof value;
 export declare function createServerCompiler(): webpack.Compiler;
 export declare function runBundleServer({ port, compiler, internalDevConfig, }: {
     port: number;
     compiler: Compiler;
-    internalDevConfig?: Pick<Configuration, "open" | "setupMiddlewares" | "allowedHosts">;
+    internalDevConfig?: Pick<Configuration, 'open' | 'setupMiddlewares' | 'allowedHosts'>;
 }): Promise<void>;

package/dist/module/bundleServer.js

@@ -36,8 +36,8 @@ function createServerCompiler() {
     const config = Object.assign(Object.assign({}, (0, webpack_config_1.default)()), { 
         //下面所有配置都是为了精简terminal输出
         infrastructureLogging: {
-            level: "warn",
-        }, stats: "errors-warnings" });
+            level: 'warn',
+        }, stats: 'errors-warnings' });
     return (0, webpack_1.default)(config);
 }
 exports.createServerCompiler = createServerCompiler;
@@ -47,8 +47,8 @@ function runBundleServer({ port, compiler, internalDevConfig = {}, }) {
         const { devServer = (value) => value } = require(paths_1.default.microConfig);
         const { setupMiddlewares: startDevSetupMiddlewares } = internalDevConfig, restServerConfig = __rest(internalDevConfig, ["setupMiddlewares"]);
         const server = new webpack_dev_server_1.default(devServer(Object.assign({ hot: true, liveReload: false, port, headers: {
-                "Access-Control-Allow-Origin": "*",
-                "Access-Control-Allow-Headers": "*",
+                'Access-Control-Allow-Origin': '*',
+                'Access-Control-Allow-Headers': '*',
             }, historyApiFallback: true, setupMiddlewares(middleware, devServer) {
                 //可能会有问题
                 middleware.push(options_1.default);
@@ -56,21 +56,22 @@ function runBundleServer({ port, compiler, internalDevConfig = {}, }) {
                     ? startDevSetupMiddlewares(middleware, devServer)
                     : middleware;
             } }, restServerConfig)), compiler);
-        compiler.hooks.watchRun.tap("MyPlugin", () => {
+        compiler.hooks.watchRun.tap('MyPlugin', () => {
             spinner.isSpinning && spinner.succeed();
-            spinner.color = "yellow";
-            spinner.text = "webpack compiling";
+            spinner.color = 'yellow';
+            spinner.text = 'webpack compiling';
             spinner.start();
         });
-        compiler.hooks.done.tap("MyPlugin", ({ endTime, startTime }) => {
+        compiler.hooks.done.tap('MyPlugin', ({ endTime, startTime }) => {
             spinner.isSpinning && spinner.succeed();
             console.log(`compiled time ~${endTime - startTime}ms`);
         });
         //临时提示
-        compiler.hooks.done.tap("once-tip", (0, onceFactory_1.onceFactory)(() => {
+        compiler.hooks.done.tap('once-tip', (0, onceFactory_1.onceFactory)(() => {
             console.log(chalk_1.default.yellow(`Tip: 如果HMR失效且保存文件时造成多次compile，请考虑调高aggregateTimeout参数(可以尝试100)`));
         }));
-        server.start();
+        yield server.start();
+        console.log('本地应用服务已启动');
     });
 }
 exports.runBundleServer = runBundleServer;

package/dist/module/mainServer.js

@@ -38,6 +38,7 @@ function runMain({ port, microPort, }) {
             resolve();
         });
         yield waiting;
+        console.log('代理服务已启动');
     });
 }
 exports.default = runMain;

package/dist/scripts/startInMain.js

@@ -29,18 +29,18 @@ const kill_port_1 = __importDefault(require("kill-port"));
         stopPort: bundledServerPort + 100,
     });
     const compiler = (0, bundleServer_1.createServerCompiler)();
-    yield (0, mainServer_1.default)({
-        port: mainServerPort,
-        microPort: bundledServerPort,
-    });
-    (0, open_1.default)(`http://localhost:${mainServerPort}`);
-    (0, bundleServer_1.runBundleServer)({
+    yield (0, bundleServer_1.runBundleServer)({
         port: bundledServerPort,
         compiler,
         internalDevConfig: {
             allowedHosts: 'all',
         },
     });
+    yield (0, mainServer_1.default)({
+        port: mainServerPort,
+        microPort: bundledServerPort,
+    });
+    (0, open_1.default)(`http://localhost:${mainServerPort}`);
     process.on('exit', () => {
         (0, kill_port_1.default)(bundledServerPort, 'tcp').then(console.log).catch(console.log);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.0.0-beta.15",
+  "version": "3.0.0-beta.16",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -20,9 +20,9 @@
     "@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": "3.0.0-beta.15",
-    "@tuya-sat/micro-dev-proxy": "3.0.0-beta.15",
-    "@tuya-sat/micro-utils": "3.0.0-beta.15",
+    "@tuya-sat/micro-dev-loader": "3.0.0-beta.16",
+    "@tuya-sat/micro-dev-proxy": "3.0.0-beta.16",
+    "@tuya-sat/micro-utils": "3.0.0-beta.16",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",