@nx/js 16.3.0 → 16.4.0-beta.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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/js",
|
|
3
|
-
"version": "16.
|
|
3
|
+
"version": "16.4.0-beta.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
|
|
6
6
|
"repository": {
|
|
@@ -39,9 +39,9 @@
|
|
|
39
39
|
"@babel/preset-env": "^7.15.0",
|
|
40
40
|
"@babel/preset-typescript": "^7.15.0",
|
|
41
41
|
"@babel/runtime": "^7.14.8",
|
|
42
|
-
"@nrwl/js": "16.
|
|
43
|
-
"@nx/devkit": "16.
|
|
44
|
-
"@nx/workspace": "16.
|
|
42
|
+
"@nrwl/js": "16.4.0-beta.0",
|
|
43
|
+
"@nx/devkit": "16.4.0-beta.0",
|
|
44
|
+
"@nx/workspace": "16.4.0-beta.0",
|
|
45
45
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
46
46
|
"babel-plugin-const-enum": "^1.0.1",
|
|
47
47
|
"babel-plugin-macros": "^2.8.0",
|
|
@@ -52,6 +52,7 @@
|
|
|
52
52
|
"ignore": "^5.0.4",
|
|
53
53
|
"js-tokens": "^4.0.0",
|
|
54
54
|
"minimatch": "3.0.5",
|
|
55
|
+
"semver": "7.3.4",
|
|
55
56
|
"source-map-support": "0.5.19",
|
|
56
57
|
"tslib": "^2.3.0"
|
|
57
58
|
},
|
|
@@ -67,5 +68,5 @@
|
|
|
67
68
|
"access": "public"
|
|
68
69
|
},
|
|
69
70
|
"types": "./src/index.d.ts",
|
|
70
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "c2112a07278e9c78cd6f6c194eb4a75115a7d179"
|
|
71
72
|
}
|
|
@@ -3,8 +3,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.initSchematic = exports.initGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
+
const semver_1 = require("@nx/devkit/src/utils/semver");
|
|
7
|
+
const package_json_1 = require("nx/src/utils/package-json");
|
|
8
|
+
const semver_2 = require("semver");
|
|
6
9
|
const ts_config_1 = require("../../utils/typescript/ts-config");
|
|
7
10
|
const versions_1 = require("../../utils/versions");
|
|
11
|
+
function getInstalledTypescriptVersion(tree) {
|
|
12
|
+
var _a, _b, _c, _d, _e, _f;
|
|
13
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
|
+
const rootPackageJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
15
|
+
const tsVersionInRootPackageJson = (_b = (_a = rootPackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a['typescript']) !== null && _b !== void 0 ? _b : (_c = rootPackageJson.dependencies) === null || _c === void 0 ? void 0 : _c['typescript'];
|
|
16
|
+
if (!tsVersionInRootPackageJson) {
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
if ((0, semver_2.valid)(tsVersionInRootPackageJson)) {
|
|
20
|
+
// it's a pinned version, return it
|
|
21
|
+
return tsVersionInRootPackageJson;
|
|
22
|
+
}
|
|
23
|
+
// it's a version range, check whether the installed version matches it
|
|
24
|
+
try {
|
|
25
|
+
const tsPackageJson = (0, package_json_1.readModulePackageJson)('typescript').packageJson;
|
|
26
|
+
const installedTsVersion = (_e = (_d = tsPackageJson.devDependencies) === null || _d === void 0 ? void 0 : _d['typescript']) !== null && _e !== void 0 ? _e : (_f = tsPackageJson.dependencies) === null || _f === void 0 ? void 0 : _f['typescript'];
|
|
27
|
+
// the installed version matches the package.json version range
|
|
28
|
+
if (installedTsVersion &&
|
|
29
|
+
(0, semver_2.satisfies)(installedTsVersion, tsVersionInRootPackageJson)) {
|
|
30
|
+
return installedTsVersion;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
finally {
|
|
34
|
+
return (0, semver_1.checkAndCleanWithSemver)('typescript', tsVersionInRootPackageJson);
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
}
|
|
8
38
|
function initGenerator(tree, schema) {
|
|
9
39
|
var _a;
|
|
10
40
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -20,7 +50,13 @@ function initGenerator(tree, schema) {
|
|
|
20
50
|
prettier: versions_1.prettierVersion,
|
|
21
51
|
};
|
|
22
52
|
if (!schema.js) {
|
|
23
|
-
|
|
53
|
+
const installedTsVersion = yield getInstalledTypescriptVersion(tree);
|
|
54
|
+
if (!installedTsVersion ||
|
|
55
|
+
!(0, semver_2.satisfies)(installedTsVersion, versions_1.supportedTypescriptVersions, {
|
|
56
|
+
includePrerelease: true,
|
|
57
|
+
})) {
|
|
58
|
+
devDependencies['typescript'] = versions_1.typescriptVersion;
|
|
59
|
+
}
|
|
24
60
|
}
|
|
25
61
|
// https://prettier.io/docs/en/configuration.html
|
|
26
62
|
const prettierrcNameOptions = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -7,5 +7,11 @@ export declare const swcHelpersVersion = "~0.5.0";
|
|
|
7
7
|
export declare const swcNodeVersion = "~1.4.2";
|
|
8
8
|
export declare const tsLibVersion = "^2.3.0";
|
|
9
9
|
export declare const typesNodeVersion = "18.7.1";
|
|
10
|
-
export declare const typescriptVersion = "~5.0.2";
|
|
11
10
|
export declare const verdaccioVersion = "^5.0.4";
|
|
11
|
+
export declare const typescriptVersion = "~5.0.2";
|
|
12
|
+
/**
|
|
13
|
+
* The minimum version is currently determined from the lowest version
|
|
14
|
+
* that's supported by the lowest Angular supported version, e.g.
|
|
15
|
+
* `npm view @angular/compiler-cli@14.0.0 peerDependencies.typescript`
|
|
16
|
+
*/
|
|
17
|
+
export declare const supportedTypescriptVersions = ">=4.6.2";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.supportedTypescriptVersions = exports.typescriptVersion = exports.verdaccioVersion = exports.typesNodeVersion = exports.tsLibVersion = exports.swcNodeVersion = exports.swcHelpersVersion = exports.swcCoreVersion = exports.swcCliVersion = exports.prettierVersion = exports.esbuildVersion = exports.nxVersion = void 0;
|
|
4
4
|
exports.nxVersion = require('../../package.json').version;
|
|
5
5
|
exports.esbuildVersion = '^0.17.17';
|
|
6
6
|
exports.prettierVersion = '^2.6.2';
|
|
@@ -10,6 +10,13 @@ exports.swcHelpersVersion = '~0.5.0';
|
|
|
10
10
|
exports.swcNodeVersion = '~1.4.2';
|
|
11
11
|
exports.tsLibVersion = '^2.3.0';
|
|
12
12
|
exports.typesNodeVersion = '18.7.1';
|
|
13
|
-
exports.typescriptVersion = '~5.0.2';
|
|
14
13
|
exports.verdaccioVersion = '^5.0.4';
|
|
14
|
+
// Typescript
|
|
15
|
+
exports.typescriptVersion = '~5.0.2';
|
|
16
|
+
/**
|
|
17
|
+
* The minimum version is currently determined from the lowest version
|
|
18
|
+
* that's supported by the lowest Angular supported version, e.g.
|
|
19
|
+
* `npm view @angular/compiler-cli@14.0.0 peerDependencies.typescript`
|
|
20
|
+
*/
|
|
21
|
+
exports.supportedTypescriptVersions = '>=4.6.2';
|
|
15
22
|
//# sourceMappingURL=versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,UAAU,CAAC;AAC5B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,UAAU,CAAC;AAC5B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAEzC,aAAa;AACA,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC1C;;;;GAIG;AACU,QAAA,2BAA2B,GAAG,SAAS,CAAC"}
|