@tuya-sat/micro-script 3.0.0-beta.1 → 3.0.0-beta.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config/webpack.common.d.ts +2 -2
- package/dist/config/webpack.common.js +136 -109
- package/dist/config/webpack.config.d.ts +1 -1
- package/dist/config/webpack.config.js +5 -6
- package/dist/module/main/fakeSaasInfo.d.ts +2 -2
- package/dist/module/main/fakeSaasInfo.js +91 -33
- package/dist/module/main/staticMain.js +7 -3
- package/dist/module/mainServer.js +3 -1
- package/dist/module/options.d.ts +4 -5
- package/dist/module/options.js +6 -5
- package/dist/scripts/startInMain.js +5 -1
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.js +43 -0
- package/package.json +8 -4
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Configuration } from
|
|
2
|
-
import { ThemeCat } from
|
|
1
|
+
import { Configuration } from 'webpack';
|
|
2
|
+
import { ThemeCat } from '@tuya-sat/micro-dev-loader/dist/less/utils/index';
|
|
3
3
|
declare type ThemeEnv = ThemeCat | undefined;
|
|
4
4
|
export declare const validateMicroTheme: () => ThemeEnv;
|
|
5
5
|
export default function getCommonConfig({ isDev, isBuild, }: {
|
|
@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.validateMicroTheme = void 0;
|
|
16
|
+
const webpack_merge_1 = require("webpack-merge");
|
|
16
17
|
//@ts-ignore
|
|
17
18
|
const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
|
|
18
19
|
//@ts-ignore
|
|
@@ -20,9 +21,10 @@ const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plug
|
|
|
20
21
|
const html_webpack_plugin_1 = __importDefault(require("html-webpack-plugin"));
|
|
21
22
|
const css_minimizer_webpack_plugin_1 = __importDefault(require("css-minimizer-webpack-plugin"));
|
|
22
23
|
const micro_dev_loader_1 = require("@tuya-sat/micro-dev-loader");
|
|
24
|
+
const path_1 = __importDefault(require("path"));
|
|
23
25
|
const index_1 = require("@tuya-sat/micro-dev-loader/dist/less/utils/index");
|
|
24
|
-
const micro_utils_1 = require("@tuya-sat/micro-utils");
|
|
25
26
|
const paths_1 = __importDefault(require("./paths"));
|
|
27
|
+
const utils_1 = require("../utils");
|
|
26
28
|
const toArray = (value) => {
|
|
27
29
|
return Array.isArray(value) ? value : [value];
|
|
28
30
|
};
|
|
@@ -37,143 +39,168 @@ const validateMicroTheme = () => {
|
|
|
37
39
|
exports.validateMicroTheme = validateMicroTheme;
|
|
38
40
|
function getCommonConfig({ isDev, isBuild, }) {
|
|
39
41
|
const { name: packageName } = require(paths_1.default.appPkg);
|
|
40
|
-
const { annotations } = (0, micro_utils_1.parseManifest)();
|
|
41
42
|
const devMicroTheme = (0, exports.validateMicroTheme)();
|
|
42
43
|
const enableThemeCompile = isDev
|
|
43
44
|
? !!devMicroTheme
|
|
44
|
-
:
|
|
45
|
+
: (0, utils_1.getAnnotations)()['sdf.feat:colorTheme'];
|
|
45
46
|
//获取style处理的loader
|
|
46
47
|
const getStyleLoaders = (extraLoader = []) => {
|
|
47
48
|
extraLoader = toArray(extraLoader);
|
|
48
49
|
const loadersBeforeCssLoader = [
|
|
49
|
-
isDev && require(
|
|
50
|
-
require.resolve(
|
|
50
|
+
isDev && require('@tuya-sat/micro-dev-loader').filterCssVariableLoader,
|
|
51
|
+
require.resolve('postcss-loader'),
|
|
51
52
|
...extraLoader,
|
|
52
53
|
].filter(Boolean);
|
|
53
54
|
const loaders = [
|
|
54
|
-
isBuild ? mini_css_extract_plugin_1.default.loader : require.resolve(
|
|
55
|
+
isBuild ? mini_css_extract_plugin_1.default.loader : require.resolve('style-loader'),
|
|
55
56
|
{
|
|
56
|
-
loader: require.resolve(
|
|
57
|
+
loader: require.resolve('css-loader'),
|
|
57
58
|
options: {
|
|
58
59
|
modules: {
|
|
59
60
|
auto: true,
|
|
60
|
-
localIdentName: isDev ?
|
|
61
|
+
localIdentName: isDev ? '[path][name]__[local]' : '[hash:base64]',
|
|
61
62
|
},
|
|
62
63
|
importLoaders: loadersBeforeCssLoader.length,
|
|
63
64
|
},
|
|
64
65
|
},
|
|
65
|
-
...loadersBeforeCssLoader
|
|
66
|
+
...loadersBeforeCssLoader,
|
|
66
67
|
].filter(Boolean);
|
|
67
68
|
return loaders;
|
|
68
69
|
};
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
use: getStyleLoaders(),
|
|
70
|
+
const { multiApps } = require(paths_1.default.microConfig);
|
|
71
|
+
const multiAppsWebpackConfig = {
|
|
72
|
+
plugins: [],
|
|
73
|
+
entry: {},
|
|
74
|
+
};
|
|
75
|
+
function getWebpackConfig(htmlplugins) {
|
|
76
|
+
const baseConfig = {
|
|
77
|
+
mode: isBuild ? 'production' : 'development',
|
|
78
|
+
output: {
|
|
79
|
+
filename: isBuild
|
|
80
|
+
? 'static/js/[name].[contenthash:8].js'
|
|
81
|
+
: 'static/js/[name].bundle.js',
|
|
82
|
+
chunkFilename: isBuild
|
|
83
|
+
? 'static/js/[name].[contenthash:8].chunk.js'
|
|
84
|
+
: 'static/js/[name].chunk.js',
|
|
85
|
+
path: paths_1.default.dist,
|
|
86
|
+
clean: true,
|
|
87
|
+
library: {
|
|
88
|
+
name: packageName,
|
|
89
|
+
type: 'umd',
|
|
90
90
|
},
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
91
|
+
},
|
|
92
|
+
module: {
|
|
93
|
+
rules: [
|
|
94
|
+
{
|
|
95
|
+
test: /\.css$/,
|
|
96
|
+
use: getStyleLoaders(),
|
|
97
|
+
},
|
|
98
|
+
{
|
|
99
|
+
test: /\.less$/,
|
|
100
|
+
use: getStyleLoaders([
|
|
101
|
+
{
|
|
102
|
+
loader: require.resolve('less-loader'),
|
|
103
|
+
options: {
|
|
104
|
+
lessOptions: Object.assign(Object.assign({}, (isDev
|
|
105
|
+
? enableThemeCompile
|
|
106
|
+
? (0, index_1.getLessOptions)(devMicroTheme)
|
|
107
|
+
: {}
|
|
108
|
+
: (0, utils_1.getAnnotations)()['sdf.feat:colorTheme']
|
|
109
|
+
? (0, index_1.getLessOptions)(index_1.LIGHT_THEME)
|
|
110
|
+
: {})), { javascriptEnabled: true }),
|
|
111
|
+
},
|
|
112
|
+
},
|
|
113
|
+
enableThemeCompile &&
|
|
114
|
+
require('@tuya-sat/micro-dev-loader').changeAntdGlobalImport,
|
|
115
|
+
enableThemeCompile &&
|
|
116
|
+
require('@tuya-sat/micro-dev-loader')
|
|
117
|
+
.changeTuyaSatComponentImport,
|
|
118
|
+
].filter(Boolean)),
|
|
119
|
+
},
|
|
120
|
+
{
|
|
121
|
+
test: /\.(scss|sass)$/,
|
|
122
|
+
use: getStyleLoaders(require.resolve('sass-loader')),
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
test: /\.(bmp|png|svg|jpg|jpeg|gif)$/i,
|
|
126
|
+
type: 'asset',
|
|
127
|
+
parser: {
|
|
128
|
+
dataUrlCondition: {
|
|
129
|
+
maxSize: 10 * 1024,
|
|
104
130
|
},
|
|
105
131
|
},
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
enableThemeCompile &&
|
|
109
|
-
require("@tuya-sat/micro-dev-loader").changeTuyaSatComponentImport
|
|
110
|
-
].filter(Boolean)),
|
|
111
|
-
},
|
|
112
|
-
{
|
|
113
|
-
test: /\.(scss|sass)$/,
|
|
114
|
-
use: getStyleLoaders(require.resolve("sass-loader")),
|
|
115
|
-
},
|
|
116
|
-
{
|
|
117
|
-
test: /\.(bmp|png|svg|jpg|jpeg|gif)$/i,
|
|
118
|
-
type: "asset",
|
|
119
|
-
parser: {
|
|
120
|
-
dataUrlCondition: {
|
|
121
|
-
maxSize: 10 * 1024,
|
|
132
|
+
generator: {
|
|
133
|
+
filename: 'static/img/[hash][ext][query]',
|
|
122
134
|
},
|
|
123
135
|
},
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
136
|
+
].filter(Boolean),
|
|
137
|
+
},
|
|
138
|
+
optimization: {
|
|
139
|
+
runtimeChunk: 'single',
|
|
140
|
+
splitChunks: {
|
|
141
|
+
cacheGroups: Object.assign(Object.assign({}, (enableThemeCompile
|
|
142
|
+
? {
|
|
143
|
+
vendorCss: {
|
|
144
|
+
test: /([\\/]node_modules[\\/][\s\S]+(\.less|\.css)$)|([\\/]src[\\/]styles[\\/]global\.less)/,
|
|
145
|
+
name: 'light',
|
|
146
|
+
chunks: 'all',
|
|
147
|
+
priority: 2,
|
|
148
|
+
},
|
|
149
|
+
}
|
|
150
|
+
: {})), { vendor: {
|
|
151
|
+
test: /[\\/]node_modules[\\/]/,
|
|
152
|
+
name: 'vendors-others',
|
|
153
|
+
chunks: 'all',
|
|
154
|
+
priority: 0,
|
|
155
|
+
}, react: {
|
|
156
|
+
test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/,
|
|
157
|
+
name: 'react-related',
|
|
158
|
+
chunks: 'all',
|
|
159
|
+
priority: 1,
|
|
160
|
+
} }),
|
|
127
161
|
},
|
|
128
|
-
|
|
129
|
-
},
|
|
130
|
-
optimization: {
|
|
131
|
-
runtimeChunk: "single",
|
|
132
|
-
splitChunks: {
|
|
133
|
-
cacheGroups: Object.assign(Object.assign({}, (enableThemeCompile
|
|
134
|
-
? {
|
|
135
|
-
vendorCss: {
|
|
136
|
-
test: /([\\/]node_modules[\\/][\s\S]+(\.less|\.css)$)|([\\/]src[\\/]styles[\\/]global\.less)/,
|
|
137
|
-
name: "light",
|
|
138
|
-
chunks: "all",
|
|
139
|
-
priority: 2,
|
|
140
|
-
},
|
|
141
|
-
}
|
|
142
|
-
: {})), { vendor: {
|
|
143
|
-
test: /[\\/]node_modules[\\/]/,
|
|
144
|
-
name: "vendors-others",
|
|
145
|
-
chunks: "all",
|
|
146
|
-
priority: 0,
|
|
147
|
-
}, react: {
|
|
148
|
-
test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/,
|
|
149
|
-
name: "react-related",
|
|
150
|
-
chunks: "all",
|
|
151
|
-
priority: 1,
|
|
152
|
-
} }),
|
|
162
|
+
minimizer: ['...', new css_minimizer_webpack_plugin_1.default()],
|
|
153
163
|
},
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
164
|
+
plugins: [
|
|
165
|
+
new html_webpack_plugin_1.default({
|
|
166
|
+
inject: true,
|
|
167
|
+
template: paths_1.default.spaHtml,
|
|
168
|
+
}),
|
|
169
|
+
...htmlplugins,
|
|
170
|
+
new copy_webpack_plugin_1.default({
|
|
171
|
+
patterns: [
|
|
172
|
+
{
|
|
173
|
+
from: paths_1.default.publicDir,
|
|
174
|
+
filter: (resourcePath) => __awaiter(this, void 0, void 0, function* () { return resourcePath !== paths_1.default.spaHtml; }),
|
|
175
|
+
noErrorOnMissing: true,
|
|
176
|
+
},
|
|
177
|
+
],
|
|
178
|
+
}),
|
|
179
|
+
isBuild &&
|
|
180
|
+
new mini_css_extract_plugin_1.default({
|
|
181
|
+
filename: 'static/css/[name].[contenthash:8].css',
|
|
182
|
+
chunkFilename: 'static/css/[name].[contenthash:8].chunk.css',
|
|
183
|
+
}),
|
|
184
|
+
isBuild && enableThemeCompile && new micro_dev_loader_1.ThemePlugin(),
|
|
185
|
+
].filter((value) => Boolean(value)),
|
|
186
|
+
};
|
|
187
|
+
return baseConfig;
|
|
188
|
+
}
|
|
189
|
+
if (multiApps && multiApps.length > 0) {
|
|
190
|
+
multiApps.forEach((app) => {
|
|
191
|
+
multiAppsWebpackConfig.entry[app.name] = `${path_1.default.join(process.cwd(), app.dir)}/index.tsx`;
|
|
192
|
+
multiAppsWebpackConfig.plugins.push(new html_webpack_plugin_1.default({
|
|
158
193
|
inject: true,
|
|
194
|
+
filename: `${app.name}.html`,
|
|
159
195
|
template: paths_1.default.spaHtml,
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
}),
|
|
170
|
-
isBuild &&
|
|
171
|
-
new mini_css_extract_plugin_1.default({
|
|
172
|
-
filename: "static/css/[name].[contenthash:8].css",
|
|
173
|
-
chunkFilename: "static/css/[name].[contenthash:8].chunk.css",
|
|
174
|
-
}),
|
|
175
|
-
isBuild && enableThemeCompile && new micro_dev_loader_1.ThemePlugin(),
|
|
176
|
-
].filter((value) => Boolean(value)),
|
|
177
|
-
};
|
|
196
|
+
chunks: [app.name],
|
|
197
|
+
}));
|
|
198
|
+
});
|
|
199
|
+
console.log('multiAppsWebpackConfig', multiAppsWebpackConfig);
|
|
200
|
+
return (0, webpack_merge_1.merge)(getWebpackConfig(multiAppsWebpackConfig.plugins), {
|
|
201
|
+
entry: multiAppsWebpackConfig.entry,
|
|
202
|
+
});
|
|
203
|
+
}
|
|
204
|
+
return getWebpackConfig([]);
|
|
178
205
|
}
|
|
179
206
|
exports.default = getCommonConfig;
|
|
@@ -7,14 +7,13 @@ const webpack_merge_1 = require("webpack-merge");
|
|
|
7
7
|
const paths_1 = __importDefault(require("./paths"));
|
|
8
8
|
const framework_1 = __importDefault(require("../framework"));
|
|
9
9
|
const webpack_common_1 = __importDefault(require("./webpack.common"));
|
|
10
|
-
const
|
|
10
|
+
const utils_1 = require("../utils");
|
|
11
11
|
exports.default = () => {
|
|
12
|
-
const isBuild = process.env.NODE_ENV ===
|
|
13
|
-
const isDev = process.env.NODE_ENV ===
|
|
14
|
-
const { annotations: { ["sdf.cli:microFramework"]: currentFramework }, } = (0, micro_utils_1.parseManifest)();
|
|
12
|
+
const isBuild = process.env.NODE_ENV === 'production';
|
|
13
|
+
const isDev = process.env.NODE_ENV === 'development';
|
|
15
14
|
//框架的webpack配置
|
|
16
15
|
const frameworkConfig = (0, framework_1.default)({
|
|
17
|
-
currentFramework,
|
|
16
|
+
currentFramework: (0, utils_1.getAnnotations)()['sdf.cli:microFramework'],
|
|
18
17
|
isDev,
|
|
19
18
|
isBuild,
|
|
20
19
|
});
|
|
@@ -23,7 +22,7 @@ exports.default = () => {
|
|
|
23
22
|
const baseConfig = (0, webpack_merge_1.merge)(frameworkConfig, commonConfig);
|
|
24
23
|
//额外的webpack结合function
|
|
25
24
|
const webpackCombineFunction = require(paths_1.default.microConfig).webpack;
|
|
26
|
-
if (webpackCombineFunction && typeof webpackCombineFunction ===
|
|
25
|
+
if (webpackCombineFunction && typeof webpackCombineFunction === 'function') {
|
|
27
26
|
return webpackCombineFunction(baseConfig, { isDev, isBuild });
|
|
28
27
|
}
|
|
29
28
|
return baseConfig;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { Express } from
|
|
2
|
-
export default function mockSaasInfo(app: Express, microPort: number):
|
|
1
|
+
import { Express } from 'express';
|
|
2
|
+
export default function mockSaasInfo(app: Express, microPort: number): void;
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
@@ -6,33 +29,68 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
29
|
const micro_utils_1 = require("@tuya-sat/micro-utils");
|
|
7
30
|
const uuid_1 = require("uuid");
|
|
8
31
|
const paths_1 = __importDefault(require("../../config/paths"));
|
|
32
|
+
const uid_1 = require("uid");
|
|
33
|
+
const path = __importStar(require("path"));
|
|
34
|
+
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
9
35
|
function mockSaasInfo(app, microPort) {
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
36
|
+
const { multiApps } = require(paths_1.default.microConfig);
|
|
37
|
+
const idsMap = new Map();
|
|
38
|
+
multiApps === null || multiApps === void 0 ? void 0 : multiApps.forEach((app) => {
|
|
39
|
+
idsMap.set(app.name, { entry_id: (0, uuid_1.v4)(), oem_micro_app_id: (0, uid_1.uid)(16) });
|
|
40
|
+
});
|
|
41
|
+
app.get('/api/saas-info', (req, res) => {
|
|
42
|
+
const lang = parseCookie(req.headers['cookie'], 'main-i18next');
|
|
43
|
+
if (multiApps && multiApps.length > 0) {
|
|
44
|
+
const result = {
|
|
45
|
+
apps: [],
|
|
46
|
+
entry_info: { entries: [], entry_mode: 'normal' },
|
|
47
|
+
permissions: {},
|
|
48
|
+
};
|
|
49
|
+
multiApps.forEach((app) => {
|
|
50
|
+
const entry_id = idsMap.get(app.name).entry_id;
|
|
51
|
+
const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), `${app.dir}/manifest.json`), 'utf-8');
|
|
52
|
+
const oem_micro_app_id = idsMap.get(app.name).oem_micro_app_id;
|
|
53
|
+
const baseUrl = `/apps/${oem_micro_app_id}`;
|
|
54
|
+
const micoApp = consturctApp(manifest, oem_micro_app_id, baseUrl, lang, microPort, app.name);
|
|
55
|
+
const entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, app.dir);
|
|
56
|
+
const permission = consturctPermissions();
|
|
57
|
+
result.apps.push(micoApp);
|
|
58
|
+
result.entry_info.entries.push(entryInfo);
|
|
59
|
+
result.permissions[oem_micro_app_id] = permission;
|
|
60
|
+
});
|
|
61
|
+
res.send({
|
|
62
|
+
code: null,
|
|
63
|
+
errorMsg: null,
|
|
64
|
+
msg: null,
|
|
65
|
+
result,
|
|
66
|
+
success: true,
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
const manifest = (0, micro_utils_1.parseManifest)();
|
|
71
|
+
const entry_id = (0, uuid_1.v4)();
|
|
72
|
+
const oem_micro_app_id = manifest.universalId;
|
|
73
|
+
const baseUrl = `/apps/${oem_micro_app_id}`;
|
|
74
|
+
const app = consturctApp(manifest, oem_micro_app_id, baseUrl, lang, microPort);
|
|
75
|
+
const entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, '');
|
|
76
|
+
const permission = consturctPermissions();
|
|
77
|
+
res.send({
|
|
78
|
+
code: null,
|
|
79
|
+
errorMsg: null,
|
|
80
|
+
msg: null,
|
|
81
|
+
result: {
|
|
82
|
+
apps: [app],
|
|
83
|
+
entry_info: { entries: [entryInfo], entry_mode: 'normal' },
|
|
84
|
+
permissions: { [oem_micro_app_id]: permission },
|
|
85
|
+
},
|
|
86
|
+
success: true,
|
|
87
|
+
});
|
|
88
|
+
}
|
|
30
89
|
});
|
|
31
|
-
return baseUrl;
|
|
32
90
|
}
|
|
33
91
|
exports.default = mockSaasInfo;
|
|
34
|
-
function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang) {
|
|
35
|
-
const fakeMenu = (0, micro_utils_1.getFakeMenu)(manifest);
|
|
92
|
+
function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, dir) {
|
|
93
|
+
const fakeMenu = (0, micro_utils_1.getFakeMenu)(manifest, dir);
|
|
36
94
|
let stack = [fakeMenu];
|
|
37
95
|
while (stack.length) {
|
|
38
96
|
const menu = stack.shift();
|
|
@@ -49,17 +107,17 @@ function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang) {
|
|
|
49
107
|
}
|
|
50
108
|
return fakeMenu;
|
|
51
109
|
}
|
|
52
|
-
function consturctApp(manifest, oem_micro_app_id, baseUrl, lang, port) {
|
|
110
|
+
function consturctApp(manifest, oem_micro_app_id, baseUrl, lang, port, code) {
|
|
53
111
|
const packageInfo = (0, micro_utils_1.getPackage)();
|
|
54
112
|
return {
|
|
55
113
|
active_rule: baseUrl,
|
|
56
|
-
dependencies: [
|
|
114
|
+
dependencies: [''],
|
|
57
115
|
ext_info: null,
|
|
58
|
-
micro_app_code: `${packageInfo.name}`,
|
|
59
|
-
micro_app_name: `${
|
|
60
|
-
micro_app_version:
|
|
116
|
+
micro_app_code: code || `${packageInfo.name}`,
|
|
117
|
+
micro_app_name: code ? `${code}-dev` : `${packageInfo.name}-dev`,
|
|
118
|
+
micro_app_version: '0.0.0-x',
|
|
61
119
|
oem_micro_app_id,
|
|
62
|
-
resource: `http://localhost:${port}`,
|
|
120
|
+
resource: `http://localhost:${port}/${code || 'index'}.html`,
|
|
63
121
|
schema: null,
|
|
64
122
|
universal_id: manifest.universalId,
|
|
65
123
|
isAuth: true,
|
|
@@ -71,15 +129,15 @@ function consturctPermissions() {
|
|
|
71
129
|
return mockPermissions.map((code) => ({ permission_group: code }));
|
|
72
130
|
}
|
|
73
131
|
function pickText(texts, lang) {
|
|
74
|
-
return lang ===
|
|
132
|
+
return lang === 'en' ? texts[1] : texts[0];
|
|
75
133
|
}
|
|
76
134
|
function parseCookie(cookie, key) {
|
|
77
|
-
const cookies = (cookie ||
|
|
135
|
+
const cookies = (cookie || '').split(';');
|
|
78
136
|
for (let cookieItem of cookies) {
|
|
79
|
-
const [cookieKey, value] = cookieItem.split(
|
|
137
|
+
const [cookieKey, value] = cookieItem.split('=');
|
|
80
138
|
if (cookieKey.trim() === key) {
|
|
81
139
|
return value;
|
|
82
140
|
}
|
|
83
141
|
}
|
|
84
|
-
return
|
|
142
|
+
return '';
|
|
85
143
|
}
|
|
@@ -96,10 +96,14 @@ function insertScript($, debuggerConfig) {
|
|
|
96
96
|
return item.config_key === "dynamic_theme";
|
|
97
97
|
}) || initalCustom_configs(saas);
|
|
98
98
|
const theme = (0, webpack_common_1.validateMicroTheme)();
|
|
99
|
-
themeConfig.config_value_json = JSON.stringify(Object.assign(Object.assign(Object.assign({}, JSON.parse(themeConfig.config_value_json)), (theme
|
|
100
|
-
|
|
101
|
-
|
|
99
|
+
themeConfig.config_value_json = JSON.stringify(Object.assign(Object.assign(Object.assign({}, JSON.parse(themeConfig.config_value_json)), (theme
|
|
100
|
+
? {
|
|
101
|
+
supportedTheme: theme,
|
|
102
|
+
}
|
|
103
|
+
: {})), readThemeConfig()));
|
|
102
104
|
overrideNotification(saas);
|
|
105
|
+
// 本地开发态多语言剥离多语言平台,走本地多语言兜底逻辑
|
|
106
|
+
_SDF.saas.saas_locales = {};
|
|
103
107
|
$("head").append($("<script>").text(`window._SDF_CONFIG=${JSON.stringify(_SDF_CONFIG)};window._SDF=${JSON.stringify(_SDF)};window.__MAIN_APP_PUBLIC_PATH=${JSON.stringify(__MAIN_APP_PUBLIC_PATH)};
|
|
104
108
|
localStorage.setItem('theme',${JSON.stringify(process.env.MICRO_THEME)});
|
|
105
109
|
localStorage.setItem('isDebugger','true')
|
|
@@ -23,13 +23,15 @@ const proxy_1 = __importDefault(require("../module/proxy"));
|
|
|
23
23
|
const validate_1 = require("../utils/validate");
|
|
24
24
|
function runMain({ port, microPort, }) {
|
|
25
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
const { debuggerConfig } = require(paths_1.default.microConfig);
|
|
26
|
+
const { debuggerConfig, mainServer } = require(paths_1.default.microConfig);
|
|
27
27
|
(0, validate_1.validateDebuggerConfig)(debuggerConfig);
|
|
28
28
|
const app = (0, express_1.default)();
|
|
29
|
+
mainServer && mainServer.before && mainServer.before(app);
|
|
29
30
|
(0, staticMain_1.default)(app, debuggerConfig);
|
|
30
31
|
(0, fakeSaasInfo_1.default)(app, microPort);
|
|
31
32
|
(0, mock_1.default)(app);
|
|
32
33
|
(0, proxy_1.default)(app);
|
|
34
|
+
mainServer && mainServer.after && mainServer.after(app);
|
|
33
35
|
const { waiting, resolve } = (0, promiser_1.promiser)();
|
|
34
36
|
app.listen(port, () => {
|
|
35
37
|
(0, ora_1.default)(`main server in ${port} port`).succeed();
|
package/dist/module/options.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
declare const _default: {
|
|
1
|
+
import { ExpressRequestHandler } from 'webpack-dev-server';
|
|
2
|
+
declare const option: {
|
|
4
3
|
name: string;
|
|
5
4
|
path: string;
|
|
6
|
-
middleware:
|
|
5
|
+
middleware: ExpressRequestHandler;
|
|
7
6
|
};
|
|
8
|
-
export default
|
|
7
|
+
export default option;
|
package/dist/module/options.js
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const middleware = (req, res, next) => {
|
|
4
|
-
if (req.method ===
|
|
4
|
+
if (req.method === 'OPTIONS') {
|
|
5
5
|
res.statusCode = 204;
|
|
6
|
-
res.send(
|
|
6
|
+
res.send('ok');
|
|
7
7
|
return;
|
|
8
8
|
}
|
|
9
9
|
next();
|
|
10
10
|
};
|
|
11
|
-
|
|
12
|
-
name:
|
|
13
|
-
path:
|
|
11
|
+
const option = {
|
|
12
|
+
name: 'options-middleware',
|
|
13
|
+
path: '*',
|
|
14
14
|
middleware,
|
|
15
15
|
};
|
|
16
|
+
exports.default = option;
|
|
@@ -16,6 +16,7 @@ const portfinder_1 = __importDefault(require("portfinder"));
|
|
|
16
16
|
const open_1 = __importDefault(require("open"));
|
|
17
17
|
const mainServer_1 = __importDefault(require("../module/mainServer"));
|
|
18
18
|
const bundleServer_1 = require("../module/bundleServer");
|
|
19
|
+
const kill_port_1 = __importDefault(require("kill-port"));
|
|
19
20
|
(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
21
|
let defaultPort = 9000;
|
|
21
22
|
//检测端口占用情况
|
|
@@ -37,9 +38,12 @@ const bundleServer_1 = require("../module/bundleServer");
|
|
|
37
38
|
port: bundledServerPort,
|
|
38
39
|
compiler,
|
|
39
40
|
internalDevConfig: {
|
|
40
|
-
allowedHosts:
|
|
41
|
+
allowedHosts: 'all',
|
|
41
42
|
},
|
|
42
43
|
});
|
|
44
|
+
process.on('exit', () => {
|
|
45
|
+
(0, kill_port_1.default)(bundledServerPort, 'tcp').then(console.log).catch(console.log);
|
|
46
|
+
});
|
|
43
47
|
}))().catch((err) => {
|
|
44
48
|
console.log(err);
|
|
45
49
|
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const getAnnotations: () => any;
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
28
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.getAnnotations = void 0;
|
|
30
|
+
const micro_utils_1 = require("@tuya-sat/micro-utils");
|
|
31
|
+
const path = __importStar(require("path"));
|
|
32
|
+
const paths_1 = __importDefault(require("../config/paths"));
|
|
33
|
+
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
34
|
+
const getAnnotations = () => {
|
|
35
|
+
const { multiApps } = require(paths_1.default.microConfig);
|
|
36
|
+
if (multiApps && multiApps.length > 0) {
|
|
37
|
+
return fs_extra_1.default.readJSONSync(path.join(process.cwd(), multiApps[0].dir, 'manifest.json')).annotations;
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
return (0, micro_utils_1.parseManifest)().annotations;
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
exports.getAnnotations = getAnnotations;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tuya-sat/micro-script",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.12",
|
|
4
4
|
"bin": "./dist/bin/cli.js",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"license": "MIT",
|
|
@@ -20,9 +20,10 @@
|
|
|
20
20
|
"@babel/preset-react": "7.16.7",
|
|
21
21
|
"@babel/preset-typescript": "7.16.7",
|
|
22
22
|
"@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
|
|
23
|
-
"@tuya-sat/micro-dev-loader": "3.0.0-beta.
|
|
24
|
-
"@tuya-sat/micro-dev-proxy": "3.0.0-beta.
|
|
25
|
-
"@tuya-sat/micro-utils": "3.0.0-beta.
|
|
23
|
+
"@tuya-sat/micro-dev-loader": "3.0.0-beta.12",
|
|
24
|
+
"@tuya-sat/micro-dev-proxy": "3.0.0-beta.12",
|
|
25
|
+
"@tuya-sat/micro-utils": "3.0.0-beta.12",
|
|
26
|
+
"@types/kill-port": "^2.0.0",
|
|
26
27
|
"babel-loader": "8.2.4",
|
|
27
28
|
"babel-plugin-import": "1.13.3",
|
|
28
29
|
"chalk": "4.1.2",
|
|
@@ -32,9 +33,11 @@
|
|
|
32
33
|
"css-minimizer-webpack-plugin": "3.4.1",
|
|
33
34
|
"express": "4.17.3",
|
|
34
35
|
"fork-ts-checker-webpack-plugin": "7.2.1",
|
|
36
|
+
"fs-extra": "^10.1.0",
|
|
35
37
|
"html-webpack-plugin": "5.5.0",
|
|
36
38
|
"http-proxy-middleware": "2.0.4",
|
|
37
39
|
"joi": "17.6.0",
|
|
40
|
+
"kill-port": "^2.0.1",
|
|
38
41
|
"less": "4.1.2",
|
|
39
42
|
"less-loader": "10.2.0",
|
|
40
43
|
"mini-css-extract-plugin": "2.6.0",
|
|
@@ -52,6 +55,7 @@
|
|
|
52
55
|
"style-loader": "3.3.1",
|
|
53
56
|
"svg-url-loader": "7.1.1",
|
|
54
57
|
"tsconfig-paths-webpack-plugin": "3.5.2",
|
|
58
|
+
"uid": "^2.0.1",
|
|
55
59
|
"url-loader": "4.1.1",
|
|
56
60
|
"uuid": "8.3.2",
|
|
57
61
|
"vue-loader": "17.0.0",
|