@storm-software/workspace-tools 1.180.9 → 1.181.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.md +14 -0
- package/README.md +1 -1
- package/index.js +77 -61
- package/meta.json +1 -1
- package/package.json +8 -3
- package/src/executors/rollup/executor.js +69 -53
- package/src/executors/rollup/utils/get-options.d.ts +1 -1
- package/src/executors/rollup/utils/normalize-options.d.ts +5 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## 1.181.0 (2024-09-11)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
- **workspace-tools:** Added TypeScript as a peerDependency
|
|
6
|
+
([74da29f1](https://github.com/storm-software/storm-ops/commit/74da29f1))
|
|
7
|
+
|
|
8
|
+
## 1.180.10 (2024-09-11)
|
|
9
|
+
|
|
10
|
+
### Bug Fixes
|
|
11
|
+
|
|
12
|
+
- **workspace-tools:** Update parameters provided to TypeScript plugin
|
|
13
|
+
([8cd141c1](https://github.com/storm-software/storm-ops/commit/8cd141c1))
|
|
14
|
+
|
|
1
15
|
## 1.180.9 (2024-09-11)
|
|
2
16
|
|
|
3
17
|
### Bug Fixes
|
package/README.md
CHANGED
|
@@ -21,7 +21,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
|
|
|
21
21
|
|
|
22
22
|
<h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
|
|
23
23
|
|
|
24
|
-
[](https://prettier.io/) [](http://nx.dev/) [](https://nextjs.org/) [](http://commitizen.github.io/cz-cli/)  [](https://fumadocs.vercel.app/) 
|
|
25
25
|
|
|
26
26
|
<!-- prettier-ignore-start -->
|
|
27
27
|
<!-- markdownlint-disable -->
|
package/index.js
CHANGED
|
@@ -12095,7 +12095,7 @@ See https://babeljs.io/docs/configuration#print-effective-configs for more info.
|
|
|
12095
12095
|
const getSuperRef = _core.types.isIdentifier(superRef) ? () => superRef : () => (null != injectSuperRef || (injectSuperRef = props[0].scope.generateUidIdentifierBasedOnNode(superRef)), injectSuperRef), classRefForInnerBinding = null != (_ref = ref2) ? _ref : props[0].scope.generateUidIdentifier((null == innerBindingRef ? void 0 : innerBindingRef.name) || "Class");
|
|
12096
12096
|
null != ref2 || (ref2 = _core.types.cloneNode(innerBindingRef));
|
|
12097
12097
|
for (const prop of props) {
|
|
12098
|
-
prop.isClassProperty() &&
|
|
12098
|
+
prop.isClassProperty() && ts.assertFieldTransformed(prop);
|
|
12099
12099
|
const isStatic2 = !(null != _core.types.isStaticBlock && _core.types.isStaticBlock(prop.node)) && prop.node.static, isInstance = !isStatic2, isPrivate = prop.isPrivate(), isPublic = !isPrivate, isField = prop.isProperty(), isMethod = !isField, isStaticBlock = null == prop.isStaticBlock ? void 0 : prop.isStaticBlock();
|
|
12100
12100
|
if (isStatic2 && (classRefFlags |= 1), isStatic2 || isMethod && isPrivate || isStaticBlock) {
|
|
12101
12101
|
new _helperReplaceSupers.default({ methodPath: prop, constantSuper, file, refToPreserve: innerBindingRef, getSuperRef, getObjectRef: () => (classRefFlags |= 2, isStatic2 || isStaticBlock ? classRefForInnerBinding : _core.types.memberExpression(classRefForInnerBinding, _core.types.identifier("prototype"))) }).replace();
|
|
@@ -12198,7 +12198,7 @@ See https://babeljs.io/docs/configuration#print-effective-configs for more info.
|
|
|
12198
12198
|
const body = path11.get("body"), handler = privateFieldsAsProperties ? privateNameHandlerLoose : privateNameHandlerSpec;
|
|
12199
12199
|
(0, _helperMemberExpressionToFunctions.default)(body, privateNameVisitor, Object.assign({ privateNamesMap, classRef: ref2, file: state }, handler, { noDocumentAll, noUninitializedPrivateFieldAccess, innerBinding })), body.traverse(privateInVisitor, { privateNamesMap, classRef: ref2, file: state, privateFieldsAsProperties, innerBinding });
|
|
12200
12200
|
};
|
|
12201
|
-
var _core = __webpack_require__2("./node_modules/.pnpm/@babel+core@7.24.7/node_modules/@babel/core/lib/index.js"), _helperReplaceSupers = __webpack_require__2("./node_modules/.pnpm/@babel+helper-replace-supers@7.24.7_@babel+core@7.24.7/node_modules/@babel/helper-replace-supers/lib/index.js"), _helperEnvironmentVisitor = __webpack_require__2("./node_modules/.pnpm/@babel+helper-environment-visitor@7.24.7/node_modules/@babel/helper-environment-visitor/lib/index.js"), _helperMemberExpressionToFunctions = __webpack_require__2("./node_modules/.pnpm/@babel+helper-member-expression-to-functions@7.24.7/node_modules/@babel/helper-member-expression-to-functions/lib/index.js"), _helperOptimiseCallExpression = __webpack_require__2("./node_modules/.pnpm/@babel+helper-optimise-call-expression@7.24.7/node_modules/@babel/helper-optimise-call-expression/lib/index.js"), _helperAnnotateAsPure = __webpack_require__2("./node_modules/.pnpm/@babel+helper-annotate-as-pure@7.24.7/node_modules/@babel/helper-annotate-as-pure/lib/index.js"), _helperSkipTransparentExpressionWrappers = __webpack_require__2("./node_modules/.pnpm/@babel+helper-skip-transparent-expression-wrappers@7.24.7/node_modules/@babel/helper-skip-transparent-expression-wrappers/lib/index.js"),
|
|
12201
|
+
var _core = __webpack_require__2("./node_modules/.pnpm/@babel+core@7.24.7/node_modules/@babel/core/lib/index.js"), _helperReplaceSupers = __webpack_require__2("./node_modules/.pnpm/@babel+helper-replace-supers@7.24.7_@babel+core@7.24.7/node_modules/@babel/helper-replace-supers/lib/index.js"), _helperEnvironmentVisitor = __webpack_require__2("./node_modules/.pnpm/@babel+helper-environment-visitor@7.24.7/node_modules/@babel/helper-environment-visitor/lib/index.js"), _helperMemberExpressionToFunctions = __webpack_require__2("./node_modules/.pnpm/@babel+helper-member-expression-to-functions@7.24.7/node_modules/@babel/helper-member-expression-to-functions/lib/index.js"), _helperOptimiseCallExpression = __webpack_require__2("./node_modules/.pnpm/@babel+helper-optimise-call-expression@7.24.7/node_modules/@babel/helper-optimise-call-expression/lib/index.js"), _helperAnnotateAsPure = __webpack_require__2("./node_modules/.pnpm/@babel+helper-annotate-as-pure@7.24.7/node_modules/@babel/helper-annotate-as-pure/lib/index.js"), _helperSkipTransparentExpressionWrappers = __webpack_require__2("./node_modules/.pnpm/@babel+helper-skip-transparent-expression-wrappers@7.24.7/node_modules/@babel/helper-skip-transparent-expression-wrappers/lib/index.js"), ts = __webpack_require__2("./node_modules/.pnpm/@babel+helper-create-class-features-plugin@7.24.7_@babel+core@7.24.7/node_modules/@babel/helper-create-class-features-plugin/lib/typescript.js"), newHelpers = (file) => file.availableHelper("classPrivateFieldGet2");
|
|
12202
12202
|
function privateNameVisitorFactory(visitor) {
|
|
12203
12203
|
const nestedVisitor = _core.traverse.visitors.merge([Object.assign({}, visitor), _helperEnvironmentVisitor.default]), privateNameVisitor2 = Object.assign({}, visitor, { Class(path11) {
|
|
12204
12204
|
const { privateNamesMap } = this, body = path11.get("body.body"), visiblePrivateNames = new Map(privateNamesMap), redeclared = [];
|
|
@@ -51104,12 +51104,12 @@ var require_node = __commonJS({
|
|
|
51104
51104
|
return !b6(n2) || !Object.prototype.hasOwnProperty.call(n2, "_countQueuingStrategyHighWaterMark") ? false : n2 instanceof Ke2;
|
|
51105
51105
|
}
|
|
51106
51106
|
u3(go, "IsCountQueuingStrategy");
|
|
51107
|
-
function
|
|
51107
|
+
function ts(n2, o) {
|
|
51108
51108
|
ce2(n2, o);
|
|
51109
51109
|
const a2 = n2?.cancel, p2 = n2?.flush, g4 = n2?.readableType, _6 = n2?.start, S6 = n2?.transform, C5 = n2?.writableType;
|
|
51110
51110
|
return { cancel: a2 === void 0 ? void 0 : is2(a2, n2, `${o} has member 'cancel' that`), flush: p2 === void 0 ? void 0 : rs(p2, n2, `${o} has member 'flush' that`), readableType: g4, start: _6 === void 0 ? void 0 : ns(_6, n2, `${o} has member 'start' that`), transform: S6 === void 0 ? void 0 : os3(S6, n2, `${o} has member 'transform' that`), writableType: C5 };
|
|
51111
51111
|
}
|
|
51112
|
-
u3(
|
|
51112
|
+
u3(ts, "convertTransformer");
|
|
51113
51113
|
function rs(n2, o, a2) {
|
|
51114
51114
|
return ee3(n2, a2), (p2) => H6(n2, o, [p2]);
|
|
51115
51115
|
}
|
|
@@ -51129,7 +51129,7 @@ var require_node = __commonJS({
|
|
|
51129
51129
|
const Xr = class Xr {
|
|
51130
51130
|
constructor(o = {}, a2 = {}, p2 = {}) {
|
|
51131
51131
|
o === void 0 && (o = null);
|
|
51132
|
-
const g4 = zt(a2, "Second parameter"), _6 = zt(p2, "Third parameter"), S6 =
|
|
51132
|
+
const g4 = zt(a2, "Second parameter"), _6 = zt(p2, "Third parameter"), S6 = ts(o, "First parameter");
|
|
51133
51133
|
if (S6.readableType !== void 0) throw new RangeError("Invalid readableType specified");
|
|
51134
51134
|
if (S6.writableType !== void 0) throw new RangeError("Invalid writableType specified");
|
|
51135
51135
|
const C5 = lt(_6, 0), q5 = Ot(_6), P5 = lt(g4, 1), W6 = Ot(g4);
|
|
@@ -67229,9 +67229,9 @@ var init_get_default_config = __esm({
|
|
|
67229
67229
|
let repository = "https://github.com/storm-software/storm-ops";
|
|
67230
67230
|
let license = DEFAULT_STORM_CONFIG.license;
|
|
67231
67231
|
let homepage = DEFAULT_STORM_CONFIG.homepage;
|
|
67232
|
-
const
|
|
67233
|
-
if ((0, import_node_fs10.existsSync)((0, import_node_path7.join)(
|
|
67234
|
-
const file = (0, import_node_fs10.readFileSync)((0, import_node_path7.join)(
|
|
67232
|
+
const workspaceRoot4 = findWorkspaceRoot(root);
|
|
67233
|
+
if ((0, import_node_fs10.existsSync)((0, import_node_path7.join)(workspaceRoot4, "package.json"))) {
|
|
67234
|
+
const file = (0, import_node_fs10.readFileSync)((0, import_node_path7.join)(workspaceRoot4, "package.json"), {
|
|
67235
67235
|
encoding: "utf-8"
|
|
67236
67236
|
});
|
|
67237
67237
|
if (file) {
|
|
@@ -67264,7 +67264,7 @@ var init_get_default_config = __esm({
|
|
|
67264
67264
|
return ret;
|
|
67265
67265
|
}, {}),
|
|
67266
67266
|
colors: { ...DEFAULT_COLOR_CONFIG, ...config.colors },
|
|
67267
|
-
workspaceRoot:
|
|
67267
|
+
workspaceRoot: workspaceRoot4,
|
|
67268
67268
|
name,
|
|
67269
67269
|
namespace,
|
|
67270
67270
|
repository,
|
|
@@ -68110,14 +68110,14 @@ var init_create_storm_config = __esm({
|
|
|
68110
68110
|
init_get_default_config();
|
|
68111
68111
|
_extension_cache = /* @__PURE__ */ new WeakMap();
|
|
68112
68112
|
_static_cache = void 0;
|
|
68113
|
-
createConfig = (
|
|
68114
|
-
return createStormConfig(void 0, void 0,
|
|
68113
|
+
createConfig = (workspaceRoot4) => {
|
|
68114
|
+
return createStormConfig(void 0, void 0, workspaceRoot4);
|
|
68115
68115
|
};
|
|
68116
|
-
createStormConfig = (extensionName, schema,
|
|
68116
|
+
createStormConfig = (extensionName, schema, workspaceRoot4) => {
|
|
68117
68117
|
let result;
|
|
68118
68118
|
if (!_static_cache?.data || !_static_cache?.timestamp || _static_cache.timestamp < Date.now() - 3e4) {
|
|
68119
68119
|
const config = getConfigEnv();
|
|
68120
|
-
const defaultConfig = getDefaultConfig(config,
|
|
68120
|
+
const defaultConfig = getDefaultConfig(config, workspaceRoot4);
|
|
68121
68121
|
result = StormConfigSchema.parse({
|
|
68122
68122
|
...defaultConfig,
|
|
68123
68123
|
...config,
|
|
@@ -68126,7 +68126,7 @@ var init_create_storm_config = __esm({
|
|
|
68126
68126
|
...config.colors
|
|
68127
68127
|
}
|
|
68128
68128
|
});
|
|
68129
|
-
result.workspaceRoot ??= defaultConfig.workspaceRoot ? defaultConfig.workspaceRoot : findWorkspaceRoot(
|
|
68129
|
+
result.workspaceRoot ??= defaultConfig.workspaceRoot ? defaultConfig.workspaceRoot : findWorkspaceRoot(workspaceRoot4);
|
|
68130
68130
|
} else {
|
|
68131
68131
|
result = _static_cache.data;
|
|
68132
68132
|
}
|
|
@@ -68154,7 +68154,7 @@ var init_create_storm_config = __esm({
|
|
|
68154
68154
|
_extension_cache.set(extension_cache_key, extension);
|
|
68155
68155
|
return extension;
|
|
68156
68156
|
};
|
|
68157
|
-
loadStormConfig = async (
|
|
68157
|
+
loadStormConfig = async (workspaceRoot4) => {
|
|
68158
68158
|
let config = {};
|
|
68159
68159
|
if (_static_cache?.data && _static_cache?.timestamp && _static_cache.timestamp >= Date.now() + 3e4) {
|
|
68160
68160
|
writeInfo(
|
|
@@ -68163,7 +68163,7 @@ var init_create_storm_config = __esm({
|
|
|
68163
68163
|
);
|
|
68164
68164
|
return _static_cache.data;
|
|
68165
68165
|
}
|
|
68166
|
-
let _workspaceRoot =
|
|
68166
|
+
let _workspaceRoot = workspaceRoot4;
|
|
68167
68167
|
if (!_workspaceRoot) {
|
|
68168
68168
|
_workspaceRoot = findWorkspaceRoot();
|
|
68169
68169
|
}
|
|
@@ -156789,7 +156789,7 @@ var require_fields = __commonJS({
|
|
|
156789
156789
|
var _helperOptimiseCallExpression = require_lib27();
|
|
156790
156790
|
var _helperAnnotateAsPure = require_lib30();
|
|
156791
156791
|
var _helperSkipTransparentExpressionWrappers = require_lib29();
|
|
156792
|
-
var
|
|
156792
|
+
var ts = require_typescript3();
|
|
156793
156793
|
{
|
|
156794
156794
|
newHelpers = (file) => {
|
|
156795
156795
|
;
|
|
@@ -157688,7 +157688,7 @@ var require_fields = __commonJS({
|
|
|
157688
157688
|
const classRefForInnerBinding = (_ref = ref2) != null ? _ref : props[0].scope.generateUidIdentifier((innerBindingRef == null ? void 0 : innerBindingRef.name) || "Class");
|
|
157689
157689
|
(_ref2 = ref2) != null ? _ref2 : ref2 = _core.types.cloneNode(innerBindingRef);
|
|
157690
157690
|
for (const prop of props) {
|
|
157691
|
-
prop.isClassProperty() &&
|
|
157691
|
+
prop.isClassProperty() && ts.assertFieldTransformed(prop);
|
|
157692
157692
|
const isStatic2 = !(_core.types.isStaticBlock != null && _core.types.isStaticBlock(prop.node)) && prop.node.static;
|
|
157693
157693
|
const isInstance = !isStatic2;
|
|
157694
157694
|
const isPrivate = prop.isPrivate();
|
|
@@ -218272,22 +218272,22 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
|
|
|
218272
218272
|
"The Build process failed because the context is not valid. Please run this command from a workspace."
|
|
218273
218273
|
);
|
|
218274
218274
|
}
|
|
218275
|
-
const
|
|
218276
|
-
const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ??
|
|
218277
|
-
const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ??
|
|
218275
|
+
const workspaceRoot4 = findWorkspaceRoot2();
|
|
218276
|
+
const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot4;
|
|
218277
|
+
const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot4;
|
|
218278
218278
|
const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
|
|
218279
|
-
config.workspaceRoot =
|
|
218279
|
+
config.workspaceRoot = workspaceRoot4;
|
|
218280
218280
|
if (!executorOptions.skipReadingConfig) {
|
|
218281
218281
|
writeDebug2(
|
|
218282
218282
|
`Loading the Storm Config from environment variables and storm.config.js file...
|
|
218283
|
-
- workspaceRoot: ${
|
|
218283
|
+
- workspaceRoot: ${workspaceRoot4}
|
|
218284
218284
|
- projectRoot: ${projectRoot}
|
|
218285
218285
|
- sourceRoot: ${sourceRoot}
|
|
218286
218286
|
- projectName: ${projectName}
|
|
218287
218287
|
`,
|
|
218288
218288
|
config
|
|
218289
218289
|
);
|
|
218290
|
-
config = await loadStormConfig2(
|
|
218290
|
+
config = await loadStormConfig2(workspaceRoot4);
|
|
218291
218291
|
}
|
|
218292
218292
|
if (executorOptions?.hooks?.applyDefaultOptions) {
|
|
218293
218293
|
writeDebug2("Running the applyDefaultOptions hook...", config);
|
|
@@ -218307,7 +218307,7 @@ ${Object.keys(options).map(
|
|
|
218307
218307
|
options,
|
|
218308
218308
|
{
|
|
218309
218309
|
config,
|
|
218310
|
-
workspaceRoot:
|
|
218310
|
+
workspaceRoot: workspaceRoot4,
|
|
218311
218311
|
projectRoot,
|
|
218312
218312
|
sourceRoot,
|
|
218313
218313
|
projectName,
|
|
@@ -218403,14 +218403,14 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
|
|
|
218403
218403
|
writeInfo2(`\u26A1 Running the ${name} generator...
|
|
218404
218404
|
|
|
218405
218405
|
`, config);
|
|
218406
|
-
const
|
|
218406
|
+
const workspaceRoot4 = findWorkspaceRoot2();
|
|
218407
218407
|
if (!generatorOptions.skipReadingConfig) {
|
|
218408
218408
|
writeDebug2(
|
|
218409
218409
|
`Loading the Storm Config from environment variables and storm.config.js file...
|
|
218410
|
-
- workspaceRoot: ${
|
|
218410
|
+
- workspaceRoot: ${workspaceRoot4}`,
|
|
218411
218411
|
config
|
|
218412
218412
|
);
|
|
218413
|
-
config = await loadStormConfig2(
|
|
218413
|
+
config = await loadStormConfig2(workspaceRoot4);
|
|
218414
218414
|
}
|
|
218415
218415
|
if (generatorOptions?.hooks?.applyDefaultOptions) {
|
|
218416
218416
|
writeDebug2("Running the applyDefaultOptions hook...", config);
|
|
@@ -228436,6 +228436,7 @@ var import_native4 = __toESM(require_native(), 1);
|
|
|
228436
228436
|
var import_devkit7 = require("@nx/devkit");
|
|
228437
228437
|
var import_type_definitions = require("@nx/js/src/plugins/rollup/type-definitions");
|
|
228438
228438
|
var import_buildable_libs_utils = require("@nx/js/src/utils/buildable-libs-utils");
|
|
228439
|
+
var import_ensure_typescript = require("@nx/js/src/utils/typescript/ensure-typescript.js");
|
|
228439
228440
|
var import_generate_package_json = require("@nx/rollup/src/plugins/package-json/generate-package-json");
|
|
228440
228441
|
|
|
228441
228442
|
// node_modules/.pnpm/@rollup+plugin-babel@6.0.4_@babel+core@7.24.7_@types+babel__core@7.20.5_rollup@4.18.0/node_modules/@rollup/plugin-babel/dist/es/index.js
|
|
@@ -229894,14 +229895,14 @@ function nodeResolve(opts = {}) {
|
|
|
229894
229895
|
// packages/workspace-tools/src/executors/rollup/utils/get-options.ts
|
|
229895
229896
|
var import_node_fs12 = require("node:fs");
|
|
229896
229897
|
var import_node_path14 = require("node:path");
|
|
229897
|
-
var
|
|
229898
|
+
var import_typescript = require("typescript");
|
|
229898
229899
|
|
|
229899
229900
|
// packages/workspace-tools/src/executors/rollup/utils/normalize-options.ts
|
|
229900
229901
|
var import_devkit6 = require("@nx/devkit");
|
|
229901
229902
|
var import_js2 = require("@nx/js");
|
|
229902
229903
|
var import_node_fs11 = require("node:fs");
|
|
229903
229904
|
var import_node_path13 = require("node:path");
|
|
229904
|
-
function normalizeOptions2(projectRoot, sourceRoot, options) {
|
|
229905
|
+
function normalizeOptions2(projectRoot, sourceRoot, options, config) {
|
|
229905
229906
|
if (global.NX_GRAPH_CREATION)
|
|
229906
229907
|
return options;
|
|
229907
229908
|
normalizeRelativePaths(projectRoot, options);
|
|
@@ -229921,7 +229922,10 @@ function normalizeOptions2(projectRoot, sourceRoot, options) {
|
|
|
229921
229922
|
generateExportsField: options.generateExportsField ?? false,
|
|
229922
229923
|
javascriptEnabled: options.javascriptEnabled ?? false,
|
|
229923
229924
|
skipTypeCheck: options.skipTypeCheck ?? false,
|
|
229924
|
-
skipTypeField: options.skipTypeField ?? false
|
|
229925
|
+
skipTypeField: options.skipTypeField ?? false,
|
|
229926
|
+
projectRoot,
|
|
229927
|
+
sourceRoot,
|
|
229928
|
+
config
|
|
229925
229929
|
};
|
|
229926
229930
|
}
|
|
229927
229931
|
function normalizeAssets(assets, root, sourceRoot) {
|
|
@@ -230012,11 +230016,14 @@ function analyze() {
|
|
|
230012
230016
|
}
|
|
230013
230017
|
};
|
|
230014
230018
|
}
|
|
230015
|
-
async function withRollupConfig(rawOptions, rollupConfig = {},
|
|
230019
|
+
async function withRollupConfig(rawOptions, rollupConfig = {}, config, dependencies) {
|
|
230016
230020
|
const { writeWarning: writeWarning2, correctPaths: correctPaths2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
|
|
230021
|
+
const ts = (0, import_ensure_typescript.ensureTypescript)();
|
|
230017
230022
|
const finalConfig = { ...rollupConfig };
|
|
230018
230023
|
const projectNode = getProjectNode();
|
|
230019
|
-
const projectRoot = correctPaths2(
|
|
230024
|
+
const projectRoot = correctPaths2(
|
|
230025
|
+
(0, import_node_path14.join)(config.workspaceRoot, projectNode.data.root)
|
|
230026
|
+
);
|
|
230020
230027
|
const projectGraph = global.NX_GRAPH_CREATION ? null : (0, import_devkit7.readCachedProjectGraph)();
|
|
230021
230028
|
if (!projectGraph) {
|
|
230022
230029
|
throw new Error(`Cannot find project graph.`);
|
|
@@ -230035,7 +230042,7 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
|
|
|
230035
230042
|
const result = (0, import_buildable_libs_utils.calculateProjectBuildableDependencies)(
|
|
230036
230043
|
void 0,
|
|
230037
230044
|
projectGraph,
|
|
230038
|
-
|
|
230045
|
+
config.workspaceRoot,
|
|
230039
230046
|
projectNode.name,
|
|
230040
230047
|
process.env.NX_TASK_TARGET_TARGET,
|
|
230041
230048
|
process.env.NX_TASK_TARGET_CONFIGURATION,
|
|
@@ -230049,13 +230056,16 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
|
|
|
230049
230056
|
const options = normalizeOptions2(
|
|
230050
230057
|
projectNode.data.root,
|
|
230051
230058
|
projectNode.data.sourceRoot,
|
|
230052
|
-
rawOptions
|
|
230059
|
+
rawOptions,
|
|
230060
|
+
config
|
|
230061
|
+
);
|
|
230062
|
+
const tsConfigPath = correctPaths2(
|
|
230063
|
+
(0, import_node_path14.join)(config.workspaceRoot, options.tsConfig)
|
|
230053
230064
|
);
|
|
230054
|
-
const tsConfigPath = correctPaths2((0, import_node_path14.join)(import_devkit7.workspaceRoot, options.tsConfig));
|
|
230055
230065
|
const tsConfigFile = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
|
|
230056
230066
|
const tsConfigInclude = [
|
|
230057
230067
|
...tsConfigFile.config?.include && Array.isArray(tsConfigFile.config.include) ? tsConfigFile.config.include : [],
|
|
230058
|
-
(0, import_node_path14.join)(
|
|
230068
|
+
(0, import_node_path14.join)(config.workspaceRoot, "node_modules/typescript/lib/*.d.ts")
|
|
230059
230069
|
];
|
|
230060
230070
|
const tsConfig = ts.parseJsonConfigFileContent(
|
|
230061
230071
|
{
|
|
@@ -230098,13 +230108,13 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
|
|
|
230098
230108
|
// Options are not normalized with project root during graph creation due to the lack of project and project root.
|
|
230099
230109
|
// Cannot be joined with workspace root now, but will be handled by @nx/rollup/plugin.
|
|
230100
230110
|
options.outputPath
|
|
230101
|
-
) : correctPaths2((0, import_node_path14.join)(
|
|
230111
|
+
) : correctPaths2((0, import_node_path14.join)(config.workspaceRoot, options.outputPath)),
|
|
230102
230112
|
sourcemap: options.sourceMap
|
|
230103
230113
|
}));
|
|
230104
230114
|
}
|
|
230105
230115
|
let packageJson = {};
|
|
230106
230116
|
if (!global.NX_GRAPH_CREATION) {
|
|
230107
|
-
const packageJsonPath = options.project ? (0, import_node_path14.join)(
|
|
230117
|
+
const packageJsonPath = options.project ? (0, import_node_path14.join)(config.workspaceRoot, options.project) : (0, import_node_path14.join)(projectRoot, "package.json");
|
|
230108
230118
|
if (!(0, import_node_fs12.existsSync)(packageJsonPath)) {
|
|
230109
230119
|
throw new Error(`Cannot find ${packageJsonPath}.`);
|
|
230110
230120
|
}
|
|
@@ -230150,7 +230160,8 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
|
|
|
230150
230160
|
copy2({
|
|
230151
230161
|
targets: convertCopyAssetsToRollupOptions(
|
|
230152
230162
|
options.outputPath,
|
|
230153
|
-
options.assets
|
|
230163
|
+
options.assets,
|
|
230164
|
+
config.workspaceRoot
|
|
230154
230165
|
)
|
|
230155
230166
|
}),
|
|
230156
230167
|
image(),
|
|
@@ -230160,7 +230171,7 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
|
|
|
230160
230171
|
extensions: fileExtensions
|
|
230161
230172
|
}),
|
|
230162
230173
|
require_rollup_plugin_typescript2_cjs()({
|
|
230163
|
-
cwd: correctPaths2(
|
|
230174
|
+
cwd: correctPaths2(config.workspaceRoot),
|
|
230164
230175
|
check: !options.skipTypeCheck,
|
|
230165
230176
|
typescript: ts,
|
|
230166
230177
|
tsconfig: options.tsConfig,
|
|
@@ -230198,7 +230209,7 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
|
|
|
230198
230209
|
},
|
|
230199
230210
|
cwd: correctPaths2(
|
|
230200
230211
|
(0, import_node_path14.join)(
|
|
230201
|
-
|
|
230212
|
+
config.workspaceRoot,
|
|
230202
230213
|
projectNode.data.sourceRoot ?? projectNode.data.root
|
|
230203
230214
|
)
|
|
230204
230215
|
),
|
|
@@ -230238,9 +230249,14 @@ function createInput(options) {
|
|
|
230238
230249
|
if (global.NX_GRAPH_CREATION) return {};
|
|
230239
230250
|
const mainEntryFileName = options.outputFileName || options.main;
|
|
230240
230251
|
const input = {};
|
|
230241
|
-
input[(0, import_node_path14.parse)(mainEntryFileName).name] = (0, import_node_path14.join)(
|
|
230252
|
+
input[(0, import_node_path14.parse)(mainEntryFileName).name] = (0, import_node_path14.join)(
|
|
230253
|
+
options.config.workspaceRoot,
|
|
230254
|
+
options.main
|
|
230255
|
+
);
|
|
230242
230256
|
options.additionalEntryPoints?.forEach((entry) => {
|
|
230243
|
-
|
|
230257
|
+
const entryPoint = (0, import_node_path14.join)(options.config.workspaceRoot, entry);
|
|
230258
|
+
const entryName = entryPoint.includes(options.sourceRoot) ? entryPoint.replace(options.sourceRoot, "") : entryPoint.replace(options.config.workspaceRoot, "");
|
|
230259
|
+
input[entryName.replaceAll("\\", "/").startsWith("/") ? entryName.slice(1) : entryName] = entryPoint;
|
|
230244
230260
|
});
|
|
230245
230261
|
return input;
|
|
230246
230262
|
}
|
|
@@ -230262,7 +230278,7 @@ async function createTsCompilerOptions(parsedCommandLine, options, dependencies,
|
|
|
230262
230278
|
skipDefaultLibCheck: true,
|
|
230263
230279
|
paths: compilerOptionPaths
|
|
230264
230280
|
};
|
|
230265
|
-
if (parsedCommandLine.options.module ===
|
|
230281
|
+
if (parsedCommandLine.options.module === import_typescript.ModuleKind.CommonJS) {
|
|
230266
230282
|
compilerOptions["module"] = "ESNext";
|
|
230267
230283
|
}
|
|
230268
230284
|
if (options.compiler === "swc") {
|
|
@@ -230270,17 +230286,17 @@ async function createTsCompilerOptions(parsedCommandLine, options, dependencies,
|
|
|
230270
230286
|
}
|
|
230271
230287
|
return compilerOptions;
|
|
230272
230288
|
}
|
|
230273
|
-
function convertCopyAssetsToRollupOptions(outputPath, assets) {
|
|
230289
|
+
function convertCopyAssetsToRollupOptions(outputPath, assets, workspaceRoot4) {
|
|
230274
230290
|
return assets ? assets.map((a2) => ({
|
|
230275
230291
|
src: (0, import_node_path14.join)(a2.input, a2.glob).replace(/\\/g, "/"),
|
|
230276
|
-
dest: (0, import_node_path14.join)(
|
|
230292
|
+
dest: (0, import_node_path14.join)(workspaceRoot4, outputPath, a2.output).replace(/\\/g, "/")
|
|
230277
230293
|
})) : [];
|
|
230278
230294
|
}
|
|
230279
230295
|
function readCompatibleFormats(config) {
|
|
230280
230296
|
switch (config.options.module) {
|
|
230281
|
-
case
|
|
230282
|
-
case
|
|
230283
|
-
case
|
|
230297
|
+
case import_typescript.ModuleKind.CommonJS:
|
|
230298
|
+
case import_typescript.ModuleKind.UMD:
|
|
230299
|
+
case import_typescript.ModuleKind.AMD:
|
|
230284
230300
|
return ["cjs"];
|
|
230285
230301
|
default:
|
|
230286
230302
|
return ["esm"];
|
|
@@ -230302,7 +230318,7 @@ async function* rollupExecutorFn(options, context, config) {
|
|
|
230302
230318
|
if (!context?.projectName || !context?.projectsConfigurations?.projects?.[context.projectName]?.root) {
|
|
230303
230319
|
throw new Error("Nx executor context was invalid");
|
|
230304
230320
|
}
|
|
230305
|
-
const
|
|
230321
|
+
const workspaceRoot4 = findWorkspaceRoot2();
|
|
230306
230322
|
const projectRoot = context?.projectsConfigurations?.projects[context.projectName]?.root;
|
|
230307
230323
|
const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? projectRoot;
|
|
230308
230324
|
if (options.clean !== false) {
|
|
@@ -230332,7 +230348,7 @@ async function* rollupExecutorFn(options, context, config) {
|
|
|
230332
230348
|
const files = await new Glob("**/*.{ts,mts,cts,tsx}", {
|
|
230333
230349
|
absolute: true,
|
|
230334
230350
|
cwd: sourceRoot,
|
|
230335
|
-
root:
|
|
230351
|
+
root: workspaceRoot4
|
|
230336
230352
|
}).walk();
|
|
230337
230353
|
options.additionalEntryPoints = files.reduce(
|
|
230338
230354
|
(ret, file) => {
|
|
@@ -230343,10 +230359,10 @@ async function* rollupExecutorFn(options, context, config) {
|
|
|
230343
230359
|
return ret;
|
|
230344
230360
|
},
|
|
230345
230361
|
options.additionalEntryPoints?.map(
|
|
230346
|
-
(entry) => correctPaths2((0, import_path5.join)(
|
|
230362
|
+
(entry) => correctPaths2((0, import_path5.join)(workspaceRoot4, entry))
|
|
230347
230363
|
) ?? []
|
|
230348
230364
|
).map((entry) => {
|
|
230349
|
-
const formatted = entry.replace(
|
|
230365
|
+
const formatted = entry.replace(workspaceRoot4, "");
|
|
230350
230366
|
return formatted.startsWith("/") ? formatted.slice(1) : formatted;
|
|
230351
230367
|
});
|
|
230352
230368
|
}
|
|
@@ -230458,8 +230474,8 @@ async function createRollupOptions(options, context, config) {
|
|
|
230458
230474
|
const rollupConfig = await withRollupConfig(
|
|
230459
230475
|
options,
|
|
230460
230476
|
{},
|
|
230461
|
-
|
|
230462
|
-
|
|
230477
|
+
config,
|
|
230478
|
+
dependencies
|
|
230463
230479
|
);
|
|
230464
230480
|
const generatePackageJsonPlugin = Array.isArray(rollupConfig.plugins) ? rollupConfig.plugins.find(
|
|
230465
230481
|
(p2) => p2?.["name"] === import_generate_package_json2.pluginName
|
|
@@ -233232,13 +233248,13 @@ async function releaseVersionGeneratorFn(tree, options, config) {
|
|
|
233232
233248
|
`, config);
|
|
233233
233249
|
const stopwatch = getStopwatch2("Storm Release Version generator");
|
|
233234
233250
|
try {
|
|
233235
|
-
const
|
|
233251
|
+
const workspaceRoot4 = findWorkspaceRoot2();
|
|
233236
233252
|
writeDebug2(
|
|
233237
233253
|
`Loading the Storm Config from environment variables and storm.config.js file...
|
|
233238
|
-
- workspaceRoot: ${
|
|
233254
|
+
- workspaceRoot: ${workspaceRoot4}`,
|
|
233239
233255
|
config
|
|
233240
233256
|
);
|
|
233241
|
-
config = await loadStormConfig2(
|
|
233257
|
+
config = await loadStormConfig2(workspaceRoot4);
|
|
233242
233258
|
writeTrace2(
|
|
233243
233259
|
`Generator schema options \u2699\uFE0F
|
|
233244
233260
|
${Object.keys(options ?? {}).map((key) => ` - ${key}=${JSON.stringify(options[key])}`).join("\n")}`,
|
|
@@ -234077,10 +234093,10 @@ function cargoMetadata() {
|
|
|
234077
234093
|
}
|
|
234078
234094
|
return JSON.parse(output3.output);
|
|
234079
234095
|
}
|
|
234080
|
-
function isExternal(packageOrDep,
|
|
234096
|
+
function isExternal(packageOrDep, workspaceRoot4) {
|
|
234081
234097
|
const isRegistry = packageOrDep.source?.startsWith("registry+") ?? false;
|
|
234082
234098
|
const isGit = packageOrDep.source?.startsWith("git+") ?? false;
|
|
234083
|
-
const isOutsideWorkspace = "path" in packageOrDep && (0, import_node_path20.relative)(
|
|
234099
|
+
const isOutsideWorkspace = "path" in packageOrDep && (0, import_node_path20.relative)(workspaceRoot4, packageOrDep.path).startsWith("..");
|
|
234084
234100
|
return isRegistry || isGit || isOutsideWorkspace;
|
|
234085
234101
|
}
|
|
234086
234102
|
function runProcess(processCmd, ...args) {
|