Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-cli into dev

config/mp/webpack.config.js

@@ -290,6 +290,7 @@ module.exports = function (webpackEnv) {
                 exclude: [
                     '*/weui-miniprogram/*',
                     '**/*.module.less',
+                    '**/*.native.less',
                     '**/web.less',
                     '**/locales/**/*',
                 ],
@@ -384,7 +385,7 @@ module.exports = function (webpackEnv) {
                     // 将在“服务器”模式下使用的主机启动HTTP服务器。
                     analyzerHost: '127.0.0.1',
                     // 将在“服务器”模式下使用的端口启动HTTP服务器。
-                    analyzerPort: 8888,
+                    analyzerPort: 8889,
                     // 路径捆绑，将在`static`模式下生成的报告文件。
                     // 相对于捆绑输出目录。
                     reportFilename: 'report.html',

src/template.ts

@@ -11,7 +11,9 @@ export function packageJsonContent({
 	let oakDependencyStr;
 	let oakDevDependencyStr;
 	if (isDev) {
-		oakDependencyStr = `"oak-common-aspect": "file:../oak-common-aspect",
+		oakDependencyStr = `
+        "oak-backend-base": "file:../oak-backend-base",
+        "oak-common-aspect": "file:../oak-common-aspect",
         "oak-db": "file:../oak-db",
         "oak-domain": "file:../oak-domain",
         "oak-external-sdk": "file:../oak-external-sdk",
@@ -22,7 +24,9 @@ export function packageJsonContent({
 	}
 	else {
 		// todo，这里从npmjs.org上获取最新版本
-		oakDependencyStr = `"oak-common-aspect": "^2.1.0",
+		oakDependencyStr = `
+        "oak-backend-base": "^3.2.0",
+        "oak-common-aspect": "^2.1.0",
         "oak-db": "^2.1.1",
         "oak-domain": "^2.1.0",
         "oak-external-sdk": "^1.0.5",