@unisphere/cli 1.55.0 → 1.56.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/package.json +2 -2
- package/src/lib/commands/language/serve-command.js.map +1 -1
- package/src/lib/utils/unisphere/build-unisphere-elements.js +18 -0
- package/src/lib/utils/unisphere/build-unisphere-elements.js.map +1 -1
- package/src/lib/utils/unisphere/fix-package-dist-package-json.js +29 -19
- package/src/lib/utils/unisphere/fix-package-dist-package-json.js.map +1 -1
- package/src/lib/utils/unisphere/get-dependency-graph.d.ts +8 -0
- package/src/lib/utils/unisphere/get-dependency-graph.js +87 -0
- package/src/lib/utils/unisphere/get-dependency-graph.js.map +1 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unisphere/cli",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.56.0",
|
|
4
4
|
"bin": {
|
|
5
5
|
"unisphere": "./src/cli.js"
|
|
6
6
|
},
|
|
@@ -62,7 +62,6 @@
|
|
|
62
62
|
"@octokit/rest": "19.0.5",
|
|
63
63
|
"decompress": "4.2.1",
|
|
64
64
|
"csvtojson": "2.0.10",
|
|
65
|
-
"express": "5.1.0",
|
|
66
65
|
"archiver": "5.3.2",
|
|
67
66
|
"fast-glob": "3.2.12",
|
|
68
67
|
"watchpack": "2.4.0",
|
|
@@ -72,6 +71,7 @@
|
|
|
72
71
|
"sisteransi": "1.0.5",
|
|
73
72
|
"readline": "1.3.0",
|
|
74
73
|
"events": "3.3.0",
|
|
74
|
+
"express": "5.1.0",
|
|
75
75
|
"tslib": "2.4.1"
|
|
76
76
|
},
|
|
77
77
|
"peerDependencies": {}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-command.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/commands/language/serve-command.ts"],"names":[],"mappings":";;;;AACA,iCAA0B;AAC1B,6CAAqD;
|
|
1
|
+
{"version":3,"file":"serve-command.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/commands/language/serve-command.ts"],"names":[],"mappings":";;;;AACA,iCAA0B;AAC1B,6CAAqD;AACrD,iEAA6D;AAE7D,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,2BAA2B,CAAC,CAAC;AAE1C,MAAM,kBAAkB,GAAG,CAAC,aAAsB,EAAW,EAAE;IACpE,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/C,OAAO;SACJ,WAAW,CAAC,iBAAiB,CAAC;SAC9B,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,KAAK,CAAC;SAC/C,MAAM,CAAC,cAAc,EAAE,uBAAuB,CAAC;SAC/C,MAAM,CAAC,SAAS,EAAE,qBAAqB,CAAC;SACxC,MAAM,CAAC,eAAe,EAAE,kCAAkC,CAAC;SAC3D,IAAI,CAAC,WAAW,EAAE,wBAAgB,CAAC;SACnC,MAAM,CACL,CAAO,OAMN,EAAE,EAAE;QACH,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAC9C,MAAM,gBAAgB,GAAG,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,IAAI,MAAM,CAAC;QAEjC,MAAM,IAAA,gCAAc,EAAC;YACnB,OAAO;YACP,GAAG,EAAE,gBAAgB;YACrB,IAAI,EAAE,SAAS;SAChB,CAAC,CAAC;IACL,CAAC,CAAA,CACF,CAAC;IAEJ,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AA/BW,QAAA,kBAAkB,sBA+B7B"}
|
|
@@ -7,6 +7,7 @@ const create_exec_task_1 = require("../listr2/create-exec-task");
|
|
|
7
7
|
const defaults_1 = require("../listr2/defaults");
|
|
8
8
|
const get_project_config_files_1 = require("./get-project-config-files");
|
|
9
9
|
const debug_1 = require("debug");
|
|
10
|
+
const get_dependency_graph_1 = require("./get-dependency-graph");
|
|
10
11
|
const write_json_file_1 = require("../write-json-file");
|
|
11
12
|
const fix_package_dist_package_json_1 = require("./fix-package-dist-package-json");
|
|
12
13
|
const fs = require("fs");
|
|
@@ -55,6 +56,23 @@ const createListrForBuildingUnispherePackage = (_a) => tslib_1.__awaiter(void 0,
|
|
|
55
56
|
cwd,
|
|
56
57
|
env: (0, exports.getUnisphereEnv)(production, 'package'),
|
|
57
58
|
}),
|
|
59
|
+
{
|
|
60
|
+
title: 'Ensure valid direct and transient dependencies',
|
|
61
|
+
task: () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
62
|
+
const shouldAllowReact = nxProjectName.endsWith('-react');
|
|
63
|
+
if (shouldAllowReact) {
|
|
64
|
+
debug('project is targeting react, skipping dependency check for %s', nxProjectName);
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
debug('project is not targeting react, checking dependencies to react for %s', nxProjectName);
|
|
68
|
+
const { notAllowed } = yield (0, get_dependency_graph_1.getDependencyGraphAndFilteredDeps)(cwd, projectPath, ['*react*', '@mui/*', '@kaltura/ds*']);
|
|
69
|
+
if (notAllowed.length > 0) {
|
|
70
|
+
debug('not allowed dependencies: %s', notAllowed.join(', '));
|
|
71
|
+
const message = `package ${nxProjectName} should not have a dependency on react as it is not targeting react framework (only packages ending with -react are allowed to have react dependencies)`;
|
|
72
|
+
throw new Error(message);
|
|
73
|
+
}
|
|
74
|
+
}),
|
|
75
|
+
},
|
|
58
76
|
{
|
|
59
77
|
title: 'Copy language files',
|
|
60
78
|
task: (ctx, task) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-unisphere-elements.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/utils/unisphere/build-unisphere-elements.ts"],"names":[],"mappings":";;;;AACA,6BAA8B;AAC9B,iEAA4D;AAC5D,iDAA4D;AAE5D,yEAAmE;AACnE,iCAA0B;AAC1B,wDAAmD;AACnD,mFAAqE;AACrE,yBAAyB;AAEzB,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,2BAA2B,CAAC,CAAC;AAE1C,MAAM,sCAAsC,GAAG,KAoBnD,EAAE,oDApBwD,EAC3D,GAAG,EACH,aAAa,EACb,UAAU,EACV,IAAI,EACJ,OAAO,EACP,UAAU,EACV,QAAQ,EACR,WAAW,EACX,GAAG,GAAG,EAAE,GAWT;IACC,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,GAAG,GAAG,aAAa,CAAC;IAElE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAC/B,GAAG,EACH,yBAAyB,EACzB,WAAW,CACZ,CAAC;IACF,6CAA6C;IAC7C,OAAO,UAAU,CAAC,QAAQ,CACxB;QACE,IAAA,iCAAc,EAAC;YACb,KAAK,EAAE,0BAA0B;YACjC,OAAO,EAAE,kBAAkB;YAC3B,GAAG;SACJ,CAAC;QACF,IAAA,iCAAc,EAAC;YACb,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI;YACjB,KAAK,EAAE,cAAc;YACrB,OAAO,EAAE,cAAc,aAAa,
|
|
1
|
+
{"version":3,"file":"build-unisphere-elements.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/utils/unisphere/build-unisphere-elements.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ function findWorkspaceLibraries(dir) {
|
|
|
28
28
|
}
|
|
29
29
|
function fixPackageDistJson(targetPath) {
|
|
30
30
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
31
|
-
var _a, _b;
|
|
31
|
+
var _a, _b, _c, _d, _e, _f;
|
|
32
32
|
debug(`Fixing package.json in ${targetPath}`);
|
|
33
33
|
if (!targetPath) {
|
|
34
34
|
throw new Error('Target path is required');
|
|
@@ -61,8 +61,13 @@ function fixPackageDistJson(targetPath) {
|
|
|
61
61
|
const bundledDependencies = require(path.join(__dirname, '../../../../bundler/package/bundled-dependencies.js'));
|
|
62
62
|
// Remove bundled dependencies from peerDependencies
|
|
63
63
|
bundledDependencies.forEach((dep) => {
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
var _a, _b;
|
|
65
|
+
if ((_a = packageJson.peerDependencies) === null || _a === void 0 ? void 0 : _a[dep]) {
|
|
66
|
+
delete packageJson.peerDependencies[dep];
|
|
67
|
+
}
|
|
68
|
+
if ((_b = packageJson.dependencies) === null || _b === void 0 ? void 0 : _b[dep]) {
|
|
69
|
+
delete packageJson.dependencies[dep];
|
|
70
|
+
}
|
|
66
71
|
});
|
|
67
72
|
// Extract React major version and create version range
|
|
68
73
|
let expectedReactVersion = '';
|
|
@@ -78,40 +83,45 @@ function fixPackageDistJson(targetPath) {
|
|
|
78
83
|
}
|
|
79
84
|
if (expectedReactVersion) {
|
|
80
85
|
// Set React peer dependency version range
|
|
81
|
-
if (packageJson.peerDependencies['react']) {
|
|
86
|
+
if ((_c = packageJson.peerDependencies) === null || _c === void 0 ? void 0 : _c['react']) {
|
|
82
87
|
packageJson.peerDependencies['react'] = expectedReactVersion;
|
|
83
88
|
}
|
|
84
|
-
if (packageJson.dependencies['react']) {
|
|
89
|
+
if ((_d = packageJson.dependencies) === null || _d === void 0 ? void 0 : _d['react']) {
|
|
85
90
|
packageJson.dependencies['react'] = expectedReactVersion;
|
|
86
91
|
}
|
|
87
92
|
// Set React DOM version range (same as React)
|
|
88
|
-
if (packageJson.peerDependencies['react-dom']) {
|
|
93
|
+
if ((_e = packageJson.peerDependencies) === null || _e === void 0 ? void 0 : _e['react-dom']) {
|
|
89
94
|
packageJson.peerDependencies['react-dom'] = expectedReactVersion;
|
|
90
95
|
}
|
|
91
|
-
if (packageJson.dependencies['react-dom']) {
|
|
96
|
+
if ((_f = packageJson.dependencies) === null || _f === void 0 ? void 0 : _f['react-dom']) {
|
|
92
97
|
packageJson.dependencies['react-dom'] = expectedReactVersion;
|
|
93
98
|
}
|
|
94
99
|
}
|
|
95
100
|
// Update workspace package versions
|
|
96
101
|
workspacePackages.forEach((pkg) => {
|
|
97
|
-
|
|
102
|
+
var _a, _b;
|
|
103
|
+
if ((_a = packageJson.peerDependencies) === null || _a === void 0 ? void 0 : _a[pkg.name]) {
|
|
98
104
|
packageJson.peerDependencies[pkg.name] = pkg.version;
|
|
99
105
|
}
|
|
100
|
-
if (packageJson.dependencies[pkg.name]) {
|
|
106
|
+
if ((_b = packageJson.dependencies) === null || _b === void 0 ? void 0 : _b[pkg.name]) {
|
|
101
107
|
packageJson.dependencies[pkg.name] = pkg.version;
|
|
102
108
|
}
|
|
103
109
|
});
|
|
104
110
|
// Ensure all versions have caret
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
111
|
+
if (packageJson.peerDependencies) {
|
|
112
|
+
Object.entries(packageJson.peerDependencies).forEach(([key, value]) => {
|
|
113
|
+
if (typeof value === 'string' && !value.startsWith('^')) {
|
|
114
|
+
packageJson.peerDependencies[key] = `^${value}`;
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
if (packageJson.dependencies) {
|
|
119
|
+
Object.entries(packageJson.dependencies).forEach(([key, value]) => {
|
|
120
|
+
if (typeof value === 'string' && !value.startsWith('^')) {
|
|
121
|
+
packageJson.dependencies[key] = `^${value}`;
|
|
122
|
+
}
|
|
123
|
+
});
|
|
124
|
+
}
|
|
115
125
|
}
|
|
116
126
|
try {
|
|
117
127
|
yield fs.promises.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-package-dist-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/utils/unisphere/fix-package-dist-package-json.ts"],"names":[],"mappings":";;AA0CA,
|
|
1
|
+
{"version":3,"file":"fix-package-dist-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/utils/unisphere/fix-package-dist-package-json.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getDependencyGraphAndFilteredDeps = getDependencyGraphAndFilteredDeps;
|
|
4
|
+
const fs = require("fs");
|
|
5
|
+
const path = require("path");
|
|
6
|
+
const debug_1 = require("debug");
|
|
7
|
+
const debug = (0, debug_1.default)('unisphere:utils:get-dependency-graph');
|
|
8
|
+
function matchesPattern(packageName, pattern) {
|
|
9
|
+
// Convert glob-like pattern to regex
|
|
10
|
+
// * matches any characters except /
|
|
11
|
+
// ** matches any characters including /
|
|
12
|
+
const regexPattern = pattern
|
|
13
|
+
.replace(/\./g, '\\.') // Escape dots
|
|
14
|
+
.replace(/\*/g, '[^/]*') // * matches any chars except /
|
|
15
|
+
.replace(/\[^\/\]\*\[^\/\]\*/g, '.*'); // ** matches any chars including /
|
|
16
|
+
const regex = new RegExp(`^${regexPattern}$`);
|
|
17
|
+
return regex.test(packageName);
|
|
18
|
+
}
|
|
19
|
+
function getDependencyGraphAndFilteredDeps(rootDir, packageDir, patterns = []) {
|
|
20
|
+
const packagePath = path.resolve(rootDir, packageDir, 'package.json');
|
|
21
|
+
debug('get dependency graph for %s', packagePath);
|
|
22
|
+
if (!fs.existsSync(packagePath)) {
|
|
23
|
+
throw new Error(`package.json not found in ${packagePath}`);
|
|
24
|
+
}
|
|
25
|
+
const pkg = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
|
|
26
|
+
const visited = new Set();
|
|
27
|
+
const graph = {};
|
|
28
|
+
const dependencyChains = new Map(); // Track which direct dependency leads to each package
|
|
29
|
+
function resolvePackageJson(pkgName) {
|
|
30
|
+
// If not found in workspace, look for the package in the root directory's node_modules
|
|
31
|
+
const packageJsonPath = path.resolve(rootDir, 'node_modules', pkgName, 'package.json');
|
|
32
|
+
debug('%s found in %s', pkgName, packageJsonPath);
|
|
33
|
+
if (!fs.existsSync(packageJsonPath)) {
|
|
34
|
+
return null;
|
|
35
|
+
}
|
|
36
|
+
return JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
|
|
37
|
+
}
|
|
38
|
+
function traverse(pkgName, versionRange, directParent = null) {
|
|
39
|
+
const meta = resolvePackageJson(pkgName);
|
|
40
|
+
if (!meta) {
|
|
41
|
+
throw new Error(`package.json not found for ${pkgName}`);
|
|
42
|
+
}
|
|
43
|
+
debug('extracting dependencies for %s', pkgName);
|
|
44
|
+
const { version, dependencies = {} } = meta;
|
|
45
|
+
const key = `${pkgName}@${version}`;
|
|
46
|
+
if (visited.has(key))
|
|
47
|
+
return;
|
|
48
|
+
visited.add(key);
|
|
49
|
+
debug('adding to visited with key %s', key);
|
|
50
|
+
// Track the dependency chain - if no direct parent, this is a direct dependency
|
|
51
|
+
const rootDependency = directParent || pkgName;
|
|
52
|
+
dependencyChains.set(key, rootDependency);
|
|
53
|
+
const deps = Object.keys(dependencies);
|
|
54
|
+
graph[key] = { name: pkgName, version, dependencies: deps };
|
|
55
|
+
for (const dep of deps) {
|
|
56
|
+
traverse(dep, dependencies[dep], rootDependency);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
// Build dependency graph
|
|
60
|
+
for (const [dep, range] of Object.entries(pkg.dependencies || {})) {
|
|
61
|
+
traverse(dep, range);
|
|
62
|
+
}
|
|
63
|
+
debug('looking for patterns: %s', patterns.join(', '));
|
|
64
|
+
// Find forbidden dependencies and group by direct dependency
|
|
65
|
+
const forbiddenByDirectDep = new Map();
|
|
66
|
+
Object.values(graph).forEach(({ name, version }) => {
|
|
67
|
+
const key = `${name}@${version}`;
|
|
68
|
+
const isForbidden = patterns.some((p) => matchesPattern(name, p));
|
|
69
|
+
if (isForbidden) {
|
|
70
|
+
const directDep = dependencyChains.get(key);
|
|
71
|
+
if (!forbiddenByDirectDep.has(directDep)) {
|
|
72
|
+
forbiddenByDirectDep.set(directDep, []);
|
|
73
|
+
}
|
|
74
|
+
forbiddenByDirectDep.get(directDep).push(`${name}@${version}`);
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
// Format the result as grouped strings
|
|
78
|
+
const notAllowed = [];
|
|
79
|
+
for (const [directDep, forbidden] of forbiddenByDirectDep.entries()) {
|
|
80
|
+
const forbiddenList = forbidden.sort().join(', ');
|
|
81
|
+
notAllowed.push(`${directDep} -> [${forbiddenList}]`);
|
|
82
|
+
}
|
|
83
|
+
notAllowed.sort();
|
|
84
|
+
debug('not allowed dependencies grouped by direct dependency: %s', notAllowed.join('; '));
|
|
85
|
+
return { graph, notAllowed };
|
|
86
|
+
}
|
|
87
|
+
//# sourceMappingURL=get-dependency-graph.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-dependency-graph.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/utils/unisphere/get-dependency-graph.ts"],"names":[],"mappings":"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"}
|