piral-core 1.1.0-beta.5777 → 1.1.0-beta.5779
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/app.codegen +1 -0
- package/dist/codegen.js +7 -5
- package/esm/tools/codegen.d.ts +1 -0
- package/esm/tools/codegen.js +8 -6
- package/esm/tools/codegen.js.map +1 -1
- package/lib/tools/codegen.d.ts +1 -0
- package/lib/tools/codegen.js +7 -5
- package/lib/tools/codegen.js.map +1 -1
- package/package.json +4 -4
- package/src/tools/codegen.ts +9 -6
package/app.codegen
CHANGED
|
@@ -16,6 +16,7 @@ module.exports = function () {
|
|
|
16
16
|
const debug = typeof cfg.debugTools === 'boolean' ? cfg.debugTools : !!process.env.DEBUG_PIRAL;
|
|
17
17
|
const opts = {
|
|
18
18
|
root,
|
|
19
|
+
origin: __dirname,
|
|
19
20
|
cat: process.env.NODE_ENV === 'test' ? 'src' : '_',
|
|
20
21
|
appName: process.env.BUILD_PCKG_NAME || '',
|
|
21
22
|
externals: (process.env.SHARED_DEPENDENCIES || '').split(',').filter(Boolean),
|
package/dist/codegen.js
CHANGED
|
@@ -5214,15 +5214,17 @@ function getIdentifiers(root, packageName) {
|
|
|
5214
5214
|
}
|
|
5215
5215
|
return identifiers;
|
|
5216
5216
|
}
|
|
5217
|
-
function getModulePathOrDefault(root, name) {
|
|
5217
|
+
function getModulePathOrDefault(root, origin, name) {
|
|
5218
5218
|
try {
|
|
5219
|
-
|
|
5219
|
+
const absPath = getModulePath(root, name);
|
|
5220
|
+
const path = (0, import_path.relative)(origin, absPath);
|
|
5221
|
+
return path;
|
|
5220
5222
|
} catch (e) {
|
|
5221
5223
|
return name;
|
|
5222
5224
|
}
|
|
5223
5225
|
}
|
|
5224
5226
|
function createDependencies(imports, exports, opts) {
|
|
5225
|
-
const { root, appName, externals } = opts;
|
|
5227
|
+
const { root, appName, externals, origin } = opts;
|
|
5226
5228
|
const assignments = [];
|
|
5227
5229
|
const asyncAssignments = [];
|
|
5228
5230
|
if (appName) {
|
|
@@ -5232,14 +5234,14 @@ function createDependencies(imports, exports, opts) {
|
|
|
5232
5234
|
if (external.endsWith("?")) {
|
|
5233
5235
|
const name = external.replace(/\?+$/, "");
|
|
5234
5236
|
const identifiers = getIdentifiers(root, name);
|
|
5235
|
-
const path = getModulePathOrDefault(root, name);
|
|
5237
|
+
const path = getModulePathOrDefault(root, origin, name);
|
|
5236
5238
|
for (const id of identifiers) {
|
|
5237
5239
|
asyncAssignments.push(`registerModule(${JSON.stringify(id)}, () => import(${JSON.stringify(path)}))`);
|
|
5238
5240
|
}
|
|
5239
5241
|
} else {
|
|
5240
5242
|
const name = external;
|
|
5241
5243
|
const identifiers = getIdentifiers(root, name);
|
|
5242
|
-
const path = getModulePathOrDefault(root, name);
|
|
5244
|
+
const path = getModulePathOrDefault(root, origin, name);
|
|
5243
5245
|
const ref = `_${imports.length}`;
|
|
5244
5246
|
imports.push(`import * as ${ref} from ${JSON.stringify(path)}`);
|
|
5245
5247
|
for (const id of identifiers) {
|
package/esm/tools/codegen.d.ts
CHANGED
package/esm/tools/codegen.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// this file is bundled, so the references here will not be at runtime (i.e., for a user)
|
|
2
2
|
import { getModulePath } from 'piral-cli/src/external/resolve';
|
|
3
3
|
import { readFileSync, existsSync } from 'fs';
|
|
4
|
-
import { resolve, dirname } from 'path';
|
|
4
|
+
import { resolve, relative, dirname } from 'path';
|
|
5
5
|
function findPackagePath(moduleDir) {
|
|
6
6
|
const packageJson = 'package.json';
|
|
7
7
|
const packagePath = resolve(moduleDir, packageJson);
|
|
@@ -51,16 +51,18 @@ function getIdentifiers(root, packageName) {
|
|
|
51
51
|
catch (_a) { }
|
|
52
52
|
return identifiers;
|
|
53
53
|
}
|
|
54
|
-
function getModulePathOrDefault(root, name) {
|
|
54
|
+
function getModulePathOrDefault(root, origin, name) {
|
|
55
55
|
try {
|
|
56
|
-
|
|
56
|
+
const absPath = getModulePath(root, name);
|
|
57
|
+
const path = relative(origin, absPath);
|
|
58
|
+
return path;
|
|
57
59
|
}
|
|
58
60
|
catch (_a) {
|
|
59
61
|
return name;
|
|
60
62
|
}
|
|
61
63
|
}
|
|
62
64
|
export function createDependencies(imports, exports, opts) {
|
|
63
|
-
const { root, appName, externals } = opts;
|
|
65
|
+
const { root, appName, externals, origin } = opts;
|
|
64
66
|
const assignments = [];
|
|
65
67
|
const asyncAssignments = [];
|
|
66
68
|
if (appName) {
|
|
@@ -70,7 +72,7 @@ export function createDependencies(imports, exports, opts) {
|
|
|
70
72
|
if (external.endsWith('?')) {
|
|
71
73
|
const name = external.replace(/\?+$/, '');
|
|
72
74
|
const identifiers = getIdentifiers(root, name);
|
|
73
|
-
const path = getModulePathOrDefault(root, name);
|
|
75
|
+
const path = getModulePathOrDefault(root, origin, name);
|
|
74
76
|
for (const id of identifiers) {
|
|
75
77
|
asyncAssignments.push(`registerModule(${JSON.stringify(id)}, () => import(${JSON.stringify(path)}))`);
|
|
76
78
|
}
|
|
@@ -78,7 +80,7 @@ export function createDependencies(imports, exports, opts) {
|
|
|
78
80
|
else {
|
|
79
81
|
const name = external;
|
|
80
82
|
const identifiers = getIdentifiers(root, name);
|
|
81
|
-
const path = getModulePathOrDefault(root, name);
|
|
83
|
+
const path = getModulePathOrDefault(root, origin, name);
|
|
82
84
|
const ref = `_${imports.length}`;
|
|
83
85
|
imports.push(`import * as ${ref} from ${JSON.stringify(path)}`);
|
|
84
86
|
for (const id of identifiers) {
|
package/esm/tools/codegen.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../src/tools/codegen.ts"],"names":[],"mappings":"AAAA,yFAAyF;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../src/tools/codegen.ts"],"names":[],"mappings":"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"}
|
package/lib/tools/codegen.d.ts
CHANGED
package/lib/tools/codegen.js
CHANGED
|
@@ -54,16 +54,18 @@ function getIdentifiers(root, packageName) {
|
|
|
54
54
|
catch (_a) { }
|
|
55
55
|
return identifiers;
|
|
56
56
|
}
|
|
57
|
-
function getModulePathOrDefault(root, name) {
|
|
57
|
+
function getModulePathOrDefault(root, origin, name) {
|
|
58
58
|
try {
|
|
59
|
-
|
|
59
|
+
const absPath = (0, resolve_1.getModulePath)(root, name);
|
|
60
|
+
const path = (0, path_1.relative)(origin, absPath);
|
|
61
|
+
return path;
|
|
60
62
|
}
|
|
61
63
|
catch (_a) {
|
|
62
64
|
return name;
|
|
63
65
|
}
|
|
64
66
|
}
|
|
65
67
|
function createDependencies(imports, exports, opts) {
|
|
66
|
-
const { root, appName, externals } = opts;
|
|
68
|
+
const { root, appName, externals, origin } = opts;
|
|
67
69
|
const assignments = [];
|
|
68
70
|
const asyncAssignments = [];
|
|
69
71
|
if (appName) {
|
|
@@ -73,7 +75,7 @@ function createDependencies(imports, exports, opts) {
|
|
|
73
75
|
if (external.endsWith('?')) {
|
|
74
76
|
const name = external.replace(/\?+$/, '');
|
|
75
77
|
const identifiers = getIdentifiers(root, name);
|
|
76
|
-
const path = getModulePathOrDefault(root, name);
|
|
78
|
+
const path = getModulePathOrDefault(root, origin, name);
|
|
77
79
|
for (const id of identifiers) {
|
|
78
80
|
asyncAssignments.push(`registerModule(${JSON.stringify(id)}, () => import(${JSON.stringify(path)}))`);
|
|
79
81
|
}
|
|
@@ -81,7 +83,7 @@ function createDependencies(imports, exports, opts) {
|
|
|
81
83
|
else {
|
|
82
84
|
const name = external;
|
|
83
85
|
const identifiers = getIdentifiers(root, name);
|
|
84
|
-
const path = getModulePathOrDefault(root, name);
|
|
86
|
+
const path = getModulePathOrDefault(root, origin, name);
|
|
85
87
|
const ref = `_${imports.length}`;
|
|
86
88
|
imports.push(`import * as ${ref} from ${JSON.stringify(path)}`);
|
|
87
89
|
for (const id of identifiers) {
|
package/lib/tools/codegen.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../src/tools/codegen.ts"],"names":[],"mappings":";;;AAAA,yFAAyF;AACzF,4DAA+D;AAC/D,2BAA8C;AAC9C,+
|
|
1
|
+
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../src/tools/codegen.ts"],"names":[],"mappings":";;;AAAA,yFAAyF;AACzF,4DAA+D;AAC/D,2BAA8C;AAC9C,+BAAkD;AAElD,SAAS,eAAe,CAAC,SAAiB;IACxC,MAAM,WAAW,GAAG,cAAc,CAAC;IACnC,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAEpD,IAAI,IAAA,eAAU,EAAC,WAAW,CAAC,EAAE;QAC3B,OAAO,WAAW,CAAC;KACpB;IAED,MAAM,MAAM,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAExC,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;KAChC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,WAAmB;IACvD,MAAM,SAAS,GAAG,IAAA,cAAO,EAAC,IAAA,uBAAa,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IAE5D,IAAI;QACF,MAAM,WAAW,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;KAClC;IAAC,WAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,MAAM,MAAM,GAAG,cAAc,CAAC;IAE9B,IAAI;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACjD,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,OAAO,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;KAC5B;IAAC,WAAM;QACN,OAAO,CAAC,IAAI,CAAC,oCAAoC,MAAM,uBAAuB,CAAC,CAAC;QAChF,OAAO,CAAC,CAAC;KACV;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,WAAmB;IACvD,MAAM,WAAW,GAAG,CAAC,WAAW,CAAC,CAAC;IAElC,IAAI;QACF,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAElD,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YAEtD,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE;gBAChD,WAAW,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;aACxD;SACF;KACF;IAAC,WAAM,GAAE;IAEV,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAY,EAAE,MAAc,EAAE,IAAY;IACxE,IAAI;QACF,MAAM,OAAO,GAAG,IAAA,uBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;KACb;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAoBD,SAAgB,kBAAkB,CAAC,OAAsB,EAAE,OAAsB,EAAE,IAAoB;IACrG,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAClD,MAAM,WAAW,GAAkB,EAAE,CAAC;IACtC,MAAM,gBAAgB,GAAkB,EAAE,CAAC;IAE3C,IAAI,OAAO,EAAE;QACX,WAAW,CAAC,IAAI,CAAC,SAAS,OAAO,OAAO,CAAC,CAAC;KAC3C;IAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC1B,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC1C,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAExD,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE;gBAC5B,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACvG;SACF;aAAM;YACL,MAAM,IAAI,GAAG,QAAQ,CAAC;YACtB,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACxD,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,eAAe,GAAG,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAEhE,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE;gBAC5B,WAAW,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;aACxD;SACF;KACF;IAED,IAAI,gBAAgB,CAAC,MAAM,EAAE;QAC3B,OAAO,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;QAC5D,WAAW,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;KAEvC;IAED,OAAO,CAAC,IAAI,CAAC;;QAEP,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC;;GAE1B,CAAC,CAAC;AACL,CAAC;AA1CD,gDA0CC;AAED,SAAgB,kBAAkB,CAAC,OAAsB,EAAE,OAAsB,EAAE,IAAoB;IACrG,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IACvC,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAE7C,OAAO,CAAC,IAAI,CACV,gDAAgD,GAAG,8BAA8B,EACjF,uDAAuD,GAAG,qCAAqC,EAC/F,6CAA6C,GAAG,2BAA2B,CAC5E,CAAC;IAEF,IAAI,aAAa,GAAG,CAAC,EAAE;QACrB,OAAO,CAAC,IAAI,CACV,6CAA6C,GAAG,8BAA8B,EAC9E,kDAAkD,GAAG,mCAAmC,EACxF,wGAAwG,GAAG,yBAAyB,CACrI,CAAC;KACH;SAAM;QACL,OAAO,CAAC,IAAI,CACV,6CAA6C,GAAG,8BAA8B,EAC9E,kDAAkD,GAAG,mCAAmC,EACxF,wGAAwG,GAAG,yBAAyB,CACrI,CAAC;KACH;IAED,OAAO,CAAC,IAAI,CAAC;;GAEZ,CAAC,CAAC;IAEH,OAAO,CAAC,IAAI,CAAC;gCACiB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;GACvD,CAAC,CAAC;IAEH,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BZ,CAAC,CAAC;AACL,CAAC;AA3DD,gDA2DC;AAED,SAAgB,kBAAkB,CAAC,OAAsB,EAAE,OAAsB,EAAE,IAAoB;IACrG,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAEtC,oEAAoE;IACpE,IAAI,KAAK,EAAE;QACT,MAAM,YAAY,GAAG,yDAAyD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC;QACnH,OAAO,CAAC,IAAI,CAAC,qEAAqE,GAAG,kBAAkB,CAAC,CAAC;QACzG,OAAO,CAAC,IAAI,CAAC,uEAAuE,YAAY,KAAK,CAAC,CAAC;KACxG;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;KACxD;IAED,gEAAgE;IAChE,IAAI,QAAQ,EAAE;QACZ,OAAO,CAAC,IAAI,CAAC,iDAAiD,GAAG,kBAAkB,CAAC,CAAC;QACrF,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;KAC9C;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;KACxD;AACH,CAAC;AAnBD,gDAmBC;AAED,SAAgB,kBAAkB,CAAC,OAAsB,EAAE,OAAsB,EAAE,IAAoB;IACrG,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAC/B,MAAM,WAAW,GAAG,EAAE,CAAC;IAEvB,OAAO,CAAC,IAAI,CAAC,qDAAqD,GAAG,sBAAsB,CAAC,CAAC;IAE7F,WAAW,CAAC,IAAI,CAAC;;GAEhB,CAAC,CAAC;IAEH,IAAI,QAAQ,EAAE;QACZ,OAAO,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;QACzE,WAAW,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;KACxD;SAAM;QACL,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;KACnC;IAED,OAAO,CAAC,IAAI,CAAC;;QAEP,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;;GAE3B,CAAC,CAAC;AACL,CAAC;AAtBD,gDAsBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-core",
|
|
3
|
-
"version": "1.1.0-beta.
|
|
3
|
+
"version": "1.1.0-beta.5779",
|
|
4
4
|
"description": "The core library for creating a Piral instance.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -72,8 +72,8 @@
|
|
|
72
72
|
"test": "echo \"Error: run tests from root\" && exit 1"
|
|
73
73
|
},
|
|
74
74
|
"dependencies": {
|
|
75
|
-
"piral-base": "1.1.0-beta.
|
|
76
|
-
"piral-debug-utils": "1.1.0-beta.
|
|
75
|
+
"piral-base": "1.1.0-beta.5779",
|
|
76
|
+
"piral-debug-utils": "1.1.0-beta.5779",
|
|
77
77
|
"zustand": "^3.0.0"
|
|
78
78
|
},
|
|
79
79
|
"devDependencies": {
|
|
@@ -93,5 +93,5 @@
|
|
|
93
93
|
"react-router-dom",
|
|
94
94
|
"tslib"
|
|
95
95
|
],
|
|
96
|
-
"gitHead": "
|
|
96
|
+
"gitHead": "3019e5e429ad73ac96149aa5ee2c9b1d70b3f93a"
|
|
97
97
|
}
|
package/src/tools/codegen.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// this file is bundled, so the references here will not be at runtime (i.e., for a user)
|
|
2
2
|
import { getModulePath } from 'piral-cli/src/external/resolve';
|
|
3
3
|
import { readFileSync, existsSync } from 'fs';
|
|
4
|
-
import { resolve, dirname } from 'path';
|
|
4
|
+
import { resolve, relative, dirname } from 'path';
|
|
5
5
|
|
|
6
6
|
function findPackagePath(moduleDir: string) {
|
|
7
7
|
const packageJson = 'package.json';
|
|
@@ -63,9 +63,11 @@ function getIdentifiers(root: string, packageName: string) {
|
|
|
63
63
|
return identifiers;
|
|
64
64
|
}
|
|
65
65
|
|
|
66
|
-
function getModulePathOrDefault(root: string, name: string) {
|
|
66
|
+
function getModulePathOrDefault(root: string, origin: string, name: string) {
|
|
67
67
|
try {
|
|
68
|
-
|
|
68
|
+
const absPath = getModulePath(root, name);
|
|
69
|
+
const path = relative(origin, absPath);
|
|
70
|
+
return path;
|
|
69
71
|
} catch {
|
|
70
72
|
return name;
|
|
71
73
|
}
|
|
@@ -73,6 +75,7 @@ function getModulePathOrDefault(root: string, name: string) {
|
|
|
73
75
|
|
|
74
76
|
interface CodegenOptions {
|
|
75
77
|
root: string;
|
|
78
|
+
origin: string;
|
|
76
79
|
cat: string;
|
|
77
80
|
appName: string;
|
|
78
81
|
externals: Array<string>;
|
|
@@ -89,7 +92,7 @@ interface CodegenOptions {
|
|
|
89
92
|
}
|
|
90
93
|
|
|
91
94
|
export function createDependencies(imports: Array<string>, exports: Array<string>, opts: CodegenOptions) {
|
|
92
|
-
const { root, appName, externals } = opts;
|
|
95
|
+
const { root, appName, externals, origin } = opts;
|
|
93
96
|
const assignments: Array<string> = [];
|
|
94
97
|
const asyncAssignments: Array<string> = [];
|
|
95
98
|
|
|
@@ -101,7 +104,7 @@ export function createDependencies(imports: Array<string>, exports: Array<string
|
|
|
101
104
|
if (external.endsWith('?')) {
|
|
102
105
|
const name = external.replace(/\?+$/, '');
|
|
103
106
|
const identifiers = getIdentifiers(root, name);
|
|
104
|
-
const path = getModulePathOrDefault(root, name);
|
|
107
|
+
const path = getModulePathOrDefault(root, origin, name);
|
|
105
108
|
|
|
106
109
|
for (const id of identifiers) {
|
|
107
110
|
asyncAssignments.push(`registerModule(${JSON.stringify(id)}, () => import(${JSON.stringify(path)}))`);
|
|
@@ -109,7 +112,7 @@ export function createDependencies(imports: Array<string>, exports: Array<string
|
|
|
109
112
|
} else {
|
|
110
113
|
const name = external;
|
|
111
114
|
const identifiers = getIdentifiers(root, name);
|
|
112
|
-
const path = getModulePathOrDefault(root, name);
|
|
115
|
+
const path = getModulePathOrDefault(root, origin, name);
|
|
113
116
|
const ref = `_${imports.length}`;
|
|
114
117
|
imports.push(`import * as ${ref} from ${JSON.stringify(path)}`);
|
|
115
118
|
|