@ms-cloudpack/package-utilities 0.4.1 → 0.6.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/CHANGELOG.json +88 -1
- package/CHANGELOG.md +28 -2
- package/lib/createImportMap.d.ts +2 -2
- package/lib/createImportMap.js +8 -4
- package/lib/createImportMap.js.map +1 -1
- package/lib/createImportMap.test.js +1 -1
- package/lib/createImportMap.test.js.map +1 -1
- package/lib/createResolveMap.d.ts +3 -4
- package/lib/createResolveMap.js +53 -30
- package/lib/createResolveMap.js.map +1 -1
- package/lib/createResolveMap.test.js +236 -9
- package/lib/createResolveMap.test.js.map +1 -1
- package/lib/detectModuleType.js +8 -1
- package/lib/detectModuleType.js.map +1 -1
- package/lib/detectModuleType.test.js +7 -1
- package/lib/detectModuleType.test.js.map +1 -1
- package/lib/evaluateImportsFromEntries.js +2 -2
- package/lib/evaluateImportsFromEntries.js.map +1 -1
- package/lib/findPackagePath.d.ts +1 -1
- package/lib/findPackagePath.js +13 -5
- package/lib/findPackagePath.js.map +1 -1
- package/lib/getExportPathFromEntry.d.ts +2 -2
- package/lib/getExportPathFromEntry.js +15 -9
- package/lib/getExportPathFromEntry.js.map +1 -1
- package/lib/getExportPathFromEntry.test.js +8 -6
- package/lib/getExportPathFromEntry.test.js.map +1 -1
- package/lib/getInstalledPackages.d.ts +2 -2
- package/lib/getInstalledPackages.js +4 -4
- package/lib/getInstalledPackages.js.map +1 -1
- package/lib/getPackageDefinition.d.ts +3 -19
- package/lib/getPackageDefinition.js +5 -4
- package/lib/getPackageDefinition.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js.map +1 -1
- package/lib/resolveImportFromPackage.test.js +18 -24
- package/lib/resolveImportFromPackage.test.js.map +1 -1
- package/lib/resolveImportFromPackagePath.d.ts +3 -3
- package/lib/resolveImportFromPackagePath.js +28 -34
- package/lib/resolveImportFromPackagePath.js.map +1 -1
- package/lib/resolvePackageEntries.d.ts +2 -2
- package/lib/resolvePackageEntries.js +2 -2
- package/lib/resolvePackageEntries.js.map +1 -1
- package/lib/testPaths.d.ts +7 -0
- package/lib/testPaths.js +7 -0
- package/lib/testPaths.js.map +1 -1
- package/lib/tsdoc-metadata.json +11 -0
- package/package.json +5 -3
|
@@ -2,36 +2,263 @@ import { slash } from '@ms-cloudpack/path-utilities';
|
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import { createResolveMap } from './createResolveMap.js';
|
|
4
4
|
import { filterJson } from './filterJson.js';
|
|
5
|
-
import { testProject1Path } from '../src/testPaths.js';
|
|
6
|
-
|
|
5
|
+
import { testProject1Path, testProjectFluentPath, testRepoPath, testUninstalledProjectPath, testWithReact16Path, testWithReact17Path, testWithUnmetDependenciesPath, testWithUnmetPeerDependenciesPath, } from '../src/testPaths.js';
|
|
6
|
+
import os from 'os';
|
|
7
|
+
import { v4 as uuid } from 'uuid';
|
|
8
|
+
import fsExtra from 'fs-extra';
|
|
9
|
+
import fs from 'fs';
|
|
10
|
+
import { writeJson } from '@ms-cloudpack/json-utilities';
|
|
11
|
+
import { fileURLToPath } from 'url';
|
|
12
|
+
const { ensureDir, rmdir } = fsExtra;
|
|
13
|
+
const { realpath } = fs.promises;
|
|
14
|
+
const createResolveMapSafe = async (options) => {
|
|
15
|
+
const resolveMap = await createResolveMap(options);
|
|
16
|
+
return filterJson(resolveMap, 'path', (oldPath) => {
|
|
17
|
+
return slash(path.relative(options.appPath, oldPath));
|
|
18
|
+
});
|
|
19
|
+
};
|
|
20
|
+
const currentPath = path.dirname(fileURLToPath(import.meta.url));
|
|
21
|
+
let tempFolderPath;
|
|
22
|
+
/*
|
|
23
|
+
* Helper which builds a temporary app install directory given a recursive array of [name, version, deps] recursive tuples.
|
|
24
|
+
*/
|
|
25
|
+
const constructDependencies = async (dependency, appPath = tempFolderPath) => {
|
|
26
|
+
const [name, version, deps] = dependency;
|
|
27
|
+
await ensureDir(appPath);
|
|
28
|
+
await writeJson(path.join(appPath, 'package.json'), {
|
|
29
|
+
name,
|
|
30
|
+
version,
|
|
31
|
+
dependencies: deps?.reduce((acc, [name, version]) => ({ ...acc, [name]: version }), {}),
|
|
32
|
+
});
|
|
33
|
+
if (deps) {
|
|
34
|
+
for (const dep of deps) {
|
|
35
|
+
await constructDependencies(dep, path.join(appPath, 'node_modules', dep[0]));
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return appPath;
|
|
39
|
+
};
|
|
7
40
|
describe('createResolveMap', () => {
|
|
41
|
+
beforeEach(async () => {
|
|
42
|
+
tempFolderPath = path.join(os.tmpdir(), uuid());
|
|
43
|
+
await ensureDir(tempFolderPath);
|
|
44
|
+
tempFolderPath = await realpath(tempFolderPath);
|
|
45
|
+
});
|
|
46
|
+
afterEach(async () => {
|
|
47
|
+
await rmdir(tempFolderPath, { recursive: true });
|
|
48
|
+
});
|
|
8
49
|
it('can create a resolve map', async () => {
|
|
9
50
|
expect(await createResolveMapSafe({ appPath: testProject1Path })).toMatchInlineSnapshot(`
|
|
10
51
|
Object {
|
|
11
52
|
"b": Object {
|
|
12
53
|
"name": "b",
|
|
13
54
|
"path": "node_modules/b",
|
|
14
|
-
"requiredBy":
|
|
15
|
-
"test-project-1@0.0.1",
|
|
16
|
-
|
|
55
|
+
"requiredBy": Object {
|
|
56
|
+
"test-project-1@0.0.1": "^1.0.0",
|
|
57
|
+
},
|
|
17
58
|
"version": "1.0.0",
|
|
18
59
|
},
|
|
19
60
|
"c": Object {
|
|
20
61
|
"name": "c",
|
|
21
62
|
"path": "node_modules/c",
|
|
22
|
-
"requiredBy":
|
|
23
|
-
"test-project-1@0.0.1",
|
|
24
|
-
|
|
63
|
+
"requiredBy": Object {
|
|
64
|
+
"test-project-1@0.0.1": "^1.0.0",
|
|
65
|
+
},
|
|
25
66
|
"version": "1.0.0",
|
|
26
67
|
},
|
|
27
68
|
"test-project-1": Object {
|
|
28
69
|
"name": "test-project-1",
|
|
29
70
|
"path": "",
|
|
30
|
-
"requiredBy":
|
|
71
|
+
"requiredBy": Object {},
|
|
31
72
|
"version": "0.0.1",
|
|
32
73
|
},
|
|
33
74
|
}
|
|
34
75
|
`);
|
|
35
76
|
});
|
|
77
|
+
it('can create a resolve map for a project with a fluent package', async () => {
|
|
78
|
+
expect(await createResolveMapSafe({ appPath: testProjectFluentPath })).toMatchInlineSnapshot(`
|
|
79
|
+
Object {
|
|
80
|
+
"@fluentui/react": Object {
|
|
81
|
+
"name": "@fluentui/react",
|
|
82
|
+
"path": "node_modules/@fluentui/react",
|
|
83
|
+
"requiredBy": Object {
|
|
84
|
+
"test-project-fluent@1.0.0": "^8.42.0",
|
|
85
|
+
},
|
|
86
|
+
"version": "8.82.1",
|
|
87
|
+
},
|
|
88
|
+
"@fluentui/theme": Object {
|
|
89
|
+
"name": "@fluentui/theme",
|
|
90
|
+
"path": "node_modules/@fluentui/theme",
|
|
91
|
+
"requiredBy": Object {
|
|
92
|
+
"@fluentui/react@8.82.1": "^2.6.7",
|
|
93
|
+
},
|
|
94
|
+
"version": "2.6.7",
|
|
95
|
+
},
|
|
96
|
+
"@fluentui/utilities": Object {
|
|
97
|
+
"name": "@fluentui/utilities",
|
|
98
|
+
"path": "node_modules/@fluentui/utilities",
|
|
99
|
+
"requiredBy": Object {
|
|
100
|
+
"@fluentui/react@8.82.1": "^8.9.0",
|
|
101
|
+
"@fluentui/theme@2.6.7": "^8.9.0",
|
|
102
|
+
},
|
|
103
|
+
"version": "8.9.0",
|
|
104
|
+
},
|
|
105
|
+
"test-project-fluent": Object {
|
|
106
|
+
"name": "test-project-fluent",
|
|
107
|
+
"path": "",
|
|
108
|
+
"requiredBy": Object {},
|
|
109
|
+
"version": "1.0.0",
|
|
110
|
+
},
|
|
111
|
+
}
|
|
112
|
+
`);
|
|
113
|
+
});
|
|
114
|
+
it('prefers react 18 when most depend on it', async () => {
|
|
115
|
+
expect(await createResolveMapSafe({
|
|
116
|
+
appPath: await constructDependencies([
|
|
117
|
+
'testApp',
|
|
118
|
+
'1.0.0',
|
|
119
|
+
[
|
|
120
|
+
['library-a', '1.0.0', [['react', '17.0.0']]],
|
|
121
|
+
['library-b', '1.0.0', [['react', '18.0.0']]],
|
|
122
|
+
['react', '18.0.0'],
|
|
123
|
+
],
|
|
124
|
+
]),
|
|
125
|
+
})).toMatchInlineSnapshot(`
|
|
126
|
+
Object {
|
|
127
|
+
"library-a": Object {
|
|
128
|
+
"name": "library-a",
|
|
129
|
+
"path": "node_modules/library-a",
|
|
130
|
+
"requiredBy": Object {
|
|
131
|
+
"testApp@1.0.0": "1.0.0",
|
|
132
|
+
},
|
|
133
|
+
"version": "1.0.0",
|
|
134
|
+
},
|
|
135
|
+
"library-b": Object {
|
|
136
|
+
"name": "library-b",
|
|
137
|
+
"path": "node_modules/library-b",
|
|
138
|
+
"requiredBy": Object {
|
|
139
|
+
"testApp@1.0.0": "1.0.0",
|
|
140
|
+
},
|
|
141
|
+
"version": "1.0.0",
|
|
142
|
+
},
|
|
143
|
+
"react": Object {
|
|
144
|
+
"name": "react",
|
|
145
|
+
"path": "node_modules/react",
|
|
146
|
+
"requiredBy": Object {
|
|
147
|
+
"library-b@1.0.0": "18.0.0",
|
|
148
|
+
"testApp@1.0.0": "18.0.0",
|
|
149
|
+
},
|
|
150
|
+
"scopedVersions": Object {
|
|
151
|
+
"17.0.0": Object {
|
|
152
|
+
"name": "react",
|
|
153
|
+
"path": "node_modules/library-a/node_modules/react",
|
|
154
|
+
"requiredBy": Object {
|
|
155
|
+
"library-a@1.0.0": "17.0.0",
|
|
156
|
+
},
|
|
157
|
+
"version": "17.0.0",
|
|
158
|
+
},
|
|
159
|
+
},
|
|
160
|
+
"version": "18.0.0",
|
|
161
|
+
},
|
|
162
|
+
"testApp": Object {
|
|
163
|
+
"name": "testApp",
|
|
164
|
+
"path": "",
|
|
165
|
+
"requiredBy": Object {},
|
|
166
|
+
"version": "1.0.0",
|
|
167
|
+
},
|
|
168
|
+
}
|
|
169
|
+
`);
|
|
170
|
+
});
|
|
171
|
+
it('prefers react 17 because it is most used transient dependency', async () => {
|
|
172
|
+
const resolveMap = await createResolveMapSafe({
|
|
173
|
+
appPath: await constructDependencies([
|
|
174
|
+
'testApp',
|
|
175
|
+
'1.0.0',
|
|
176
|
+
[
|
|
177
|
+
['library-a', '1.0.0', [['react', '17.0.0', []]]],
|
|
178
|
+
['library-b', '1.0.0', [['react', '17.0.0', []]]],
|
|
179
|
+
['library-c', '1.0.0', [['react', '18.0.0', []]]],
|
|
180
|
+
],
|
|
181
|
+
]),
|
|
182
|
+
});
|
|
183
|
+
expect(resolveMap['react'].version).toBe('17.0.0');
|
|
184
|
+
});
|
|
185
|
+
it('prefers react 18 because it is an app dependency', async () => {
|
|
186
|
+
const resolveMap = await createResolveMapSafe({
|
|
187
|
+
appPath: await constructDependencies([
|
|
188
|
+
'testApp',
|
|
189
|
+
'1.0.0',
|
|
190
|
+
[
|
|
191
|
+
['library-a', '1.0.0', [['react', '17.0.0', []]]],
|
|
192
|
+
['library-b', '1.0.0', [['react', '17.0.0', []]]],
|
|
193
|
+
['react', '18.0.0', []],
|
|
194
|
+
],
|
|
195
|
+
]),
|
|
196
|
+
});
|
|
197
|
+
expect(resolveMap['react'].version).toBe('18.0.0');
|
|
198
|
+
});
|
|
199
|
+
it('can support monorepo scenarios and resolve the repo react version', async () => {
|
|
200
|
+
expect(await createResolveMapSafe({
|
|
201
|
+
appPath: path.join(testRepoPath, 'packages/app-with-installed-react'),
|
|
202
|
+
gitRootPath: testRepoPath,
|
|
203
|
+
})).toMatchInlineSnapshot(`
|
|
204
|
+
Object {
|
|
205
|
+
"app-with-installed-react": Object {
|
|
206
|
+
"name": "app-with-installed-react",
|
|
207
|
+
"path": "",
|
|
208
|
+
"requiredBy": Object {},
|
|
209
|
+
"version": "1.0.0",
|
|
210
|
+
},
|
|
211
|
+
"react": Object {
|
|
212
|
+
"name": "react",
|
|
213
|
+
"path": "../../node_modules/react",
|
|
214
|
+
"requiredBy": Object {
|
|
215
|
+
"app-with-installed-react@1.0.0": "999.0.0",
|
|
216
|
+
},
|
|
217
|
+
"version": "999.0.0",
|
|
218
|
+
},
|
|
219
|
+
}
|
|
220
|
+
`);
|
|
221
|
+
});
|
|
222
|
+
it('can throw when the monorepo is missing a semver required version of react using strict versioning checks', async () => {
|
|
223
|
+
expect(createResolveMapSafe({
|
|
224
|
+
appPath: path.join(testRepoPath, 'packages/app-with-missing-react'),
|
|
225
|
+
gitRootPath: testRepoPath,
|
|
226
|
+
strictVersioning: true,
|
|
227
|
+
})).rejects.toBeTruthy();
|
|
228
|
+
});
|
|
229
|
+
it(`can throw an error if a dependency is missing`, async () => {
|
|
230
|
+
expect(createResolveMapSafe({
|
|
231
|
+
appPath: testUninstalledProjectPath,
|
|
232
|
+
gitRootPath: testUninstalledProjectPath,
|
|
233
|
+
})).rejects.toBeTruthy();
|
|
234
|
+
});
|
|
235
|
+
it(`can throw an error if appPath doesn't exist`, async () => {
|
|
236
|
+
expect(createResolveMapSafe({ appPath: path.join(testUninstalledProjectPath, 'does-not-exist') })).rejects.toBeTruthy();
|
|
237
|
+
});
|
|
238
|
+
it(`can throw an error if appPath exists but is missing package.json`, () => {
|
|
239
|
+
expect(createResolveMapSafe({ appPath: currentPath })).rejects.toBeTruthy();
|
|
240
|
+
});
|
|
241
|
+
// In this test, react-dom has a peer dependency on react, and should be listed in requiredBy. Otherwise
|
|
242
|
+
// when react-dom imports react, it will use the app's version (which is not what we want.)
|
|
243
|
+
it(`can prefer react 16 but scope react 17`, async () => {
|
|
244
|
+
expect(await createResolveMapSafe({ appPath: testWithReact16Path, additionalPaths: [testWithReact17Path] })).toMatchSnapshot();
|
|
245
|
+
});
|
|
246
|
+
it(`can prefer react 17 but scope react 16`, async () => {
|
|
247
|
+
expect(await createResolveMapSafe({ appPath: testWithReact17Path, additionalPaths: [testWithReact16Path] })).toMatchSnapshot();
|
|
248
|
+
});
|
|
249
|
+
// it(`can prefer app dependencies that align with library semver requirements`, () => { });
|
|
250
|
+
it(`can fail with an unmet dependency`, () => {
|
|
251
|
+
expect(createResolveMapSafe({
|
|
252
|
+
appPath: testWithUnmetDependenciesPath,
|
|
253
|
+
gitRootPath: testWithUnmetDependenciesPath,
|
|
254
|
+
})).rejects.toBeTruthy();
|
|
255
|
+
});
|
|
256
|
+
// Because repos depend on things which have unmet peers, we have to avoid failing when we can't resolve them.
|
|
257
|
+
it(`can succeed with unmet peer dependencies`, async () => {
|
|
258
|
+
expect(await createResolveMapSafe({
|
|
259
|
+
appPath: testWithUnmetPeerDependenciesPath,
|
|
260
|
+
gitRootPath: testWithUnmetPeerDependenciesPath,
|
|
261
|
+
})).toMatchSnapshot();
|
|
262
|
+
});
|
|
36
263
|
});
|
|
37
264
|
//# sourceMappingURL=createResolveMap.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createResolveMap.test.js","sourceRoot":"","sources":["../src/createResolveMap.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"createResolveMap.test.js","sourceRoot":"","sources":["../src/createResolveMap.test.ts"],"names":[],"mappings":"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"}
|
package/lib/detectModuleType.js
CHANGED
|
@@ -24,6 +24,13 @@ export async function detectModuleTypeFromSource(source) {
|
|
|
24
24
|
* @returns "esm" | "cjs" | undefined
|
|
25
25
|
*/
|
|
26
26
|
export async function detectModuleType(filePath) {
|
|
27
|
-
|
|
27
|
+
let source;
|
|
28
|
+
try {
|
|
29
|
+
source = await (await readFile(filePath, 'utf8')).toString();
|
|
30
|
+
}
|
|
31
|
+
catch (e) {
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
return await detectModuleTypeFromSource(removeComments(source));
|
|
28
35
|
}
|
|
29
36
|
//# sourceMappingURL=detectModuleType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detectModuleType.js","sourceRoot":"","sources":["../src/detectModuleType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAEjC,SAAS,cAAc,CAAC,MAAc;IACpC,kDAAkD;IAClD,OAAO,MAAM,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,iBAAiB;AACjF,CAAC;AAID;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,MAAc;IAC7D,IAAI,MAA8B,CAAC;IAEnC,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvC,IACE,OAAO,CAAC,KAAK,CACX,wGAAwG,CACzG,EACD;QACA,MAAM,GAAG,KAAK,CAAC;KAChB;SAAM,IAAI,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,EAAE;QAClE,MAAM,GAAG,KAAK,CAAC;KAChB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAAgB;IACrD,
|
|
1
|
+
{"version":3,"file":"detectModuleType.js","sourceRoot":"","sources":["../src/detectModuleType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAEjC,SAAS,cAAc,CAAC,MAAc;IACpC,kDAAkD;IAClD,OAAO,MAAM,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,iBAAiB;AACjF,CAAC;AAID;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,MAAc;IAC7D,IAAI,MAA8B,CAAC;IAEnC,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvC,IACE,OAAO,CAAC,KAAK,CACX,wGAAwG,CACzG,EACD;QACA,MAAM,GAAG,KAAK,CAAC;KAChB;SAAM,IAAI,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,EAAE;QAClE,MAAM,GAAG,KAAK,CAAC;KAChB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAAgB;IACrD,IAAI,MAAc,CAAC;IAEnB,IAAI;QACF,MAAM,GAAG,MAAM,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;KAC9D;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,MAAM,0BAA0B,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;AAClE,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { fileURLToPath } from 'url';
|
|
2
|
+
import { detectModuleType, detectModuleTypeFromSource } from './detectModuleType.js';
|
|
3
|
+
import path from 'path';
|
|
4
|
+
const currentPath = path.dirname(fileURLToPath(import.meta.url));
|
|
2
5
|
describe('detectModuleTypeFromSource', () => {
|
|
3
6
|
it('can detect imports mean esm', async () => {
|
|
4
7
|
expect(await detectModuleTypeFromSource(`import react from 'react';`)).toBe('esm');
|
|
@@ -18,5 +21,8 @@ describe('detectModuleTypeFromSource', () => {
|
|
|
18
21
|
it('can detect no modules', async () => {
|
|
19
22
|
expect(await detectModuleTypeFromSource(`const hello = 'hello';`)).toBeUndefined();
|
|
20
23
|
});
|
|
24
|
+
it('can return undefined for missing source', async () => {
|
|
25
|
+
expect(await detectModuleType(path.join(currentPath, 'does-not-exist.js'))).toBeUndefined();
|
|
26
|
+
});
|
|
21
27
|
});
|
|
22
28
|
//# sourceMappingURL=detectModuleType.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detectModuleType.test.js","sourceRoot":"","sources":["../src/detectModuleType.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"detectModuleType.test.js","sourceRoot":"","sources":["../src/detectModuleType.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjE,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,MAAM,0BAA0B,CAAC,4BAA4B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,MAAM,0BAA0B,CAAC,2BAA2B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,CAAC,MAAM,0BAA0B,CAAC,8BAA8B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,MAAM,0BAA0B,CAAC,yBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,CAAC,MAAM,0BAA0B,CAAC,0DAA0D,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACrC,MAAM,CAAC,MAAM,0BAA0B,CAAC,wBAAwB,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACrF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IAC9F,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -129,8 +129,8 @@ export async function evaluateImportsFromEntries(entries, resolveMap, allExports
|
|
|
129
129
|
count: 0,
|
|
130
130
|
};
|
|
131
131
|
}
|
|
132
|
-
if (fs.existsSync(fullPath)) {
|
|
133
|
-
importDefinition.import =
|
|
132
|
+
if (fullPath && fs.existsSync(fullPath)) {
|
|
133
|
+
importDefinition.import = relativeImportPath;
|
|
134
134
|
addEntry(fullPath);
|
|
135
135
|
}
|
|
136
136
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluateImportsFromEntries.js","sourceRoot":"","sources":["../src/evaluateImportsFromEntries.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"evaluateImportsFromEntries.js","sourceRoot":"","sources":["../src/evaluateImportsFromEntries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,WAAkC,MAAM,eAAe,CAAC;AAE/D,OAAO,WAA8B,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAEjC,8DAA8D;AAC9D,MAAM,QAAQ,GAAI,WAAmB,CAAC,OAAc,CAAC;AAgBrD,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAExE,SAAS,aAAa,CAAC,UAAkB;IACvC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAE7C,IAAI,CAAC,WAAW,EAAE;QAChB,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE;YAClC,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,GAAG,GAAG,CAAC,EAAE;gBACnC,OAAO,UAAU,GAAG,GAAG,CAAC;aACzB;SACF;KACF;SAAM,IAAI,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;QACrD,OAAO,UAAU,CAAC;KACnB;AACH,CAAC;AAWD,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,OAAiB,EACjB,UAAuB,EACvB,aAA6B,EAAE;IAE/B,MAAM,iBAAiB,GAAa,CAAC,GAAG,OAAO,CAAC,CAAC;IACjD,MAAM,YAAY,GAAgB,IAAI,GAAG,EAAE,CAAC;IAC5C,MAAM,QAAQ,GAAG,CAAC,QAAgB,EAAE,EAAE;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE;YAC/E,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAClC;IACH,CAAC,CAAC;IACF,MAAM,KAAK,GAAoC;QAC7C,iBAAiB,EAAE,CAAC;QACpB,WAAW,EAAE,EAAE;QACf,aAAa,EAAE,CAAC;QAChB,cAAc,EAAE,CAAC;QACjB,kBAAkB,EAAE,EAAE;QACtB,wBAAwB,EAAE,EAAE;KAC7B,CAAC;IAEF,+CAA+C;IAC/C,OAAO,iBAAiB,CAAC,MAAM,EAAE;QAC/B,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,EAAY,CAAC;QAElD,OAAO,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,MAAM,YAAY,KAAK,EAAE,CAAC,CAAC;QAC5D,IAAI,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC3B,SAAS;SACV;QAED,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAExB,6BAA6B;QAC7B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE9C,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,IAAI;YACF,MAAM,OAAO,GAAmB;gBAC9B,YAAY;gBACZ,mBAAmB;gBACnB,kBAAkB;gBAClB,kBAAkB;gBAClB,2BAA2B;aAC5B,CAAC;YACF,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;YAEjE,IAAI,KAAK,EAAE;gBACT,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACrB;YAED,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE;gBACrC,UAAU,EAAE,aAAa;gBACzB,OAAO;aACR,CAAC,CAAC;YAEH,QAAQ,CAAC,GAAG,EAAE;gBACZ,iBAAiB,CAAC,OAAoC;oBACpD,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE;wBACvB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;qBAC/C;gBACH,CAAC;gBACD,iBAAiB,CAAC,OAAoC;oBACpD,8DAA8D;oBAC9D,IAAK,OAAO,CAAC,IAAY,CAAC,MAAM,EAAE;wBAChC,8DAA8D;wBAC9D,YAAY,CAAC,IAAI,CAAE,OAAO,CAAC,IAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;qBACxD;gBACH,CAAC;gBACD,cAAc,CAAC,OAAiC;oBAC9C,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE;wBACzC,8DAA8D;wBAC9D,YAAY,CAAC,IAAI,CAAE,OAAO,CAAC,IAAI,CAAC,SAAiB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;qBAC7D;gBACH,CAAC;aACF,CAAC,CAAC;YAEH,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC1B,8DAA8D;SAC/D;QAAC,OAAO,CAAM,EAAE;YACf,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;SAClD;QAED,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,IAAI,WAAW,EAAE;gBACf,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;oBAC1B,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;oBACnE,IAAI,WAAW,CAAC;oBAEhB,kBAAkB;oBAClB,MAAM,eAAe,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,UAAU,CAAC;oBAE9D,mBAAmB;oBACnB,IAAI;wBACF,WAAW,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;qBAC/D;oBAAC,OAAO,CAAC,EAAE;wBACV,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;wBAElE,OAAO,CAAC,GAAG,CAAC,sBAAsB,WAAW,WAAW,KAAK,GAAG,CAAC,CAAC;qBACnE;oBAED,IAAI,WAAW,EAAE;wBACf,MAAM,OAAO,GAAG,CAAC,MAAM,oBAAoB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,EAAE,OAAO,IAAI,SAAS,CAAC;wBAEtF,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE;4BACvC,KAAK,CAAC,cAAc,EAAE,CAAC;yBACxB;wBAED,MAAM,UAAU,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;wBAC7E,MAAM,UAAU,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;wBAErE,0EAA0E;wBAC1E,MAAM,kBAAkB,GAAG,MAAM,4BAA4B,CAAC,WAAW,EAAE,UAAU,EAAE;4BACrF,YAAY,EAAE,IAAI;yBACnB,CAAC,CAAC;wBACH,MAAM,QAAQ,GAAG,kBAAkB,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;wBAElF,IAAI,gBAAgB,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;wBAEnD,IAAI,CAAC,gBAAgB,EAAE;4BACrB,KAAK,CAAC,aAAa,EAAE,CAAC;4BACtB,gBAAgB,GAAG,UAAU,CAAC,eAAe,CAAC,GAAG;gCAC/C,MAAM,EAAE,SAAS;gCACjB,KAAK,EAAE,CAAC;6BACT,CAAC;yBACH;wBAED,IAAI,QAAQ,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;4BACvC,gBAAgB,CAAC,MAAM,GAAG,kBAAkB,CAAC;4BAC7C,QAAQ,CAAC,QAAQ,CAAC,CAAC;yBACpB;6BAAM;4BACL,KAAK,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;4BAC1F,OAAO,CAAC,GAAG,CAAC,sBAAsB,WAAW,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,KAAK,GAAG,CAAC,CAAC;yBAC1G;wBAED,gBAAgB,CAAC,KAAK,EAAE,CAAC;qBAC1B;iBACF;qBAAM;oBACL,gBAAgB;oBAChB,4CAA4C;oBAC5C,MAAM,kBAAkB,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;oBAEzF,IAAI,kBAAkB,EAAE;wBACtB,iEAAiE;wBACjE,QAAQ,CAAC,kBAAkB,CAAC,CAAC;qBAC9B;iBACF;aACF;SACF;KACF;IAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAEnB,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;AACxC,CAAC"}
|
package/lib/findPackagePath.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function findPackagePath(dependencyName: string, cwd: string): string
|
|
1
|
+
export declare function findPackagePath(dependencyName: string, versionRequirement: string | undefined, cwd: string, gitRootPath?: string, isOptional?: boolean): Promise<string | undefined>;
|
package/lib/findPackagePath.js
CHANGED
|
@@ -1,14 +1,22 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import fs from 'fs';
|
|
3
|
-
|
|
3
|
+
import semver from 'semver';
|
|
4
|
+
import { getPackageDefinition } from './getPackageDefinition.js';
|
|
5
|
+
const { realpath } = fs.promises;
|
|
6
|
+
export async function findPackagePath(dependencyName, versionRequirement, cwd, gitRootPath, isOptional) {
|
|
4
7
|
let packagePath = cwd;
|
|
5
|
-
|
|
8
|
+
do {
|
|
6
9
|
const resolvedPath = path.join(packagePath, 'node_modules', dependencyName);
|
|
7
|
-
|
|
8
|
-
|
|
10
|
+
const definition = await getPackageDefinition(resolvedPath, true);
|
|
11
|
+
if (definition?.version && (!versionRequirement || semver.satisfies(definition.version, versionRequirement))) {
|
|
12
|
+
return await realpath(resolvedPath);
|
|
9
13
|
}
|
|
14
|
+
// We haven't found it. Try to move up a directory.
|
|
10
15
|
packagePath = path.dirname(packagePath);
|
|
16
|
+
} while ((!gitRootPath || packagePath.length >= gitRootPath.length) && path.dirname(packagePath) !== packagePath);
|
|
17
|
+
if (!isOptional) {
|
|
18
|
+
throw new Error(`Could not resolve dependency "${dependencyName}@${versionRequirement}" from "${cwd}"`);
|
|
11
19
|
}
|
|
12
|
-
|
|
20
|
+
return undefined;
|
|
13
21
|
}
|
|
14
22
|
//# sourceMappingURL=findPackagePath.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findPackagePath.js","sourceRoot":"","sources":["../src/findPackagePath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"findPackagePath.js","sourceRoot":"","sources":["../src/findPackagePath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAEjC,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,cAAsB,EACtB,kBAAsC,EACtC,GAAW,EACX,WAAoB,EACpB,UAAoB;IAEpB,IAAI,WAAW,GAAG,GAAG,CAAC;IAEtB,GAAG;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAElE,IAAI,UAAU,EAAE,OAAO,IAAI,CAAC,CAAC,kBAAkB,IAAI,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,EAAE;YAC5G,OAAO,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC;SACrC;QAED,mDAAmD;QACnD,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;KACzC,QAAQ,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,WAAW,EAAE;IAElH,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,iCAAiC,cAAc,IAAI,kBAAkB,WAAW,GAAG,GAAG,CAAC,CAAC;KACzG;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { PackageJson } from 'type-fest';
|
|
2
2
|
/**
|
|
3
3
|
* Given an export map entry, return the esm entry string value. (Parses arrays, maps, has a fallback system.)
|
|
4
4
|
*/
|
|
5
|
-
export declare function getExportPathFromEntry(exportEntry:
|
|
5
|
+
export declare function getExportPathFromEntry(exportEntry: PackageJson['exports'], importPath?: string, conditions?: string[]): string | undefined;
|
|
@@ -1,27 +1,33 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Given an export map entry, return the esm entry string value. (Parses arrays, maps, has a fallback system.)
|
|
3
3
|
*/
|
|
4
|
-
export function getExportPathFromEntry(exportEntry) {
|
|
4
|
+
export function getExportPathFromEntry(exportEntry, importPath = '.', conditions = ['browser', 'import', 'default']) {
|
|
5
5
|
let exportPath = undefined;
|
|
6
6
|
if (exportEntry) {
|
|
7
7
|
if (typeof exportEntry === 'string') {
|
|
8
|
-
|
|
8
|
+
return exportEntry;
|
|
9
9
|
}
|
|
10
10
|
else if (typeof exportEntry === 'object') {
|
|
11
11
|
if (Array.isArray(exportEntry)) {
|
|
12
|
-
for (const
|
|
13
|
-
|
|
14
|
-
if (
|
|
15
|
-
exportPath
|
|
16
|
-
break;
|
|
12
|
+
for (const item of exportEntry) {
|
|
13
|
+
exportPath = getExportPathFromEntry(item, importPath, conditions);
|
|
14
|
+
if (exportPath) {
|
|
15
|
+
return exportPath;
|
|
17
16
|
}
|
|
18
17
|
}
|
|
19
18
|
}
|
|
20
19
|
else {
|
|
21
|
-
|
|
20
|
+
for (const [key, value] of Object.entries(exportEntry)) {
|
|
21
|
+
if (conditions.includes(key) || key === importPath) {
|
|
22
|
+
exportPath = getExportPathFromEntry(value, importPath, conditions);
|
|
23
|
+
if (exportPath) {
|
|
24
|
+
return exportPath;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
}
|
|
22
28
|
}
|
|
23
29
|
}
|
|
24
30
|
}
|
|
25
|
-
return
|
|
31
|
+
return undefined;
|
|
26
32
|
}
|
|
27
33
|
//# sourceMappingURL=getExportPathFromEntry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExportPathFromEntry.js","sourceRoot":"","sources":["../src/getExportPathFromEntry.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,
|
|
1
|
+
{"version":3,"file":"getExportPathFromEntry.js","sourceRoot":"","sources":["../src/getExportPathFromEntry.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,WAAmC,EACnC,UAAU,GAAG,GAAG,EAChB,UAAU,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC;IAE7C,IAAI,UAAU,GAAG,SAAS,CAAC;IAE3B,IAAI,WAAW,EAAE;QACf,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YACnC,OAAO,WAAW,CAAC;SACpB;aAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YAC1C,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBAC9B,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;oBAC9B,UAAU,GAAG,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;oBAClE,IAAI,UAAU,EAAE;wBACd,OAAO,UAAU,CAAC;qBACnB;iBACF;aACF;iBAAM;gBACL,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;oBACtD,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,UAAU,EAAE;wBAClD,UAAU,GAAG,sBAAsB,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;wBACnE,IAAI,UAAU,EAAE;4BACd,OAAO,UAAU,CAAC;yBACnB;qBACF;iBACF;aACF;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -24,13 +24,15 @@ describe('getExportPathFromEntry', () => {
|
|
|
24
24
|
require: 'require',
|
|
25
25
|
})).toEqual('default');
|
|
26
26
|
});
|
|
27
|
-
it('
|
|
28
|
-
expect(getExportPathFromEntry(
|
|
29
|
-
{
|
|
30
|
-
|
|
31
|
-
|
|
27
|
+
it('can find a specific path entry', () => {
|
|
28
|
+
expect(getExportPathFromEntry({
|
|
29
|
+
'.': {
|
|
30
|
+
import: './lib/index.js',
|
|
31
|
+
},
|
|
32
|
+
'./foo': {
|
|
33
|
+
import: './lib/foo.js',
|
|
32
34
|
},
|
|
33
|
-
|
|
35
|
+
}, './foo')).toEqual('./lib/foo.js');
|
|
34
36
|
});
|
|
35
37
|
});
|
|
36
38
|
//# sourceMappingURL=getExportPathFromEntry.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExportPathFromEntry.test.js","sourceRoot":"","sources":["../src/getExportPathFromEntry.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CACJ,sBAAsB,CAAC;YACrB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,CACJ,sBAAsB,CAAC;YACrB,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,CACJ,sBAAsB,CAAC;YACrB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"getExportPathFromEntry.test.js","sourceRoot":"","sources":["../src/getExportPathFromEntry.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CACJ,sBAAsB,CAAC;YACrB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,CACJ,sBAAsB,CAAC;YACrB,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,CACJ,sBAAsB,CAAC;YACrB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,CACJ,sBAAsB,CACpB;YACE,GAAG,EAAE;gBACH,MAAM,EAAE,gBAAgB;aACzB;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,cAAc;aACvB;SACF,EACD,OAAO,CACR,CACF,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { PackageJson } from 'type-fest';
|
|
2
2
|
export declare type PackageReference = {
|
|
3
3
|
name: string;
|
|
4
4
|
version: string;
|
|
@@ -41,4 +41,4 @@ export declare type InstalledPackagesResult = {
|
|
|
41
41
|
* }
|
|
42
42
|
*
|
|
43
43
|
*/
|
|
44
|
-
export declare function getInstalledPackages(appPaths: string | string[], installedPackages?: InstalledPackagesResult['installedPackages'], ancestors?: PackageReference[], visited?: Record<string,
|
|
44
|
+
export declare function getInstalledPackages(appPaths: string | string[], installedPackages?: InstalledPackagesResult['installedPackages'], ancestors?: PackageReference[], visited?: Record<string, PackageJson>): Promise<InstalledPackagesResult>;
|
|
@@ -26,7 +26,7 @@ export async function getInstalledPackages(appPaths, installedPackages = {}, anc
|
|
|
26
26
|
appPaths = Array.isArray(appPaths) ? appPaths : [appPaths];
|
|
27
27
|
for (const appPath of appPaths) {
|
|
28
28
|
const definition = await getPackageDefinition(appPath, true);
|
|
29
|
-
if (definition?.dependencies) {
|
|
29
|
+
if (definition?.dependencies && definition.name && definition.version) {
|
|
30
30
|
for (const [dependencyName, requiredVersion] of Object.entries(definition.dependencies)) {
|
|
31
31
|
// Grab the path to the dependency.
|
|
32
32
|
const dependencyPath = await resolve(dependencyName, appPath);
|
|
@@ -36,7 +36,7 @@ export async function getInstalledPackages(appPaths, installedPackages = {}, anc
|
|
|
36
36
|
if (!dependencyDefinition) {
|
|
37
37
|
throw new Error(`Unable to resolve dependency at path "${dependencyPath}"`);
|
|
38
38
|
}
|
|
39
|
-
const { version: dependencyVersion } = dependencyDefinition;
|
|
39
|
+
const { version: dependencyVersion = '' } = dependencyDefinition;
|
|
40
40
|
// Ensure that the entry in the results is initialized.
|
|
41
41
|
installedPackages[dependencyName] = installedPackages[dependencyName] || {};
|
|
42
42
|
installedPackages[dependencyName][dependencyVersion] = installedPackages[dependencyName][dependencyVersion] || {
|
|
@@ -56,8 +56,8 @@ export async function getInstalledPackages(appPaths, installedPackages = {}, anc
|
|
|
56
56
|
await getInstalledPackages(dependencyPath, installedPackages, [
|
|
57
57
|
...ancestors,
|
|
58
58
|
{
|
|
59
|
-
name:
|
|
60
|
-
version:
|
|
59
|
+
name: dependencyName,
|
|
60
|
+
version: dependencyVersion,
|
|
61
61
|
},
|
|
62
62
|
], visited);
|
|
63
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInstalledPackages.js","sourceRoot":"","sources":["../src/getInstalledPackages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getInstalledPackages.js","sourceRoot":"","sources":["../src/getInstalledPackages.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
} | ExportsEntry[];
|
|
4
|
-
export declare type PackageDefinition = {
|
|
5
|
-
name: string;
|
|
6
|
-
version: string;
|
|
7
|
-
main?: string;
|
|
8
|
-
module?: string;
|
|
9
|
-
exports?: ExportsEntry;
|
|
10
|
-
/**
|
|
11
|
-
* @deprecated - Don't use this.
|
|
12
|
-
*/
|
|
13
|
-
browser?: string | Record<string, string>;
|
|
14
|
-
scripts?: Record<string, string>;
|
|
15
|
-
dependencies?: Record<string, string>;
|
|
16
|
-
devDependencies?: Record<string, string>;
|
|
17
|
-
};
|
|
18
|
-
export declare function getPackageDefinition(appPath: string, useCache?: boolean): Promise<PackageDefinition | undefined>;
|
|
1
|
+
import type { PackageJson } from 'type-fest';
|
|
2
|
+
export declare function getPackageDefinition(appPath: string, useCache?: boolean): Promise<PackageJson | undefined>;
|
|
19
3
|
/**
|
|
20
4
|
* Updates a package definition and the cache we use for them.
|
|
21
5
|
*/
|
|
22
|
-
export declare function updatePackageDefinition(appPath: string, definition:
|
|
6
|
+
export declare function updatePackageDefinition(appPath: string, definition: PackageJson): Promise<void>;
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import fs from 'fs';
|
|
2
1
|
import path from 'path';
|
|
3
|
-
|
|
2
|
+
import { applyOverrides } from '@ms-cloudpack/package-overrides';
|
|
3
|
+
import { readJson, writeJson } from '@ms-cloudpack/json-utilities';
|
|
4
4
|
const defs = {};
|
|
5
5
|
export async function getPackageDefinition(appPath, useCache) {
|
|
6
6
|
if (appPath) {
|
|
7
7
|
try {
|
|
8
8
|
return (defs[appPath] =
|
|
9
|
-
(useCache && defs[appPath]) ||
|
|
9
|
+
(useCache && defs[appPath]) ||
|
|
10
|
+
applyOverrides((await readJson(path.join(appPath, 'package.json')))));
|
|
10
11
|
}
|
|
11
12
|
catch (e) {
|
|
12
13
|
/* no-op */
|
|
@@ -19,7 +20,7 @@ export async function getPackageDefinition(appPath, useCache) {
|
|
|
19
20
|
*/
|
|
20
21
|
export async function updatePackageDefinition(appPath, definition) {
|
|
21
22
|
if (appPath) {
|
|
22
|
-
await
|
|
23
|
+
await writeJson(path.join(appPath, 'package.json'), definition);
|
|
23
24
|
defs[appPath] = definition;
|
|
24
25
|
}
|
|
25
26
|
}
|