@ms-cloudpack/cli 0.23.4 → 0.23.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.
- package/CHANGELOG.json +51 -1
- package/CHANGELOG.md +20 -2
- package/lib/commands/init/init.test.js +7 -7
- package/lib/commands/init/init.test.js.map +1 -1
- package/lib/commands/start/addOverride.d.ts +2 -3
- package/lib/commands/start/addOverride.js +52 -56
- package/lib/commands/start/addOverride.js.map +1 -1
- package/lib/commands/start/addOverride.test.d.ts +1 -0
- package/lib/commands/start/addOverride.test.js +250 -0
- package/lib/commands/start/addOverride.test.js.map +1 -0
- package/lib/commands/start/start.js +1 -1
- package/lib/commands/start/start.js.map +1 -1
- package/lib/commands/start/startApiServer.d.ts +1 -2
- package/lib/commands/start/startApiServer.js +8 -4
- package/lib/commands/start/startApiServer.js.map +1 -1
- package/lib/commands/start/validateOverride.test.d.ts +1 -0
- package/lib/commands/start/validateOverride.test.js +137 -0
- package/lib/commands/start/validateOverride.test.js.map +1 -0
- package/package.json +4 -4
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,57 @@
|
|
|
2
2
|
"name": "@ms-cloudpack/cli",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Thu, 08 Dec 2022 08:12:30 GMT",
|
|
6
|
+
"tag": "@ms-cloudpack/cli_v0.23.6",
|
|
7
|
+
"version": "0.23.6",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "dake.3601@gmail.com",
|
|
12
|
+
"package": "@ms-cloudpack/cli",
|
|
13
|
+
"commit": "4cd4bb346236dcd0d1a18ea6eab6eafa73d80724",
|
|
14
|
+
"comment": "Changing addOverride to async and adding tests"
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
"author": "beachball",
|
|
18
|
+
"package": "@ms-cloudpack/cli",
|
|
19
|
+
"comment": "Bump @ms-cloudpack/bundler to v0.7.10",
|
|
20
|
+
"commit": "c9da33d7976da89534a8253d394705416b7f2b72"
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
"author": "beachball",
|
|
24
|
+
"package": "@ms-cloudpack/cli",
|
|
25
|
+
"comment": "Bump @ms-cloudpack/package-utilities to v2.2.0",
|
|
26
|
+
"commit": "c9da33d7976da89534a8253d394705416b7f2b72"
|
|
27
|
+
}
|
|
28
|
+
]
|
|
29
|
+
}
|
|
30
|
+
},
|
|
31
|
+
{
|
|
32
|
+
"date": "Wed, 07 Dec 2022 08:11:46 GMT",
|
|
33
|
+
"tag": "@ms-cloudpack/cli_v0.23.5",
|
|
34
|
+
"version": "0.23.5",
|
|
35
|
+
"comments": {
|
|
36
|
+
"none": [
|
|
37
|
+
{
|
|
38
|
+
"author": "email not defined",
|
|
39
|
+
"package": "@ms-cloudpack/cli",
|
|
40
|
+
"commit": "6063fc391367b3dc90d5cae3a5771ab3eedb21b6",
|
|
41
|
+
"comment": "Update @types devDependencies"
|
|
42
|
+
}
|
|
43
|
+
],
|
|
44
|
+
"patch": [
|
|
45
|
+
{
|
|
46
|
+
"author": "beachball",
|
|
47
|
+
"package": "@ms-cloudpack/cli",
|
|
48
|
+
"comment": "Bump @ms-cloudpack/bundler to v0.7.9",
|
|
49
|
+
"commit": "ce724c545a19002468f1610f9281bae56d7e3ddd"
|
|
50
|
+
}
|
|
51
|
+
]
|
|
52
|
+
}
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
"date": "Sun, 04 Dec 2022 08:11:29 GMT",
|
|
6
56
|
"tag": "@ms-cloudpack/cli_v0.23.4",
|
|
7
57
|
"version": "0.23.4",
|
|
8
58
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,30 @@
|
|
|
1
1
|
# Change Log - @ms-cloudpack/cli
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Thu, 08 Dec 2022 08:12:30 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.23.6
|
|
8
|
+
|
|
9
|
+
Thu, 08 Dec 2022 08:12:30 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- Changing addOverride to async and adding tests (dake.3601@gmail.com)
|
|
14
|
+
- Bump @ms-cloudpack/bundler to v0.7.10
|
|
15
|
+
- Bump @ms-cloudpack/package-utilities to v2.2.0
|
|
16
|
+
|
|
17
|
+
## 0.23.5
|
|
18
|
+
|
|
19
|
+
Wed, 07 Dec 2022 08:11:46 GMT
|
|
20
|
+
|
|
21
|
+
### Patches
|
|
22
|
+
|
|
23
|
+
- Bump @ms-cloudpack/bundler to v0.7.9
|
|
24
|
+
|
|
7
25
|
## 0.23.4
|
|
8
26
|
|
|
9
|
-
Sun, 04 Dec 2022 08:11:
|
|
27
|
+
Sun, 04 Dec 2022 08:11:29 GMT
|
|
10
28
|
|
|
11
29
|
### Patches
|
|
12
30
|
|
|
@@ -5,17 +5,17 @@ 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
|
-
const {
|
|
8
|
+
const { rm } = fs.promises;
|
|
9
9
|
describe('init', () => {
|
|
10
10
|
let testPath;
|
|
11
11
|
afterEach(async () => {
|
|
12
12
|
if (testPath) {
|
|
13
|
-
await
|
|
13
|
+
await rm(testPath, { recursive: true });
|
|
14
14
|
testPath = undefined;
|
|
15
15
|
}
|
|
16
16
|
});
|
|
17
17
|
it('can make no changes to a package that has no config and needs no changes', async () => {
|
|
18
|
-
|
|
18
|
+
testPath = await createTestFileStructure({
|
|
19
19
|
'package.json': {
|
|
20
20
|
name: 'test-package',
|
|
21
21
|
version: '1.0.0',
|
|
@@ -36,7 +36,7 @@ describe('init', () => {
|
|
|
36
36
|
expect(await isFile(path.join(testPath, 'cloudpack.config.json'))).toBe(false);
|
|
37
37
|
});
|
|
38
38
|
it('can create a config when a package needs to have an exports map defined', async () => {
|
|
39
|
-
|
|
39
|
+
testPath = await createTestFileStructure({
|
|
40
40
|
'package.json': {
|
|
41
41
|
name: 'test-package',
|
|
42
42
|
version: '1.0.0',
|
|
@@ -79,7 +79,7 @@ describe('init', () => {
|
|
|
79
79
|
`);
|
|
80
80
|
});
|
|
81
81
|
it('can modify inner-repo packages if the fix option is specified and a package needs an override', async () => {
|
|
82
|
-
|
|
82
|
+
testPath = await createTestFileStructure({
|
|
83
83
|
'app/package.json': {
|
|
84
84
|
name: 'test-package',
|
|
85
85
|
version: '1.0.0',
|
|
@@ -124,7 +124,7 @@ describe('init', () => {
|
|
|
124
124
|
`);
|
|
125
125
|
});
|
|
126
126
|
it('can avoids modifying external packages if the fix option is specified and a package needs an override', async () => {
|
|
127
|
-
|
|
127
|
+
testPath = await createTestFileStructure({
|
|
128
128
|
'package.json': {
|
|
129
129
|
name: 'test-package',
|
|
130
130
|
version: '1.0.0',
|
|
@@ -170,7 +170,7 @@ describe('init', () => {
|
|
|
170
170
|
expect(libraryDefinition.exports).toBeUndefined();
|
|
171
171
|
});
|
|
172
172
|
it('can update an existing exports map when fix is provided', async () => {
|
|
173
|
-
|
|
173
|
+
testPath = await createTestFileStructure({
|
|
174
174
|
'app/package.json': {
|
|
175
175
|
name: 'test-package',
|
|
176
176
|
version: '1.0.0',
|
|
@@ -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;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"init.test.js","sourceRoot":"","sources":["../../../src/commands/init/init.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import type { Session } from '../../types.js';
|
|
2
|
-
export declare function addOverride({ session,
|
|
2
|
+
export declare function addOverride({ session, packageName, importPath, filename, }: {
|
|
3
3
|
session: Session;
|
|
4
|
-
appPath: string;
|
|
5
4
|
packageName: string;
|
|
6
5
|
importPath: string;
|
|
7
6
|
filename?: string;
|
|
8
|
-
}): void
|
|
7
|
+
}): Promise<void>;
|
|
@@ -10,65 +10,61 @@ import { parseRequestInfo } from './parseRequestInfo.js';
|
|
|
10
10
|
const log = (...messages) => {
|
|
11
11
|
// console.log(`Add Override:`, ...messages);
|
|
12
12
|
};
|
|
13
|
-
export function addOverride({ session,
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
13
|
+
export async function addOverride({ session, packageName, importPath, filename, }) {
|
|
14
|
+
let definition = undefined;
|
|
15
|
+
if (filename) {
|
|
16
|
+
const requestPath = slash(new URL(filename).pathname);
|
|
17
|
+
const { packageName: name, version } = parseRequestInfo(requestPath);
|
|
18
|
+
definition = { name, version };
|
|
19
|
+
}
|
|
20
|
+
const entry = findResolveMapEntry({
|
|
21
|
+
packageName,
|
|
22
|
+
resolveMap: session.resolveMap,
|
|
23
|
+
definition,
|
|
24
|
+
});
|
|
25
|
+
if (entry === undefined) {
|
|
26
|
+
log(`Could not find entry of package ${packageName} in resolve map`);
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
const exports = (await getExportsMap(entry.path));
|
|
30
|
+
await addExportsMapEntry({
|
|
31
|
+
exports,
|
|
32
|
+
packagePath: entry.path,
|
|
33
|
+
importPath,
|
|
34
|
+
});
|
|
35
|
+
const packageOverride = {
|
|
36
|
+
name: packageName,
|
|
37
|
+
versionRequirement: entry.version,
|
|
38
|
+
overrides: {
|
|
32
39
|
exports,
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
//
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
cloudpackConfig.packageOverrides = [packageOverride];
|
|
40
|
+
},
|
|
41
|
+
};
|
|
42
|
+
// Parse config if it exists.
|
|
43
|
+
const configPath = path.join(session.appPath, 'cloudpack.config.json');
|
|
44
|
+
const cloudpackConfig = (await readJson(configPath)) || {};
|
|
45
|
+
// Add package override to config.
|
|
46
|
+
if (!cloudpackConfig.packageOverrides) {
|
|
47
|
+
cloudpackConfig.packageOverrides = [packageOverride];
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
// Check if override already exists.
|
|
51
|
+
const existingOverride = cloudpackConfig.packageOverrides.find((o) => o.name === packageOverride.name && semver.satisfies(packageOverride.versionRequirement, o.versionRequirement));
|
|
52
|
+
if (existingOverride) {
|
|
53
|
+
// Update existing override.
|
|
54
|
+
existingOverride.overrides = packageOverride.overrides;
|
|
49
55
|
}
|
|
50
56
|
else {
|
|
51
|
-
//
|
|
52
|
-
|
|
53
|
-
if (existingOverride) {
|
|
54
|
-
// Update existing override.
|
|
55
|
-
existingOverride.overrides = packageOverride.overrides;
|
|
56
|
-
}
|
|
57
|
-
else {
|
|
58
|
-
// Add new override.
|
|
59
|
-
cloudpackConfig.packageOverrides.push(packageOverride);
|
|
60
|
-
}
|
|
57
|
+
// Add new override.
|
|
58
|
+
cloudpackConfig.packageOverrides.push(packageOverride);
|
|
61
59
|
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
// no-op
|
|
72
|
-
});
|
|
60
|
+
}
|
|
61
|
+
// Write config.
|
|
62
|
+
fs.writeFileSync(configPath, JSON.stringify(cloudpackConfig, null, 2));
|
|
63
|
+
log(`Added override for ${packageName} to cloudpack config`);
|
|
64
|
+
const override = {
|
|
65
|
+
packageOverrides: [packageOverride],
|
|
66
|
+
};
|
|
67
|
+
// Initialize package overrides.
|
|
68
|
+
PackageDefinitions.getInstance().registerTransform(createPackageOverrideTransform(override));
|
|
73
69
|
}
|
|
74
70
|
//# sourceMappingURL=addOverride.js.map
|
|
@@ -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,6DAA6D;AAC7D,MAAM,GAAG,GAAG,CAAC,GAAG,QAAmB,EAAE,EAAE;IACrC,6CAA6C;AAC/C,CAAC,CAAC;AAEF,MAAM,UAAU,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../../src/commands/start/addOverride.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,250 @@
|
|
|
1
|
+
import { describe, it, expect, beforeEach, afterEach } from '@jest/globals';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import { readJson } from '@ms-cloudpack/json-utilities';
|
|
4
|
+
import { createResolveMap, PackageDefinitions } from '@ms-cloudpack/package-utilities';
|
|
5
|
+
import { createTestFileStructure } from '@ms-cloudpack/test-utilities';
|
|
6
|
+
import { addOverride } from './addOverride.js';
|
|
7
|
+
import fs from 'fs';
|
|
8
|
+
const { rm } = fs.promises;
|
|
9
|
+
describe('addOverride', () => {
|
|
10
|
+
let testPath;
|
|
11
|
+
beforeEach(() => {
|
|
12
|
+
PackageDefinitions.getInstance().clear();
|
|
13
|
+
PackageDefinitions.getInstance().clearTransforms();
|
|
14
|
+
});
|
|
15
|
+
afterEach(async () => {
|
|
16
|
+
if (testPath) {
|
|
17
|
+
await rm(testPath, { recursive: true });
|
|
18
|
+
testPath = undefined;
|
|
19
|
+
}
|
|
20
|
+
});
|
|
21
|
+
it('can add override for file without filename', async () => {
|
|
22
|
+
testPath = await createTestFileStructure({
|
|
23
|
+
'package.json': {
|
|
24
|
+
name: 'test-project-1',
|
|
25
|
+
version: '0.0.1',
|
|
26
|
+
type: 'module',
|
|
27
|
+
exports: {
|
|
28
|
+
'.': './lib/index.js',
|
|
29
|
+
},
|
|
30
|
+
dependencies: {
|
|
31
|
+
a: '^1.0.0',
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
'node_modules/a/package.json': {
|
|
35
|
+
name: 'a',
|
|
36
|
+
version: '1.0.0',
|
|
37
|
+
main: 'index.js',
|
|
38
|
+
},
|
|
39
|
+
'node_modules/a/index.js': `export const a = () => 'a';`,
|
|
40
|
+
'node_modules/a/other/path/file.js': `export const other = () => 'other';`,
|
|
41
|
+
});
|
|
42
|
+
await addOverride({
|
|
43
|
+
session: {
|
|
44
|
+
appPath: testPath,
|
|
45
|
+
resolveMap: await createResolveMap({ appPath: testPath }),
|
|
46
|
+
},
|
|
47
|
+
packageName: 'a',
|
|
48
|
+
importPath: 'other/path/file',
|
|
49
|
+
});
|
|
50
|
+
const result = (await readJson(path.join(testPath, 'cloudpack.config.json')));
|
|
51
|
+
expect(result?.packageOverrides).toEqual([
|
|
52
|
+
{
|
|
53
|
+
name: 'a',
|
|
54
|
+
versionRequirement: '1.0.0',
|
|
55
|
+
overrides: {
|
|
56
|
+
exports: {
|
|
57
|
+
'.': {
|
|
58
|
+
default: './index.js',
|
|
59
|
+
},
|
|
60
|
+
'./other/path/file': {
|
|
61
|
+
default: './other/path/file.js',
|
|
62
|
+
},
|
|
63
|
+
},
|
|
64
|
+
},
|
|
65
|
+
},
|
|
66
|
+
]);
|
|
67
|
+
expect(await PackageDefinitions.getInstance().get(path.join(testPath, 'node_modules/a/'))).toEqual({
|
|
68
|
+
exports: {
|
|
69
|
+
'.': {
|
|
70
|
+
default: './index.js',
|
|
71
|
+
},
|
|
72
|
+
'./other/path/file': {
|
|
73
|
+
default: './other/path/file.js',
|
|
74
|
+
},
|
|
75
|
+
},
|
|
76
|
+
main: 'index.js',
|
|
77
|
+
name: 'a',
|
|
78
|
+
version: '1.0.0',
|
|
79
|
+
});
|
|
80
|
+
});
|
|
81
|
+
it('can add override for scoped version with filename', async () => {
|
|
82
|
+
testPath = await createTestFileStructure({
|
|
83
|
+
'package.json': {
|
|
84
|
+
name: 'test-project-2',
|
|
85
|
+
version: '0.0.1',
|
|
86
|
+
type: 'module',
|
|
87
|
+
exports: {
|
|
88
|
+
'.': './lib/index.js',
|
|
89
|
+
},
|
|
90
|
+
dependencies: {
|
|
91
|
+
a: '1.0.0',
|
|
92
|
+
b: '1.0.0',
|
|
93
|
+
c: '1.0.0',
|
|
94
|
+
},
|
|
95
|
+
},
|
|
96
|
+
'node_modules/a/package.json': {
|
|
97
|
+
name: 'a',
|
|
98
|
+
version: '1.0.0',
|
|
99
|
+
main: 'index.js',
|
|
100
|
+
dependencies: {
|
|
101
|
+
c: '2.0.0',
|
|
102
|
+
},
|
|
103
|
+
},
|
|
104
|
+
'node_modules/a/node_modules/c/package.json': {
|
|
105
|
+
name: 'c',
|
|
106
|
+
version: '2.0.0',
|
|
107
|
+
main: 'index.js',
|
|
108
|
+
},
|
|
109
|
+
'node_modules/a/node_modules/c/index.js': `export const c = () => 'c';`,
|
|
110
|
+
'node_modules/a/node_modules/c/other/path/file.js': `export const other = () => 'other';`,
|
|
111
|
+
'node_modules/b/package.json': {
|
|
112
|
+
name: 'b',
|
|
113
|
+
version: '1.0.0',
|
|
114
|
+
main: 'index.js',
|
|
115
|
+
dependencies: {
|
|
116
|
+
c: '3.0.0',
|
|
117
|
+
},
|
|
118
|
+
},
|
|
119
|
+
'node_modules/b/node_modules/c/package.json': {
|
|
120
|
+
name: 'c',
|
|
121
|
+
version: '3.0.0',
|
|
122
|
+
main: 'index.js',
|
|
123
|
+
},
|
|
124
|
+
'node_modules/c/package.json': {
|
|
125
|
+
name: 'c',
|
|
126
|
+
version: '1.0.0',
|
|
127
|
+
main: 'index.js',
|
|
128
|
+
},
|
|
129
|
+
});
|
|
130
|
+
await addOverride({
|
|
131
|
+
session: {
|
|
132
|
+
appPath: testPath,
|
|
133
|
+
resolveMap: await createResolveMap({ appPath: testPath }),
|
|
134
|
+
},
|
|
135
|
+
packageName: 'c',
|
|
136
|
+
importPath: 'other/path/file',
|
|
137
|
+
filename: 'http://localhost/a@1.0.0/index.js',
|
|
138
|
+
});
|
|
139
|
+
const result = (await readJson(path.join(testPath, 'cloudpack.config.json')));
|
|
140
|
+
expect(result).toEqual({
|
|
141
|
+
packageOverrides: [
|
|
142
|
+
{
|
|
143
|
+
name: 'c',
|
|
144
|
+
versionRequirement: '2.0.0',
|
|
145
|
+
overrides: {
|
|
146
|
+
exports: {
|
|
147
|
+
'.': {
|
|
148
|
+
default: './index.js',
|
|
149
|
+
},
|
|
150
|
+
'./other/path/file': {
|
|
151
|
+
default: './other/path/file.js',
|
|
152
|
+
},
|
|
153
|
+
},
|
|
154
|
+
},
|
|
155
|
+
},
|
|
156
|
+
],
|
|
157
|
+
});
|
|
158
|
+
expect(await PackageDefinitions.getInstance().get(path.join(testPath, 'node_modules/a/node_modules/c'))).toEqual({
|
|
159
|
+
exports: {
|
|
160
|
+
'.': {
|
|
161
|
+
default: './index.js',
|
|
162
|
+
},
|
|
163
|
+
'./other/path/file': {
|
|
164
|
+
default: './other/path/file.js',
|
|
165
|
+
},
|
|
166
|
+
},
|
|
167
|
+
main: 'index.js',
|
|
168
|
+
name: 'c',
|
|
169
|
+
version: '2.0.0',
|
|
170
|
+
});
|
|
171
|
+
});
|
|
172
|
+
it('can not add override when the file does not exist', async () => {
|
|
173
|
+
testPath = await createTestFileStructure({
|
|
174
|
+
'package.json': {
|
|
175
|
+
name: 'test-project-3',
|
|
176
|
+
version: '0.0.1',
|
|
177
|
+
type: 'module',
|
|
178
|
+
exports: {
|
|
179
|
+
'.': './lib/index.js',
|
|
180
|
+
},
|
|
181
|
+
dependencies: {
|
|
182
|
+
a: '^1.0.0',
|
|
183
|
+
},
|
|
184
|
+
},
|
|
185
|
+
'node_modules/a/package.json': {
|
|
186
|
+
name: 'a',
|
|
187
|
+
version: '1.0.0',
|
|
188
|
+
main: 'index.js',
|
|
189
|
+
},
|
|
190
|
+
});
|
|
191
|
+
await addOverride({
|
|
192
|
+
session: {
|
|
193
|
+
appPath: testPath,
|
|
194
|
+
resolveMap: await createResolveMap({ appPath: testPath }),
|
|
195
|
+
},
|
|
196
|
+
packageName: 'a',
|
|
197
|
+
importPath: 'other/path/file',
|
|
198
|
+
});
|
|
199
|
+
const result = (await readJson(path.join(testPath, 'cloudpack.config.json')));
|
|
200
|
+
expect(result?.packageOverrides).toEqual([
|
|
201
|
+
{
|
|
202
|
+
name: 'a',
|
|
203
|
+
versionRequirement: '1.0.0',
|
|
204
|
+
overrides: {
|
|
205
|
+
exports: {},
|
|
206
|
+
},
|
|
207
|
+
},
|
|
208
|
+
]);
|
|
209
|
+
expect(await PackageDefinitions.getInstance().get(path.join(testPath, 'node_modules/a/'))).toEqual({
|
|
210
|
+
main: 'index.js',
|
|
211
|
+
name: 'a',
|
|
212
|
+
version: '1.0.0',
|
|
213
|
+
exports: {},
|
|
214
|
+
});
|
|
215
|
+
});
|
|
216
|
+
it('can not add override when the package is not a dependency', async () => {
|
|
217
|
+
testPath = await createTestFileStructure({
|
|
218
|
+
'package.json': {
|
|
219
|
+
name: 'test-project-4',
|
|
220
|
+
version: '0.0.1',
|
|
221
|
+
type: 'module',
|
|
222
|
+
exports: {
|
|
223
|
+
'.': './lib/index.js',
|
|
224
|
+
},
|
|
225
|
+
},
|
|
226
|
+
'node_modules/a/package.json': {
|
|
227
|
+
name: 'a',
|
|
228
|
+
version: '1.0.0',
|
|
229
|
+
main: 'index.js',
|
|
230
|
+
},
|
|
231
|
+
'node_modules/a/other/path/file.js': `export const other = () => 'other';`,
|
|
232
|
+
});
|
|
233
|
+
await addOverride({
|
|
234
|
+
session: {
|
|
235
|
+
appPath: testPath,
|
|
236
|
+
resolveMap: await createResolveMap({ appPath: testPath }),
|
|
237
|
+
},
|
|
238
|
+
packageName: 'a',
|
|
239
|
+
importPath: 'other/path/file',
|
|
240
|
+
});
|
|
241
|
+
const result = (await readJson(path.join(testPath, 'cloudpack.config.json')));
|
|
242
|
+
expect(result).toBeUndefined();
|
|
243
|
+
expect(await PackageDefinitions.getInstance().get(path.join(testPath, 'node_modules/a/'))).toEqual({
|
|
244
|
+
main: 'index.js',
|
|
245
|
+
name: 'a',
|
|
246
|
+
version: '1.0.0',
|
|
247
|
+
});
|
|
248
|
+
});
|
|
249
|
+
});
|
|
250
|
+
//# sourceMappingURL=addOverride.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"addOverride.test.js","sourceRoot":"","sources":["../../../src/commands/start/addOverride.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC5E,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAE3B,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,IAAI,QAA4B,CAAC;IAEjC,UAAU,CAAC,GAAG,EAAE;QACd,kBAAkB,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC;QACzC,kBAAkB,CAAC,WAAW,EAAE,CAAC,eAAe,EAAE,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,IAAI,QAAQ,EAAE;YACZ,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACxC,QAAQ,GAAG,SAAS,CAAC;SACtB;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,QAAQ,GAAG,MAAM,uBAAuB,CAAC;YACvC,cAAc,EAAE;gBACd,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE;oBACP,GAAG,EAAE,gBAAgB;iBACtB;gBACD,YAAY,EAAE;oBACZ,CAAC,EAAE,QAAQ;iBACZ;aACF;YACD,6BAA6B,EAAE;gBAC7B,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,UAAU;aACjB;YACD,yBAAyB,EAAE,6BAA6B;YACxD,mCAAmC,EAAE,qCAAqC;SAC3E,CAAC,CAAC;QAEH,MAAM,WAAW,CAAC;YAChB,OAAO,EAAE;gBACP,OAAO,EAAE,QAAQ;gBACjB,UAAU,EAAE,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;aAC/C;YACZ,WAAW,EAAE,GAAG;YAChB,UAAU,EAAE,iBAAiB;SAC9B,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC,CAAoB,CAAC;QAEjG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,OAAO,CAAC;YACvC;gBACE,IAAI,EAAE,GAAG;gBACT,kBAAkB,EAAE,OAAO;gBAC3B,SAAS,EAAE;oBACT,OAAO,EAAE;wBACP,GAAG,EAAE;4BACH,OAAO,EAAE,YAAY;yBACtB;wBACD,mBAAmB,EAAE;4BACnB,OAAO,EAAE,sBAAsB;yBAChC;qBACF;iBACF;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,kBAAkB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACjG,OAAO,EAAE;gBACP,GAAG,EAAE;oBACH,OAAO,EAAE,YAAY;iBACtB;gBACD,mBAAmB,EAAE;oBACnB,OAAO,EAAE,sBAAsB;iBAChC;aACF;YACD,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACjE,QAAQ,GAAG,MAAM,uBAAuB,CAAC;YACvC,cAAc,EAAE;gBACd,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE;oBACP,GAAG,EAAE,gBAAgB;iBACtB;gBACD,YAAY,EAAE;oBACZ,CAAC,EAAE,OAAO;oBACV,CAAC,EAAE,OAAO;oBACV,CAAC,EAAE,OAAO;iBACX;aACF;YACD,6BAA6B,EAAE;gBAC7B,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,UAAU;gBAChB,YAAY,EAAE;oBACZ,CAAC,EAAE,OAAO;iBACX;aACF;YACD,4CAA4C,EAAE;gBAC5C,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,UAAU;aACjB;YACD,wCAAwC,EAAE,6BAA6B;YACvE,kDAAkD,EAAE,qCAAqC;YACzF,6BAA6B,EAAE;gBAC7B,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,UAAU;gBAChB,YAAY,EAAE;oBACZ,CAAC,EAAE,OAAO;iBACX;aACF;YACD,4CAA4C,EAAE;gBAC5C,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,UAAU;aACjB;YACD,6BAA6B,EAAE;gBAC7B,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,UAAU;aACjB;SACF,CAAC,CAAC;QAEH,MAAM,WAAW,CAAC;YAChB,OAAO,EAAE;gBACP,OAAO,EAAE,QAAQ;gBACjB,UAAU,EAAE,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;aAC/C;YACZ,WAAW,EAAE,GAAG;YAChB,UAAU,EAAE,iBAAiB;YAC7B,QAAQ,EAAE,mCAAmC;SAC9C,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC,CAAoB,CAAC;QAEjG,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,gBAAgB,EAAE;gBAChB;oBACE,IAAI,EAAE,GAAG;oBACT,kBAAkB,EAAE,OAAO;oBAC3B,SAAS,EAAE;wBACT,OAAO,EAAE;4BACP,GAAG,EAAE;gCACH,OAAO,EAAE,YAAY;6BACtB;4BACD,mBAAmB,EAAE;gCACnB,OAAO,EAAE,sBAAsB;6BAChC;yBACF;qBACF;iBACF;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,kBAAkB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,+BAA+B,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC/G,OAAO,EAAE;gBACP,GAAG,EAAE;oBACH,OAAO,EAAE,YAAY;iBACtB;gBACD,mBAAmB,EAAE;oBACnB,OAAO,EAAE,sBAAsB;iBAChC;aACF;YACD,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACjE,QAAQ,GAAG,MAAM,uBAAuB,CAAC;YACvC,cAAc,EAAE;gBACd,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE;oBACP,GAAG,EAAE,gBAAgB;iBACtB;gBACD,YAAY,EAAE;oBACZ,CAAC,EAAE,QAAQ;iBACZ;aACF;YACD,6BAA6B,EAAE;gBAC7B,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,UAAU;aACjB;SACF,CAAC,CAAC;QAEH,MAAM,WAAW,CAAC;YAChB,OAAO,EAAE;gBACP,OAAO,EAAE,QAAQ;gBACjB,UAAU,EAAE,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;aAC/C;YACZ,WAAW,EAAE,GAAG;YAChB,UAAU,EAAE,iBAAiB;SAC9B,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC,CAAoB,CAAC;QAEjG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,OAAO,CAAC;YACvC;gBACE,IAAI,EAAE,GAAG;gBACT,kBAAkB,EAAE,OAAO;gBAC3B,SAAS,EAAE;oBACT,OAAO,EAAE,EAAE;iBACZ;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,kBAAkB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACjG,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,QAAQ,GAAG,MAAM,uBAAuB,CAAC;YACvC,cAAc,EAAE;gBACd,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE;oBACP,GAAG,EAAE,gBAAgB;iBACtB;aACF;YACD,6BAA6B,EAAE;gBAC7B,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,UAAU;aACjB;YACD,mCAAmC,EAAE,qCAAqC;SAC3E,CAAC,CAAC;QAEH,MAAM,WAAW,CAAC;YAChB,OAAO,EAAE;gBACP,OAAO,EAAE,QAAQ;gBACjB,UAAU,EAAE,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;aAC/C;YACZ,WAAW,EAAE,GAAG;YAChB,UAAU,EAAE,iBAAiB;SAC9B,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC,CAAoB,CAAC;QAEjG,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;QAC/B,MAAM,CAAC,MAAM,kBAAkB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACjG,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -20,7 +20,7 @@ export async function start() {
|
|
|
20
20
|
// Initialize session definition.
|
|
21
21
|
const session = await createSession({ appPath });
|
|
22
22
|
// Start api server for tracking status and handling remote requests.
|
|
23
|
-
const apiServer = await startApiServer({
|
|
23
|
+
const apiServer = await startApiServer({ session });
|
|
24
24
|
// Then start bundle and app servers for hosting the app.
|
|
25
25
|
const bundleServer = await startBundleServer({ session, apiServer });
|
|
26
26
|
const appServer = await startAppServer({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,8BAA8B,EAAE,MAAM,gDAAgD,CAAC;AAEhG;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE9B,6BAA6B;IAC7B,MAAM,eAAe,GAAoB,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7G,MAAM,SAAS,GAAG,eAAe,EAAE,SAAS,IAAI,EAAE,CAAC;IAEnD,gCAAgC;IAChC,kBAAkB,CAAC,WAAW,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,eAAe,CAAC,CAAC,CAAC;IAEpG,iCAAiC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEjD,qEAAqE;IACrE,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,6 @@ import type { ApiServer, Session } from '../../types.js';
|
|
|
13
13
|
* The app server will burn the api server url on the host html, so that client-side
|
|
14
14
|
* javascript can connect and subscribe to page changes.
|
|
15
15
|
*/
|
|
16
|
-
export declare function startApiServer({ session
|
|
16
|
+
export declare function startApiServer({ session }: {
|
|
17
17
|
session: Session;
|
|
18
|
-
appPath: string;
|
|
19
18
|
}): Promise<ApiServer>;
|
|
@@ -28,7 +28,7 @@ import { validateOverride } from './validateOverride.js';
|
|
|
28
28
|
* The app server will burn the api server url on the host html, so that client-side
|
|
29
29
|
* javascript can connect and subscribe to page changes.
|
|
30
30
|
*/
|
|
31
|
-
export async function startApiServer({ session
|
|
31
|
+
export async function startApiServer({ session }) {
|
|
32
32
|
const port = await getPort({ port: [9890, 9891, 9892, 9893] });
|
|
33
33
|
const bus = createDataBus();
|
|
34
34
|
const sessionStats = {
|
|
@@ -181,9 +181,13 @@ export async function startApiServer({ session, appPath }) {
|
|
|
181
181
|
case 'addOverride': {
|
|
182
182
|
// TODO: Send filename from request data to findResolveMapEntry when chromium Issue 1371551 is fixed.
|
|
183
183
|
const { packageName, importPath } = request.data;
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
184
|
+
(async () => {
|
|
185
|
+
await addOverride({ session, packageName, importPath });
|
|
186
|
+
session.incrementSessionVersion();
|
|
187
|
+
notifyReload();
|
|
188
|
+
})().catch(() => {
|
|
189
|
+
// no-op
|
|
190
|
+
});
|
|
187
191
|
break;
|
|
188
192
|
}
|
|
189
193
|
case 'validateOverride': {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startApiServer.js","sourceRoot":"","sources":["../../../src/commands/start/startApiServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,SAAS,EAAE,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAUjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,8BAA8B,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"startApiServer.js","sourceRoot":"","sources":["../../../src/commands/start/startApiServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
import { describe, it, expect, afterEach } from '@jest/globals';
|
|
2
|
+
import { createResolveMap } from '@ms-cloudpack/package-utilities';
|
|
3
|
+
import { createTestFileStructure } from '@ms-cloudpack/test-utilities';
|
|
4
|
+
import { validateOverride } from './validateOverride.js';
|
|
5
|
+
import fs from 'fs';
|
|
6
|
+
const { rm } = fs.promises;
|
|
7
|
+
describe('validateOverride', () => {
|
|
8
|
+
let testPath;
|
|
9
|
+
afterEach(async () => {
|
|
10
|
+
if (testPath) {
|
|
11
|
+
await rm(testPath, { recursive: true });
|
|
12
|
+
testPath = undefined;
|
|
13
|
+
}
|
|
14
|
+
});
|
|
15
|
+
it('returns true when the file is found', async () => {
|
|
16
|
+
testPath = await createTestFileStructure({
|
|
17
|
+
'package.json': {
|
|
18
|
+
name: 'test-project-1',
|
|
19
|
+
version: '0.0.1',
|
|
20
|
+
type: 'module',
|
|
21
|
+
exports: {
|
|
22
|
+
'.': './lib/index.js',
|
|
23
|
+
},
|
|
24
|
+
dependencies: {
|
|
25
|
+
b: '^1.0.0',
|
|
26
|
+
},
|
|
27
|
+
},
|
|
28
|
+
'src/index.ts': `import { b2 } from 'b/other/path/file'; export const a = 'a' + b2();`,
|
|
29
|
+
'node_modules/b/package.json': {
|
|
30
|
+
name: 'b',
|
|
31
|
+
version: '1.0.0',
|
|
32
|
+
main: 'index.js',
|
|
33
|
+
},
|
|
34
|
+
'node_modules/b/index.js': `export const b = () => 'b';`,
|
|
35
|
+
'node_modules/b/other/path/file.js': `export const b2 = () => 'b2';`,
|
|
36
|
+
});
|
|
37
|
+
const result = await validateOverride({
|
|
38
|
+
session: {
|
|
39
|
+
resolveMap: await createResolveMap({ appPath: testPath }),
|
|
40
|
+
},
|
|
41
|
+
packageName: 'b',
|
|
42
|
+
importPath: 'other/path/file',
|
|
43
|
+
filename: 'http://localhost/test-project-1@0.0.1/src/index.ts',
|
|
44
|
+
});
|
|
45
|
+
expect(result).toEqual(true);
|
|
46
|
+
});
|
|
47
|
+
it('returns true when the file is found without filename', async () => {
|
|
48
|
+
testPath = await createTestFileStructure({
|
|
49
|
+
'package.json': {
|
|
50
|
+
name: 'test-project-1',
|
|
51
|
+
version: '0.0.1',
|
|
52
|
+
type: 'module',
|
|
53
|
+
exports: {
|
|
54
|
+
'.': './lib/index.js',
|
|
55
|
+
},
|
|
56
|
+
dependencies: {
|
|
57
|
+
b: '^1.0.0',
|
|
58
|
+
},
|
|
59
|
+
},
|
|
60
|
+
'src/index.ts': `import { b2 } from 'b/other/path/file'; export const a = 'a' + b2();`,
|
|
61
|
+
'node_modules/b/package.json': {
|
|
62
|
+
name: 'b',
|
|
63
|
+
version: '1.0.0',
|
|
64
|
+
main: 'index.js',
|
|
65
|
+
},
|
|
66
|
+
'node_modules/b/index.js': `export const b = () => 'b';`,
|
|
67
|
+
'node_modules/b/other/path/file.js': `export const b2 = () => 'b2';`,
|
|
68
|
+
});
|
|
69
|
+
const result = await validateOverride({
|
|
70
|
+
session: {
|
|
71
|
+
resolveMap: await createResolveMap({ appPath: testPath }),
|
|
72
|
+
},
|
|
73
|
+
packageName: 'b',
|
|
74
|
+
importPath: 'other/path/file',
|
|
75
|
+
});
|
|
76
|
+
expect(result).toEqual(true);
|
|
77
|
+
});
|
|
78
|
+
it('returns false when the package is not a dependency', async () => {
|
|
79
|
+
testPath = await createTestFileStructure({
|
|
80
|
+
'package.json': {
|
|
81
|
+
name: 'test-project-1',
|
|
82
|
+
version: '0.0.1',
|
|
83
|
+
type: 'module',
|
|
84
|
+
exports: {
|
|
85
|
+
'.': './lib/index.js',
|
|
86
|
+
},
|
|
87
|
+
},
|
|
88
|
+
'src/index.ts': `import { b2 } from 'b/other/path/file'; export const a = 'a' + b2();`,
|
|
89
|
+
'node_modules/b/package.json': {
|
|
90
|
+
name: 'b',
|
|
91
|
+
version: '1.0.0',
|
|
92
|
+
main: 'index.js',
|
|
93
|
+
},
|
|
94
|
+
'node_modules/b/index.js': `export const b = () => 'b';`,
|
|
95
|
+
'node_modules/b/other/path/file.js': `export const b2 = () => 'b2';`,
|
|
96
|
+
});
|
|
97
|
+
const result = await validateOverride({
|
|
98
|
+
session: {
|
|
99
|
+
resolveMap: await createResolveMap({ appPath: testPath }),
|
|
100
|
+
},
|
|
101
|
+
packageName: 'b',
|
|
102
|
+
importPath: 'other/path/file',
|
|
103
|
+
});
|
|
104
|
+
expect(result).toEqual(false);
|
|
105
|
+
});
|
|
106
|
+
it('returns false when the file does not exist', async () => {
|
|
107
|
+
testPath = await createTestFileStructure({
|
|
108
|
+
'package.json': {
|
|
109
|
+
name: 'test-project-1',
|
|
110
|
+
version: '0.0.1',
|
|
111
|
+
type: 'module',
|
|
112
|
+
exports: {
|
|
113
|
+
'.': './lib/index.js',
|
|
114
|
+
},
|
|
115
|
+
dependencies: {
|
|
116
|
+
b: '^1.0.0',
|
|
117
|
+
},
|
|
118
|
+
},
|
|
119
|
+
'src/index.ts': `import { b2 } from 'b/other/path/file'; export const a = 'a' + b2();`,
|
|
120
|
+
'node_modules/b/package.json': {
|
|
121
|
+
name: 'b',
|
|
122
|
+
version: '1.0.0',
|
|
123
|
+
main: 'index.js',
|
|
124
|
+
},
|
|
125
|
+
'node_modules/b/index.js': `export const b = () => 'b';`,
|
|
126
|
+
});
|
|
127
|
+
const result = await validateOverride({
|
|
128
|
+
session: {
|
|
129
|
+
resolveMap: await createResolveMap({ appPath: testPath }),
|
|
130
|
+
},
|
|
131
|
+
packageName: 'b',
|
|
132
|
+
importPath: 'other/path/file',
|
|
133
|
+
});
|
|
134
|
+
expect(result).toEqual(false);
|
|
135
|
+
});
|
|
136
|
+
});
|
|
137
|
+
//# sourceMappingURL=validateOverride.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validateOverride.test.js","sourceRoot":"","sources":["../../../src/commands/start/validateOverride.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ms-cloudpack/cli",
|
|
3
|
-
"version": "0.23.
|
|
3
|
+
"version": "0.23.6",
|
|
4
4
|
"description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -16,12 +16,12 @@
|
|
|
16
16
|
"cloudpack": "./bin/cloudpack.js"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@ms-cloudpack/bundler": "^0.7.
|
|
19
|
+
"@ms-cloudpack/bundler": "^0.7.10",
|
|
20
20
|
"@ms-cloudpack/create-express-app": "^1.1.3",
|
|
21
21
|
"@ms-cloudpack/data-bus": "^0.1.0",
|
|
22
22
|
"@ms-cloudpack/json-utilities": "^0.0.4",
|
|
23
23
|
"@ms-cloudpack/overlay": "^0.11.2",
|
|
24
|
-
"@ms-cloudpack/package-utilities": "^2.
|
|
24
|
+
"@ms-cloudpack/package-utilities": "^2.2.0",
|
|
25
25
|
"@ms-cloudpack/path-utilities": "^2.0.0",
|
|
26
26
|
"@ms-cloudpack/path-string-parsing": "^1.0.0",
|
|
27
27
|
"chokidar": "^3.5.3",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"@ms-cloudpack/scripts": "*",
|
|
44
44
|
"@types/chokidar": "2.1.3",
|
|
45
45
|
"@types/glob": "8.0.0",
|
|
46
|
-
"@types/object-hash": "3.0.
|
|
46
|
+
"@types/object-hash": "3.0.1",
|
|
47
47
|
"@types/uuid": "9.0.0",
|
|
48
48
|
"@types/ws": "8.5.3"
|
|
49
49
|
},
|