@ms-cloudpack/cli 0.26.6 → 0.27.0
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/lib/commands/bundle/bundle.js +19 -18
- package/lib/commands/bundle/bundle.js.map +1 -1
- package/lib/commands/init/evaluateImportsForOverrides.d.ts +1 -3
- package/lib/commands/init/evaluateImportsForOverrides.js +4 -4
- package/lib/commands/init/evaluateImportsForOverrides.js.map +1 -1
- package/lib/commands/init/findImports.js +3 -3
- package/lib/commands/init/findImports.js.map +1 -1
- package/lib/commands/init/findImports.test.d.ts +1 -0
- package/lib/commands/init/findImports.test.js +35 -0
- package/lib/commands/init/findImports.test.js.map +1 -0
- package/lib/commands/init/getImportsFromBundle.d.ts +1 -3
- package/lib/commands/init/getImportsFromBundle.js +32 -23
- package/lib/commands/init/getImportsFromBundle.js.map +1 -1
- package/lib/commands/init/index.js +20 -1
- package/lib/commands/init/index.js.map +1 -1
- package/lib/commands/init/init.d.ts +3 -1
- package/lib/commands/init/init.js +18 -14
- package/lib/commands/init/init.js.map +1 -1
- package/lib/commands/init/init.test.js +7 -2
- package/lib/commands/init/init.test.js.map +1 -1
- package/lib/commands/init/patchAllInternalPackageExports.d.ts +0 -2
- package/lib/commands/init/patchAllInternalPackageExports.js +4 -4
- package/lib/commands/init/patchAllInternalPackageExports.js.map +1 -1
- package/lib/commands/init/patchPackageExports.d.ts +0 -2
- package/lib/commands/init/patchPackageExports.js.map +1 -1
- package/lib/commands/start/addOverride.js +2 -6
- package/lib/commands/start/addOverride.js.map +1 -1
- package/lib/commands/start/addOverride.test.js +5 -1
- package/lib/commands/start/addOverride.test.js.map +1 -1
- package/lib/commands/start/appServer/startAppServer.js +6 -1
- package/lib/commands/start/appServer/startAppServer.js.map +1 -1
- package/lib/commands/start/createBundleTask.d.ts +4 -0
- package/lib/commands/start/createBundleTask.js +7 -48
- package/lib/commands/start/createBundleTask.js.map +1 -1
- package/lib/commands/start/createSession.js +9 -6
- package/lib/commands/start/createSession.js.map +1 -1
- package/lib/commands/start/createSession.test.js +5 -1
- package/lib/commands/start/createSession.test.js.map +1 -1
- package/lib/commands/start/start.js +70 -58
- package/lib/commands/start/start.js.map +1 -1
- package/lib/commands/start/startBundleServer.js +10 -17
- package/lib/commands/start/startBundleServer.js.map +1 -1
- package/lib/commands/start/startWatcher.js +5 -12
- package/lib/commands/start/startWatcher.js.map +1 -1
- package/lib/getVersion.js +1 -1
- package/lib/index.js +19 -1
- package/lib/index.js.map +1 -1
- package/lib/reporter.d.ts +4 -0
- package/lib/reporter.js +7 -0
- package/lib/reporter.js.map +1 -0
- package/lib/tasks/bundleTask.d.ts +5 -0
- package/lib/tasks/bundleTask.js +80 -0
- package/lib/tasks/bundleTask.js.map +1 -0
- package/lib/tasks/formatBundleErrors.d.ts +8 -0
- package/lib/tasks/formatBundleErrors.js +19 -0
- package/lib/tasks/formatBundleErrors.js.map +1 -0
- package/lib/tasks/resolveDependenciesTask.d.ts +10 -0
- package/lib/tasks/resolveDependenciesTask.js +57 -0
- package/lib/tasks/resolveDependenciesTask.js.map +1 -0
- package/lib/types.d.ts +4 -1
- package/package.json +4 -3
- package/lib/commands/init/createLog.d.ts +0 -11
- package/lib/commands/init/createLog.js +0 -25
- package/lib/commands/init/createLog.js.map +0 -1
|
@@ -1,26 +1,27 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { bundleTask } from '../../tasks/bundleTask.js';
|
|
2
2
|
import path from 'path';
|
|
3
|
+
import { PackageDefinitions } from '@ms-cloudpack/package-utilities';
|
|
4
|
+
import { reporter } from '../../reporter.js';
|
|
3
5
|
export async function bundle(options) {
|
|
4
6
|
const { bundler: bundlerType, outdir = 'dist' } = options || {};
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
|
|
7
|
+
const packagePath = process.cwd();
|
|
8
|
+
const definition = await PackageDefinitions.getInstance().get(packagePath);
|
|
9
|
+
const { name = 'unknown', version = '0.0.0' } = definition || {};
|
|
10
|
+
const outputPath = path.resolve(packagePath, outdir);
|
|
11
|
+
const bundleRequest = {
|
|
12
|
+
id: 'bundle',
|
|
13
|
+
packageName: name,
|
|
14
|
+
version,
|
|
15
|
+
packagePath,
|
|
9
16
|
outputPath,
|
|
17
|
+
isExternal: true,
|
|
10
18
|
bundlerType,
|
|
19
|
+
};
|
|
20
|
+
await bundleTask({
|
|
21
|
+
bundleRequest,
|
|
22
|
+
options: { force: true },
|
|
11
23
|
});
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
}
|
|
15
|
-
if (result.errors?.length) {
|
|
16
|
-
console.error(`${result.errors.length} errors while bundling "${inputPath}":`);
|
|
17
|
-
console.error(result.errors);
|
|
18
|
-
throw new Error(`Failed to bundle "${inputPath}" with ${result.errors.length} errors`);
|
|
19
|
-
}
|
|
20
|
-
if (result.warnings?.length) {
|
|
21
|
-
console.warn(`${result.warnings.length} warnings while bundling "${inputPath}":`);
|
|
22
|
-
console.warn(result.warnings);
|
|
23
|
-
}
|
|
24
|
-
console.log(`Bundled "${inputPath}" to "${outputPath}"`);
|
|
24
|
+
reporter.complete();
|
|
25
|
+
process.exit(bundleRequest.result?.errors?.length === 0 ? 0 : 1);
|
|
25
26
|
}
|
|
26
27
|
//# sourceMappingURL=bundle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAAuB;IAClD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAChE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC3E,MAAM,EAAE,IAAI,GAAG,SAAS,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,QAAQ;QACZ,WAAW,EAAE,IAAI;QACjB,OAAO;QACP,WAAW;QACX,UAAU;QACV,UAAU,EAAE,IAAI;QAChB,WAAW;KACZ,CAAC;IAEF,MAAM,UAAU,CAAC;QACf,aAAa;QACb,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;KACzB,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACpB,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC"}
|
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
import type { PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
|
|
2
2
|
import type { ResolveMap } from '@ms-cloudpack/package-utilities';
|
|
3
3
|
import type { PackageOverride } from '../../types.js';
|
|
4
|
-
import type { Log } from './createLog.js';
|
|
5
4
|
/**
|
|
6
5
|
* Evaluate the imports depended on by a package to determine if missing exports map paths need to be added.
|
|
7
6
|
* If so, updates package overrides to the given packageOverrides array.
|
|
8
7
|
*/
|
|
9
8
|
export declare function evaluateImportsForOverrides(options: {
|
|
10
|
-
log: Log;
|
|
11
9
|
packages: PackageDefinitionsCache;
|
|
12
10
|
packagePath: string;
|
|
13
|
-
imports:
|
|
11
|
+
imports: Map<string, Set<string>>;
|
|
14
12
|
definition: PackageJson;
|
|
15
13
|
packageOverrides: PackageOverride[];
|
|
16
14
|
packagePathsToEvaluate: Set<string>;
|
|
@@ -5,20 +5,20 @@ import { preparePackageOverride } from './preparePackageOverride.js';
|
|
|
5
5
|
* If so, updates package overrides to the given packageOverrides array.
|
|
6
6
|
*/
|
|
7
7
|
export async function evaluateImportsForOverrides(options) {
|
|
8
|
-
const {
|
|
8
|
+
const { packages, imports, definition, packageOverrides, packagePathsToEvaluate, evaluatedPackages, resolveMap } = options;
|
|
9
9
|
const displayName = `${definition.name}@${definition.version}`;
|
|
10
10
|
let changeCount = 0;
|
|
11
11
|
// Iterate through imports and find their path from the resolve map.
|
|
12
|
-
for (const [dependencyName, dependencyImportPaths] of
|
|
12
|
+
for (const [dependencyName, dependencyImportPaths] of imports.entries()) {
|
|
13
13
|
const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });
|
|
14
14
|
if (!resolveEntry) {
|
|
15
|
-
|
|
15
|
+
console.error(`Package "${displayName}" depends on "${dependencyName}" but it was not found in the resolve map.`);
|
|
16
16
|
continue;
|
|
17
17
|
}
|
|
18
18
|
// Load the dependency definition.
|
|
19
19
|
const dependencyDefinition = await packages.get(resolveEntry.path);
|
|
20
20
|
if (!dependencyDefinition) {
|
|
21
|
-
|
|
21
|
+
console.error(`Package "${displayName}" depends on "${dependencyName}" at "${resolveEntry.path}" but its definition couldn't be loaded.`, undefined);
|
|
22
22
|
continue;
|
|
23
23
|
}
|
|
24
24
|
// Make sure to add the package to the list of packages to evaluate.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluateImportsForOverrides.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"evaluateImportsForOverrides.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAKrE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,OASjD;IACC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAC9G,OAAO,CAAC;IACV,MAAM,WAAW,GAAG,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;IAC/D,IAAI,WAAW,GAAG,CAAC,CAAC;IAEpB,oEAAoE;IACpE,KAAK,MAAM,CAAC,cAAc,EAAE,qBAAqB,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE;QACvE,MAAM,YAAY,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC;QAElG,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO,CAAC,KAAK,CAAC,YAAY,WAAW,iBAAiB,cAAc,4CAA4C,CAAC,CAAC;YAClH,SAAS;SACV;QAED,kCAAkC;QAClC,MAAM,oBAAoB,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnE,IAAI,CAAC,oBAAoB,EAAE;YACzB,OAAO,CAAC,KAAK,CACX,YAAY,WAAW,iBAAiB,cAAc,SAAS,YAAY,CAAC,IAAI,0CAA0C,EAC1H,SAAS,CACV,CAAC;YACF,SAAS;SACV;QAED,oEAAoE;QACpE,sBAAsB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE9C,mIAAmI;QACnI,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrE,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAEpD,KAAK,MAAM,oBAAoB,IAAI,qBAAqB,EAAE;YACxD,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,EAAE;gBAC3C,sBAAsB,CAAC;oBACrB,gBAAgB;oBAChB,UAAU;oBACV,oBAAoB;oBACpB,OAAO;oBACP,UAAU,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC;iBAClD,CAAC,CAAC;gBAEH,MAAM,kBAAkB,CAAC;oBACvB,OAAO;oBACP,QAAQ;oBACR,WAAW,EAAE,YAAY,CAAC,IAAI;oBAC9B,UAAU,EAAE,oBAAoB;iBACjC,CAAC,CAAC;gBAEH,yEAAyE;gBACzE,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAEjB,WAAW,EAAE,CAAC;gBAEd,4FAA4F;gBAC5F,sBAAsB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBAC9C,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;aAC7C;SACF;KACF;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}
|
|
@@ -34,15 +34,15 @@ export async function findImports(filePaths) {
|
|
|
34
34
|
// is undefined. This is a bug in es-module-lexer. We may need to handle this
|
|
35
35
|
// at the javascript layer and expand it into multiple potential imports.
|
|
36
36
|
if (!i.n) {
|
|
37
|
-
console.
|
|
37
|
+
console.debug(`Found an import that didn't parse correctly:\nFilename:\n${filePath}\n\nImport:\n${source.slice(i.s, i.e)}`);
|
|
38
38
|
return undefined;
|
|
39
39
|
}
|
|
40
40
|
return parseImportString(i.n);
|
|
41
41
|
})
|
|
42
42
|
.filter(Boolean);
|
|
43
43
|
for (const entry of imports) {
|
|
44
|
-
if (entry.packageName
|
|
45
|
-
const localPath = path.resolve(path.dirname(filePath), entry.importPath || '');
|
|
44
|
+
if (entry.packageName?.startsWith('.')) {
|
|
45
|
+
const localPath = path.resolve(path.dirname(filePath), entry.packageName, entry.importPath || '');
|
|
46
46
|
if (!visitedPaths.has(localPath)) {
|
|
47
47
|
visitedPaths.add(localPath);
|
|
48
48
|
pathsToParse.push(localPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findImports.js","sourceRoot":"","sources":["../../../src/commands/init/findImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAA2B,MAAM,mCAAmC,CAAC;AAE/F,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAEjC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,SAAmB;;IACnD,MAAM,eAAe,GAAgC,EAAE,CAAC;IACxD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,YAAY,GAAa,CAAC,GAAG,SAAS,CAAC,CAAC;IAE9C,OAAO,YAAY,CAAC,MAAM,EAAE;QAC1B,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;QAEtC,IAAI,QAAQ,EAAE;YACZ,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACjD,MAAM,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;YACnC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;iBAC5C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,uFAAuF;gBACvF,sEAAsE;gBACtE,EAAE;gBACF,yDAAyD;gBACzD,EAAE;gBACF,0DAA0D;gBAC1D,4EAA4E;gBAC5E,0EAA0E;gBAC1E,2EAA2E;gBAC3E,gEAAgE;gBAChE,EAAE;gBACF,0EAA0E;gBAC1E,6EAA6E;gBAC7E,yEAAyE;gBACzE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;oBACR,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"findImports.js","sourceRoot":"","sources":["../../../src/commands/init/findImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAA2B,MAAM,mCAAmC,CAAC;AAE/F,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAEjC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,SAAmB;;IACnD,MAAM,eAAe,GAAgC,EAAE,CAAC;IACxD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,YAAY,GAAa,CAAC,GAAG,SAAS,CAAC,CAAC;IAE9C,OAAO,YAAY,CAAC,MAAM,EAAE;QAC1B,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;QAEtC,IAAI,QAAQ,EAAE;YACZ,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACjD,MAAM,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;YACnC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;iBAC5C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,uFAAuF;gBACvF,sEAAsE;gBACtE,EAAE;gBACF,yDAAyD;gBACzD,EAAE;gBACF,0DAA0D;gBAC1D,4EAA4E;gBAC5E,0EAA0E;gBAC1E,2EAA2E;gBAC3E,gEAAgE;gBAChE,EAAE;gBACF,0EAA0E;gBAC1E,6EAA6E;gBAC7E,yEAAyE;gBACzE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;oBACR,OAAO,CAAC,KAAK,CACX,4DAA4D,QAAQ,gBAAgB,MAAM,CAAC,KAAK,CAC9F,CAAC,CAAC,CAAC,EACH,CAAC,CAAC,CAAC,CACJ,EAAE,CACJ,CAAC;oBACF,OAAO,SAAS,CAAC;iBAClB;gBAED,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChC,CAAC,CAAC;iBACD,MAAM,CAAC,OAAO,CAAyB,CAAC;YAE3C,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;gBAC3B,IAAI,KAAK,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE;oBACtC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;oBAElG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;wBAChC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;wBAC5B,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;qBAC9B;iBACF;qBAAM,IAAI,KAAK,CAAC,WAAW,EAAE;oBAC5B,eAAe,MAAC,KAAK,CAAC,WAAW,MAAjC,eAAe,OAAwB,IAAI,GAAG,EAAE,EAAC;oBACjD,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC;iBACjE;aACF;SACF;KACF;IAED,OAAO,eAAe,CAAC;AACzB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { findImports } from './findImports.js';
|
|
2
|
+
import { describe, it, expect } from '@jest/globals';
|
|
3
|
+
import { createTestFileStructure } from '@ms-cloudpack/test-utilities';
|
|
4
|
+
import path from 'path';
|
|
5
|
+
describe('findImports', () => {
|
|
6
|
+
it('can find the imports in a bundle', async () => {
|
|
7
|
+
const testFiles = {
|
|
8
|
+
'./lib/entry1.js': 'import { foo } from "./foo.js";',
|
|
9
|
+
'./lib/foo.js': 'export { a, b, c, foo } from "react/lib/foo";',
|
|
10
|
+
'./lib/entry2.js': 'import react from "react";',
|
|
11
|
+
};
|
|
12
|
+
const testPath = await createTestFileStructure(testFiles);
|
|
13
|
+
const filePaths = Object.keys(testFiles).map((filePath) => path.join(testPath, filePath));
|
|
14
|
+
const result = await findImports(filePaths);
|
|
15
|
+
console.log(result);
|
|
16
|
+
expect(result).toEqual({
|
|
17
|
+
react: new Set(['./lib/foo', '.']),
|
|
18
|
+
});
|
|
19
|
+
});
|
|
20
|
+
it('can walk to files up a level', async () => {
|
|
21
|
+
const testFiles = {
|
|
22
|
+
'./lib/entry1.js': 'import { foo } from "../chunk/foo.js";',
|
|
23
|
+
'./chunk/foo.js': 'export { a, b, c, foo } from "react/lib/foo";',
|
|
24
|
+
'./lib/entry2.js': 'import react from "react";',
|
|
25
|
+
};
|
|
26
|
+
const testPath = await createTestFileStructure(testFiles);
|
|
27
|
+
const filePaths = Object.keys(testFiles).map((filePath) => path.join(testPath, filePath));
|
|
28
|
+
const result = await findImports(filePaths);
|
|
29
|
+
console.log(result);
|
|
30
|
+
expect(result).toEqual({
|
|
31
|
+
react: new Set(['./lib/foo', '.']),
|
|
32
|
+
});
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
//# sourceMappingURL=findImports.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"findImports.test.js","sourceRoot":"","sources":["../../../src/commands/init/findImports.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,SAAS,GAAG;YAChB,iBAAiB,EAAE,iCAAiC;YACpD,cAAc,EAAE,+CAA+C;YAC/D,iBAAiB,EAAE,4BAA4B;SAChD,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1F,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,CAAC;QAC5C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,KAAK,EAAE,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;SACnC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,SAAS,GAAG;YAChB,iBAAiB,EAAE,wCAAwC;YAC3D,gBAAgB,EAAE,+CAA+C;YACjE,iBAAiB,EAAE,4BAA4B;SAChD,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1F,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,CAAC;QAC5C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,KAAK,EAAE,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;SACnC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import type { PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
|
|
2
|
-
import type { Log } from './createLog.js';
|
|
3
2
|
/**
|
|
4
3
|
* Bundle the package and return the imports it depends on.
|
|
5
4
|
*/
|
|
6
5
|
export declare function getImportsFromBundle(options: {
|
|
7
|
-
log: Log;
|
|
8
6
|
packages: PackageDefinitionsCache;
|
|
9
7
|
packagePath: string;
|
|
10
8
|
definition: PackageJson;
|
|
11
|
-
}): Promise<
|
|
9
|
+
}): Promise<Map<string, Set<string>> | undefined>;
|
|
@@ -1,17 +1,19 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
|
-
import {
|
|
2
|
+
import { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';
|
|
3
3
|
import { getBundleDetails } from '../../common/getBundleDetails.js';
|
|
4
4
|
import { findImports } from './findImports.js';
|
|
5
5
|
import { prepareOutputPath } from '../../common/prepareOutputPath.js';
|
|
6
|
+
import { reporter } from '../../reporter.js';
|
|
7
|
+
import { bundleTask } from '../../tasks/bundleTask.js';
|
|
8
|
+
import { bulletedList, formatPackageName } from '@ms-cloudpack/task-reporter';
|
|
6
9
|
/**
|
|
7
10
|
* Bundle the package and return the imports it depends on.
|
|
8
11
|
*/
|
|
9
12
|
export async function getImportsFromBundle(options) {
|
|
10
|
-
const {
|
|
11
|
-
const displayName = `${definition.name}@${definition.version}`;
|
|
13
|
+
const { packagePath, definition, packages } = options;
|
|
12
14
|
const { outputPath, isExternal } = await getBundleDetails(packagePath);
|
|
13
15
|
if (!isExternal && !definition.exports) {
|
|
14
|
-
|
|
16
|
+
console.warn(`Package ${path.join(packagePath, 'package.json')} does not have an "exports" field.`);
|
|
15
17
|
}
|
|
16
18
|
// Ensure outputPath exists and is empty.
|
|
17
19
|
await prepareOutputPath(outputPath);
|
|
@@ -20,29 +22,36 @@ export async function getImportsFromBundle(options) {
|
|
|
20
22
|
inputPath: packagePath,
|
|
21
23
|
packages,
|
|
22
24
|
});
|
|
23
|
-
if (Object.keys(entriesMap).length
|
|
24
|
-
|
|
25
|
+
if (!Object.keys(entriesMap).length) {
|
|
26
|
+
console.warn(`Package ${path.join(packagePath, 'package.json')} does not have any entries.`);
|
|
25
27
|
return;
|
|
26
28
|
}
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
|
|
29
|
+
const bundleRequest = {
|
|
30
|
+
id: packagePath,
|
|
31
|
+
packageName: definition.name || '',
|
|
32
|
+
version: definition.version || '',
|
|
33
|
+
packagePath,
|
|
30
34
|
outputPath,
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
return;
|
|
36
|
-
}
|
|
37
|
-
if (bundleResult?.warnings?.length) {
|
|
38
|
-
log.warn(`Package "${displayName}" had ${bundleResult.warnings.length} warnings.`);
|
|
39
|
-
}
|
|
40
|
-
if (!bundleResult?.outputFiles?.length) {
|
|
41
|
-
log.warn(`Package "${displayName}" had no output files "${outputPath}"`);
|
|
42
|
-
return;
|
|
43
|
-
}
|
|
35
|
+
isExternal,
|
|
36
|
+
packages,
|
|
37
|
+
};
|
|
38
|
+
await bundleTask({ bundleRequest, options: { force: true } });
|
|
44
39
|
// For each outputFile, find all imports.
|
|
45
|
-
|
|
40
|
+
let imports;
|
|
41
|
+
await reporter.runTask(`Evaluate ${formatPackageName(definition)}`, async () => {
|
|
42
|
+
imports = new Map(Object.entries((await findImports(bundleRequest.result?.outputFiles?.map((file) => path.resolve(outputPath, file.outputPath)) || [])) || {}));
|
|
43
|
+
const importCount = imports.size;
|
|
44
|
+
return {
|
|
45
|
+
status: 'complete',
|
|
46
|
+
message: importCount ? `Found ${importCount} imported package(s)` : undefined,
|
|
47
|
+
details: importCount ? `${bulletedList(getImportsList(imports))}` : undefined,
|
|
48
|
+
};
|
|
49
|
+
});
|
|
46
50
|
return imports;
|
|
47
51
|
}
|
|
52
|
+
function getImportsList(imports) {
|
|
53
|
+
return Array.from(imports.keys()).reduce((list, packageName) => {
|
|
54
|
+
return list.concat(Array.from(imports.get(packageName) || []).map((importPath) => `${packageName}${importPath === '.' ? '' : `/${importPath}`}`));
|
|
55
|
+
}, []);
|
|
56
|
+
}
|
|
48
57
|
//# sourceMappingURL=getImportsFromBundle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getImportsFromBundle.js","sourceRoot":"","sources":["../../../src/commands/init/getImportsFromBundle.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"getImportsFromBundle.js","sourceRoot":"","sources":["../../../src/commands/init/getImportsFromBundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { reporter } from '../../reporter.js';
|
|
2
|
+
import { red } from '@ms-cloudpack/task-reporter';
|
|
1
3
|
/* Defines the "init" verb. */
|
|
2
4
|
export function init(command) {
|
|
3
5
|
command
|
|
@@ -5,6 +7,23 @@ export function init(command) {
|
|
|
5
7
|
.description('Initializes a given app project and defines the necessary configuration overrides to make an existing app compatible with Cloudpack.')
|
|
6
8
|
.option('--fix', 'Applies fixes to all identified issues in internal packages.')
|
|
7
9
|
.option('--reset', 'Ignores existing overrides when determining all entries.')
|
|
8
|
-
.action(async (options) =>
|
|
10
|
+
.action(async (options) => {
|
|
11
|
+
const { init } = await import('./init.js');
|
|
12
|
+
try {
|
|
13
|
+
const { changeCount } = await init(options);
|
|
14
|
+
if (reporter.hasErrors()) {
|
|
15
|
+
reporter.complete(red(`Some tasks failed.`));
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
reporter.complete(changeCount
|
|
19
|
+
? 'Updated "cloudpack.config.json" with ${changeCount} change(s).'
|
|
20
|
+
: `Looks good, no changes required. :)`);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
catch (error) {
|
|
24
|
+
reporter.complete(`Unexpected error: ${error.message || '<Error>'}`);
|
|
25
|
+
}
|
|
26
|
+
process.exit(reporter.hasErrors() ? 1 : 0);
|
|
27
|
+
});
|
|
9
28
|
}
|
|
10
29
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/init/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/init/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAElD,8BAA8B;AAC9B,MAAM,UAAU,IAAI,CAAC,OAAgB;IACnC,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CACV,sIAAsI,CACvI;SACA,MAAM,CAAC,OAAO,EAAE,8DAA8D,CAAC;SAC/E,MAAM,CAAC,SAAS,EAAE,0DAA0D,CAAC;SAC7E,MAAM,CAAC,KAAK,EAAE,OAAoB,EAAE,EAAE;QACrC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QAE3C,IAAI;YACF,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;YAE5C,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE;gBACxB,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;aAC9C;iBAAM;gBACL,QAAQ,CAAC,QAAQ,CACf,WAAW;oBACT,CAAC,CAAC,gEAAgE;oBAClE,CAAC,CAAC,qCAAqC,CAC1C,CAAC;aACH;SACF;QAAC,OAAO,KAAK,EAAE;YACd,QAAQ,CAAC,QAAQ,CAAC,qBAAsB,KAAe,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC,CAAC;SACjF;QAED,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import type { InitOptions } from './types.js';
|
|
2
2
|
/** Given the path, updates the Cloudpack config with overrides and project settings. */
|
|
3
|
-
export declare function init(options: InitOptions): Promise<
|
|
3
|
+
export declare function init(options: InitOptions): Promise<{
|
|
4
|
+
changeCount: number;
|
|
5
|
+
}>;
|
|
@@ -1,25 +1,26 @@
|
|
|
1
|
+
import { readJson, writeJson } from '@ms-cloudpack/json-utilities';
|
|
2
|
+
import { PackageDefinitions } from '@ms-cloudpack/package-utilities';
|
|
1
3
|
import path from 'path';
|
|
2
|
-
import { createResolveMap, PackageDefinitions } from '@ms-cloudpack/package-utilities';
|
|
3
|
-
import { writeJson, readJson } from '@ms-cloudpack/json-utilities';
|
|
4
4
|
import { createPackageOverrideTransform } from '../../common/createPackageOverrideTransform.js';
|
|
5
|
-
import {
|
|
6
|
-
import { createLog } from './createLog.js';
|
|
5
|
+
import { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';
|
|
7
6
|
import { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';
|
|
7
|
+
import { getImportsFromBundle } from './getImportsFromBundle.js';
|
|
8
8
|
import { patchAllInternalPackageExports } from './patchAllInternalPackageExports.js';
|
|
9
9
|
/** Given the path, updates the Cloudpack config with overrides and project settings. */
|
|
10
10
|
export async function init(options) {
|
|
11
11
|
const appPath = options.cwd || process.cwd();
|
|
12
12
|
const config = (await readJson(path.join(appPath, 'cloudpack.config.json'))) || {};
|
|
13
13
|
const packageOverrides = (!options.reset && config.packageOverrides) || [];
|
|
14
|
-
const log = createLog();
|
|
15
14
|
const packages = new PackageDefinitions();
|
|
16
15
|
packages.registerTransform(createPackageOverrideTransform({ packageOverrides }));
|
|
17
16
|
// Try to resolve dependencies.
|
|
18
|
-
const resolveMap = await
|
|
17
|
+
const resolveMap = (await resolveDependenciesTask({ appPath, packages }));
|
|
18
|
+
if (!resolveMap) {
|
|
19
|
+
throw new Error("Couldn't resolve dependencies.");
|
|
20
|
+
}
|
|
19
21
|
const packagePathsToEvaluate = new Set([appPath]);
|
|
20
22
|
const evaluatedPackages = new Set();
|
|
21
23
|
let changeCount = 0;
|
|
22
|
-
let bundleCount = 0;
|
|
23
24
|
while (packagePathsToEvaluate.size) {
|
|
24
25
|
const packagePath = packagePathsToEvaluate.values().next().value;
|
|
25
26
|
packagePathsToEvaluate.delete(packagePath);
|
|
@@ -33,14 +34,17 @@ export async function init(options) {
|
|
|
33
34
|
continue;
|
|
34
35
|
}
|
|
35
36
|
// Bundle the package and find the imports it depends on.
|
|
36
|
-
const imports = await getImportsFromBundle({
|
|
37
|
+
const imports = await getImportsFromBundle({
|
|
38
|
+
packagePath,
|
|
39
|
+
definition,
|
|
40
|
+
packages,
|
|
41
|
+
});
|
|
37
42
|
if (!imports) {
|
|
38
|
-
|
|
43
|
+
console.info(`Skipping ${packagePath} evaluation due to no imports returned.`);
|
|
39
44
|
continue;
|
|
40
45
|
}
|
|
41
46
|
// Given the package imports, find the missing exports maps and update packageOverrides.
|
|
42
47
|
changeCount += await evaluateImportsForOverrides({
|
|
43
|
-
log,
|
|
44
48
|
definition,
|
|
45
49
|
packages,
|
|
46
50
|
packagePath,
|
|
@@ -50,11 +54,9 @@ export async function init(options) {
|
|
|
50
54
|
packageOverrides,
|
|
51
55
|
resolveMap,
|
|
52
56
|
});
|
|
53
|
-
bundleCount++;
|
|
54
57
|
}
|
|
55
|
-
log.info(`Bundled ${bundleCount} packages.`);
|
|
56
58
|
if (options.fix) {
|
|
57
|
-
await patchAllInternalPackageExports({
|
|
59
|
+
await patchAllInternalPackageExports({ resolveMap, packageOverrides });
|
|
58
60
|
}
|
|
59
61
|
if (changeCount) {
|
|
60
62
|
// Log the results to a file.
|
|
@@ -64,6 +66,8 @@ export async function init(options) {
|
|
|
64
66
|
...(packageOverrides.length ? { packageOverrides } : {}),
|
|
65
67
|
});
|
|
66
68
|
}
|
|
67
|
-
|
|
69
|
+
return {
|
|
70
|
+
changeCount,
|
|
71
|
+
};
|
|
68
72
|
}
|
|
69
73
|
//# sourceMappingURL=init.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,18 @@
|
|
|
1
|
-
import { afterEach, describe, it, expect } from '@jest/globals';
|
|
1
|
+
import { afterEach, describe, it, expect, beforeAll } from '@jest/globals';
|
|
2
2
|
import { init } from './init.js';
|
|
3
3
|
import fs from 'fs';
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import { isFile } from '@ms-cloudpack/path-utilities';
|
|
6
6
|
import { readJson } from '@ms-cloudpack/json-utilities';
|
|
7
7
|
import { createTestFileStructure } from '@ms-cloudpack/test-utilities';
|
|
8
|
+
import { noLoggingConfig } from '@ms-cloudpack/task-reporter';
|
|
9
|
+
import { reporter } from '../../reporter.js';
|
|
8
10
|
const { rm } = fs.promises;
|
|
9
11
|
describe('init', () => {
|
|
10
12
|
let testPath;
|
|
13
|
+
beforeAll(() => {
|
|
14
|
+
reporter.setOptions(noLoggingConfig);
|
|
15
|
+
});
|
|
11
16
|
afterEach(async () => {
|
|
12
17
|
if (testPath) {
|
|
13
18
|
await rm(testPath, { recursive: true });
|
|
@@ -54,7 +59,7 @@ describe('init', () => {
|
|
|
54
59
|
'node_modules/foo/lib/index.js': 'export default "index";',
|
|
55
60
|
'node_modules/foo/lib/bar.js': 'export default "foo";',
|
|
56
61
|
});
|
|
57
|
-
await init({ cwd: testPath });
|
|
62
|
+
expect(await init({ cwd: testPath })).toEqual({ changeCount: 1 });
|
|
58
63
|
const configPath = path.join(testPath, 'cloudpack.config.json');
|
|
59
64
|
expect(await isFile(configPath)).toBe(true);
|
|
60
65
|
expect(await readJson(configPath)).toMatchInlineSnapshot(`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.test.js","sourceRoot":"","sources":["../../../src/commands/init/init.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"init.test.js","sourceRoot":"","sources":["../../../src/commands/init/init.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import type { ResolveMap } from '@ms-cloudpack/package-utilities';
|
|
2
2
|
import type { PackageOverride } from '../../types.js';
|
|
3
|
-
import type { Log } from './createLog.js';
|
|
4
3
|
/**
|
|
5
4
|
* Update internal package.json definitions with required exports map entries. Used when the init "fix" option
|
|
6
5
|
* is provided.
|
|
7
6
|
*/
|
|
8
7
|
export declare function patchAllInternalPackageExports(options: {
|
|
9
|
-
log: Log;
|
|
10
8
|
resolveMap: ResolveMap;
|
|
11
9
|
packageOverrides: PackageOverride[];
|
|
12
10
|
}): Promise<void>;
|
|
@@ -4,13 +4,13 @@ import { patchPackageExports } from './patchPackageExports.js';
|
|
|
4
4
|
* is provided.
|
|
5
5
|
*/
|
|
6
6
|
export async function patchAllInternalPackageExports(options) {
|
|
7
|
-
const {
|
|
8
|
-
|
|
7
|
+
const { resolveMap, packageOverrides } = options;
|
|
8
|
+
console.info('Patching package exports...');
|
|
9
9
|
for (const mapEntry of Object.values(resolveMap)) {
|
|
10
|
-
await patchPackageExports({
|
|
10
|
+
await patchPackageExports({ mapEntry, packageOverrides });
|
|
11
11
|
if (mapEntry.scopedVersions) {
|
|
12
12
|
for (const scopedVersion of Object.values(mapEntry.scopedVersions)) {
|
|
13
|
-
await patchPackageExports({
|
|
13
|
+
await patchPackageExports({ mapEntry: scopedVersion, packageOverrides });
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patchAllInternalPackageExports.js","sourceRoot":"","sources":["../../../src/commands/init/patchAllInternalPackageExports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"patchAllInternalPackageExports.js","sourceRoot":"","sources":["../../../src/commands/init/patchAllInternalPackageExports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAI/D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,OAGpD;IACC,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAEjD,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAE5C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAChD,MAAM,mBAAmB,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAE1D,IAAI,QAAQ,CAAC,cAAc,EAAE;YAC3B,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;gBAClE,MAAM,mBAAmB,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC,CAAC;aAC1E;SACF;KACF;AACH,CAAC"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import type { ResolveMapEntry } from '@ms-cloudpack/package-utilities';
|
|
2
2
|
import type { PackageOverride } from '../../types.js';
|
|
3
|
-
import type { Log } from './createLog.js';
|
|
4
3
|
/**
|
|
5
4
|
* Update a single package.json definition with the required exports map entries.
|
|
6
5
|
*/
|
|
7
6
|
export declare function patchPackageExports(options: {
|
|
8
|
-
log: Log;
|
|
9
7
|
mapEntry: ResolveMapEntry;
|
|
10
8
|
packageOverrides: PackageOverride[];
|
|
11
9
|
}): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patchPackageExports.js","sourceRoot":"","sources":["../../../src/commands/init/patchPackageExports.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"patchPackageExports.js","sourceRoot":"","sources":["../../../src/commands/init/patchPackageExports.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAK1E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAA2E;IACnH,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAE/C,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACrC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEhE,2BAA2B;QAC3B,MAAM,UAAU,GAA4B,MAAM,QAAQ,CAAC,cAAc,CAAC,CAAC;QAE3E,IAAI,UAAU,EAAE;YACd,uBAAuB;YACvB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;YAExF,IAAI,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE;gBAChC,UAAU,CAAC,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC;gBAChD,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,UAAU,CAAC,CAAC;gBAEtE,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;aAChE;SACF;KACF;AACH,CAAC"}
|
|
@@ -6,10 +6,6 @@ import { createPackageOverrideTransform } from '../../common/createPackageOverri
|
|
|
6
6
|
import { addExportsMapEntry, findResolveMapEntry, getExportsMap, PackageDefinitions, } from '@ms-cloudpack/package-utilities';
|
|
7
7
|
import { slash } from '@ms-cloudpack/path-string-parsing';
|
|
8
8
|
import { parseRequestInfo } from './parseRequestInfo.js';
|
|
9
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
10
|
-
const log = (...messages) => {
|
|
11
|
-
// console.log(`Add Override:`, ...messages);
|
|
12
|
-
};
|
|
13
9
|
export async function addOverride({ session, packageName, importPath, filename, }) {
|
|
14
10
|
let definition = undefined;
|
|
15
11
|
if (filename) {
|
|
@@ -23,7 +19,7 @@ export async function addOverride({ session, packageName, importPath, filename,
|
|
|
23
19
|
definition,
|
|
24
20
|
});
|
|
25
21
|
if (entry === undefined) {
|
|
26
|
-
|
|
22
|
+
console.error(`Could not find entry of package ${packageName} in resolve map`);
|
|
27
23
|
return;
|
|
28
24
|
}
|
|
29
25
|
const exports = (await getExportsMap(entry.path));
|
|
@@ -60,7 +56,7 @@ export async function addOverride({ session, packageName, importPath, filename,
|
|
|
60
56
|
}
|
|
61
57
|
// Write config.
|
|
62
58
|
fs.writeFileSync(configPath, JSON.stringify(cloudpackConfig, null, 2));
|
|
63
|
-
|
|
59
|
+
console.debug(`Added override for ${packageName} to cloudpack config`);
|
|
64
60
|
const override = {
|
|
65
61
|
packageOverrides: [packageOverride],
|
|
66
62
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../../src/commands/start/addOverride.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,8BAA8B,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,kBAAkB,GACnB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,
|
|
1
|
+
{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../../src/commands/start/addOverride.ts"],"names":[],"mappings":"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"}
|