@tuya-sat/micro-script 3.3.2 → 3.3.3

package/dist/config/webpack.common.d.ts

@@ -2,8 +2,9 @@ import { Configuration } from 'webpack';
 import { ThemeCat } from '@tuya-sat/micro-dev-loader/dist/less/utils/index';
 declare type ThemeEnv = ThemeCat | undefined;
 export declare const validateMicroTheme: () => ThemeEnv;
-export default function getCommonConfig({ isDev, isBuild, }: {
+export default function getCommonConfig({ isDev, isBuild, port, }: {
     isDev: boolean;
     isBuild: boolean;
+    port?: number;
 }): Configuration;
 export {};

package/dist/config/webpack.common.js

@@ -64,7 +64,7 @@ const validateMicroTheme = () => {
     return microTheme;
 };
 exports.validateMicroTheme = validateMicroTheme;
-function getCommonConfig({ isDev, isBuild, }) {
+function getCommonConfig({ isDev, isBuild, port, }) {
     const { name: packageName } = require(paths_1.default.appPkg);
     const devMicroTheme = (0, exports.validateMicroTheme)();
     const enableThemeCompile = isDev
@@ -105,6 +105,7 @@ function getCommonConfig({ isDev, isBuild, }) {
         const baseConfig = {
             mode: isBuild ? 'production' : 'development',
             output: {
+                publicPath: isDev && isMainApp && port ? `http://0.0.0.0/${port}/` : undefined,
                 filename: isBuild
                     ? 'static/js/[name].[contenthash:8].js'
                     : 'static/js/[name].bundle.js',

package/dist/config/webpack.config.d.ts

@@ -6,5 +6,5 @@ export interface BaseParams {
 export interface WebpackCombineFunction {
     (arg0: Configuration, arg1: BaseParams): Configuration;
 }
-declare const _default: () => Configuration;
+declare const _default: (port?: number) => Configuration;
 export default _default;

package/dist/config/webpack.config.js

@@ -8,7 +8,7 @@ const paths_1 = __importDefault(require("./paths"));
 const framework_1 = __importDefault(require("../framework"));
 const webpack_common_1 = __importDefault(require("./webpack.common"));
 const utils_1 = require("../utils");
-exports.default = () => {
+exports.default = (port) => {
     const isBuild = process.env.NODE_ENV === 'production';
     const isDev = process.env.NODE_ENV === 'development';
     //框架的webpack配置
@@ -18,7 +18,7 @@ exports.default = () => {
         isBuild,
     });
     //公用的webpack配置
-    const commonConfig = (0, webpack_common_1.default)({ isDev, isBuild });
+    const commonConfig = (0, webpack_common_1.default)({ port, isDev, isBuild });
     const baseConfig = (0, webpack_merge_1.merge)(frameworkConfig, commonConfig);
     //额外的webpack结合function
     const webpackCombineFunction = require(paths_1.default.microConfig).webpack;

package/dist/module/bundleServer.d.ts

@@ -1,7 +1,7 @@
 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 createServerCompiler(port?: number): webpack.Compiler;
 export declare function runBundleServer({ port, compiler, internalDevConfig, }: {
     port: number;
     compiler: Compiler;

package/dist/module/bundleServer.js

@@ -33,8 +33,8 @@ const webpack_config_1 = __importDefault(require("../config/webpack.config"));
 const options_1 = __importDefault(require("./options"));
 const onceFactory_1 = require("../utils/onceFactory");
 const promiser_1 = require("../utils/promiser");
-function createServerCompiler() {
-    const config = Object.assign(Object.assign({}, (0, webpack_config_1.default)()), { 
+function createServerCompiler(port) {
+    const config = Object.assign(Object.assign({}, (0, webpack_config_1.default)(port)), { 
         //下面所有配置都是为了精简terminal输出
         infrastructureLogging: {
             level: 'warn',

package/dist/scripts/startInMain.js

@@ -31,7 +31,7 @@ const template_1 = __importDefault(require("../template"));
         port: bundledServerPort + 1,
         stopPort: bundledServerPort + 100,
     });
-    const compiler = (0, bundleServer_1.createServerCompiler)();
+    const compiler = (0, bundleServer_1.createServerCompiler)(bundledServerPort);
     yield (0, bundleServer_1.runBundleServer)({
         port: bundledServerPort,
         compiler,

package/dist/template/main-app/utils.ts

@@ -49,9 +49,9 @@ export const reWriteUI = () => {
   bindCmp(result, nav, 'nav');
 
   const layout = (require as any).context(
-    '../../src/layout',
+    '../../src',
     true,
-    /\.([tj]sx)|[tj]s$/
+    /\.\/layout\/.*\.([tj]sx?)$/
   );
   bindCmp(result, layout, 'layout');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -23,9 +23,9 @@
     "@babel/preset-typescript": "7.16.7",
     "@babel/traverse": "^7.20.13",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
-    "@tuya-sat/micro-dev-loader": "3.3.2",
-    "@tuya-sat/micro-dev-proxy": "3.3.2",
-    "@tuya-sat/micro-utils": "3.3.2",
+    "@tuya-sat/micro-dev-loader": "3.3.3",
+    "@tuya-sat/micro-dev-proxy": "3.3.3",
+    "@tuya-sat/micro-utils": "3.3.3",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",