-
Notifications
You must be signed in to change notification settings - Fork 304
69 lines (69 loc) · 3.17 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
diff --git a/package.json b/package.json
index 930c1ca9954777dd1492a9e2373029d4644804cc..01e709cffb2a100bc6b0089edf91527d35b1b7fd 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
"ignore": "^5.0.4",
"ini": "^2.0.0",
"npm-packlist": "^2.1.5",
+ "yaml": "2.6.1",
"yargs": "^16.1.1"
},
"devDependencies": {
diff --git a/src/copy.js b/src/copy.js
index 3a6dca7b7a6ffde2527e7866f923c56f7d7061b8..19ac807a17779219800a0230b0620a5dfd4c641d 100644
--- a/src/copy.js
+++ b/src/copy.js
@@ -56,6 +56,7 @@ var fs_extra_1 = __importDefault(require("fs-extra"));
var ignore_1 = __importDefault(require("ignore"));
var npm_packlist_1 = __importDefault(require("npm-packlist"));
var path_1 = require("path");
+var yaml_1 = require("yaml");
var _1 = require(".");
var _2 = require(".");
var shortSignatureLength = 8;
@@ -120,6 +121,19 @@ var resolveWorkspaceDepVersion = function (version, pkgName, workingDir) {
return '*';
}
};
+var resolveCatalogDepVersion = function (subCatalog, pkgName, workingDir) {
+ var _a;
+ var workspaceFilePath = path_1.join(workingDir, '../../pnpm-workspace.yaml');
+ var workspaceContent = fs_extra_1.default.readFileSync(workspaceFilePath, 'utf8');
+ var workspaceYaml = yaml_1.parse(workspaceContent);
+ if (!workspaceYaml) {
+ console.warn('Could not find pnpm-workspace.yaml in the working directory.');
+ }
+ var packages = subCatalog && subCatalog.length > 0
+ ? ((_a = workspaceYaml === null || workspaceYaml === void 0 ? void 0 : workspaceYaml.catalogs) === null || _a === void 0 ? void 0 : _a[subCatalog]) || []
+ : (workspaceYaml === null || workspaceYaml === void 0 ? void 0 : workspaceYaml.catalog) || [];
+ return packages[pkgName] || '*';
+};
var resolveWorkspaces = function (pkg, workingDir) {
var resolveDeps = function (deps) {
return deps
@@ -130,6 +144,12 @@ var resolveWorkspaces = function (pkg, workingDir) {
console.log("Resolving workspace package " + depPkgName + " version ==> " + resolved);
return resolved;
}
+ if (val.startsWith('catalog:')) {
+ var subCatalog = val.split(':')[1];
+ var resolved = resolveCatalogDepVersion(subCatalog, depPkgName, workingDir);
+ console.log("Resolving catalog package " + depPkgName + " version ==> " + resolved);
+ return resolved;
+ }
return val;
})
: deps;
@@ -160,9 +180,9 @@ exports.copyPackageToStore = function (options) { return __awaiter(void 0, void
case 2:
npmList = _c.sent();
filesToCopy = npmList.filter(function (f) { return !ignoreRule.ignores(f); });
- if (options.files) {
+ if (options.content) {
console.info('Files included in published content:');
- filesToCopy.forEach(function (f) {
+ filesToCopy.sort().forEach(function (f) {
console.log("- " + f);
});
console.info("Total " + filesToCopy.length + " files.");