@heathenjs/taro-router-plugin 1.0.4 → 1.0.6
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.
|
@@ -5,12 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.generateAppConfig = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const CURRENT_PATH = process.cwd();
|
|
9
|
+
const SOURCE_PATH = path_1.default.resolve(CURRENT_PATH, './src');
|
|
8
10
|
const generateAppConfig = ({ pages, config, mainPackageName }) => {
|
|
9
11
|
const subPackages = config.packages
|
|
10
12
|
.filter((pkg) => pkg.name !== mainPackageName)
|
|
11
13
|
.map((pkg) => {
|
|
12
14
|
return {
|
|
13
|
-
root: path_1.default.resolve(
|
|
15
|
+
root: path_1.default.resolve(CURRENT_PATH, pkg.pagePath).replace(SOURCE_PATH, '').slice(1),
|
|
14
16
|
pages: [],
|
|
15
17
|
};
|
|
16
18
|
});
|
|
@@ -20,7 +22,7 @@ const generateAppConfig = ({ pages, config, mainPackageName }) => {
|
|
|
20
22
|
appConfig.pages.push(currentPage.path.slice(1));
|
|
21
23
|
}
|
|
22
24
|
else {
|
|
23
|
-
const targetSubPackage = appConfig.subPackages.find((pkg) => currentPage.path.startsWith(pkg.root));
|
|
25
|
+
const targetSubPackage = appConfig.subPackages.find((pkg) => currentPage.path.startsWith(`${path_1.default.sep}${pkg.root}`));
|
|
24
26
|
if (targetSubPackage) {
|
|
25
27
|
targetSubPackage.pages.push(currentPage.path.replace(`${targetSubPackage.root}${path_1.default.sep}`, ''));
|
|
26
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generate-app-config/index.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generate-app-config/index.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AASxB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AACnC,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;AAEjD,MAAM,iBAAiB,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAA2B,EAAE,EAAE;IAC/F,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ;SAChC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,eAAe,CAAC;SAC7C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,OAAO;YACL,IAAI,EAAE,cAAI,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YAChF,KAAK,EAAE,EAAc;SACtB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,SAAS,GAAuD,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC;IAEjG,KAAK,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QAC5B,IAAI,WAAW,CAAC,WAAW,KAAK,eAAe,EAAE,CAAC;YAEhD,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YAEN,MAAM,gBAAgB,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAC1D,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,cAAI,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CACtD,CAAC;YACF,IAAI,gBAAgB,EAAE,CAAC;gBACrB,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,IAAI,GAAG,cAAI,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;YACnG,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAGH,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5B,IAAI,IAAI,KAAK,MAAM,CAAC,WAAW;gBAAE,OAAO,CAAC,CAAC,CAAC;YAE3C,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AArCW,QAAA,iBAAiB,qBAqC5B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@heathenjs/taro-router-plugin",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.6",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"keywords": [],
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"@tarojs/taro": "^3.6.35"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@heathenjs/taro-router-generator": "1.0.
|
|
14
|
+
"@heathenjs/taro-router-generator": "1.0.6"
|
|
15
15
|
},
|
|
16
16
|
"scripts": {
|
|
17
17
|
"prod": "tsc -p ./tsconfig.json",
|
|
@@ -8,12 +8,15 @@ type GenerateAppConfigParams = {
|
|
|
8
8
|
mainPackageName: string;
|
|
9
9
|
};
|
|
10
10
|
|
|
11
|
+
const CURRENT_PATH = process.cwd();
|
|
12
|
+
const SOURCE_PATH = path.resolve(CURRENT_PATH, './src');
|
|
13
|
+
|
|
11
14
|
export const generateAppConfig = ({ pages, config, mainPackageName }: GenerateAppConfigParams) => {
|
|
12
15
|
const subPackages = config.packages
|
|
13
16
|
.filter((pkg) => pkg.name !== mainPackageName)
|
|
14
17
|
.map((pkg) => {
|
|
15
18
|
return {
|
|
16
|
-
root: path.resolve(
|
|
19
|
+
root: path.resolve(CURRENT_PATH, pkg.pagePath).replace(SOURCE_PATH, '').slice(1),
|
|
17
20
|
pages: [] as string[],
|
|
18
21
|
};
|
|
19
22
|
});
|
|
@@ -26,7 +29,9 @@ export const generateAppConfig = ({ pages, config, mainPackageName }: GenerateAp
|
|
|
26
29
|
appConfig.pages.push(currentPage.path.slice(1));
|
|
27
30
|
} else {
|
|
28
31
|
// 对于分包，判断所属的分包并加入
|
|
29
|
-
const targetSubPackage = appConfig.subPackages.find((pkg) =>
|
|
32
|
+
const targetSubPackage = appConfig.subPackages.find((pkg) =>
|
|
33
|
+
currentPage.path.startsWith(`${path.sep}${pkg.root}`),
|
|
34
|
+
);
|
|
30
35
|
if (targetSubPackage) {
|
|
31
36
|
targetSubPackage.pages.push(currentPage.path.replace(`${targetSubPackage.root}${path.sep}`, ''));
|
|
32
37
|
}
|