@storm-software/workspace-tools 1.296.81 → 1.296.84
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/README.md +1 -1
- package/config/base.json +13 -14
- package/config/recommended.json +17 -15
- package/dist/{chunk-SZWM7COV.js → chunk-3G7PNDZ5.js} +15 -2
- package/dist/chunk-5BGCA73V.mjs +39 -0
- package/dist/{chunk-3VIV3TF3.js → chunk-CSH4G6YP.js} +11 -5
- package/dist/{chunk-QC5ON3X4.mjs → chunk-DEHA5C77.mjs} +15 -2
- package/dist/{chunk-Q36BH543.mjs → chunk-E2PVUX2W.mjs} +25 -209
- package/dist/{chunk-YXDHTGAK.js → chunk-FETI3TYM.js} +47 -35
- package/dist/{chunk-2OB3TJFJ.mjs → chunk-FQ7VZ2JR.mjs} +1 -1
- package/dist/{chunk-C2QNKR3W.mjs → chunk-G35OKYMG.mjs} +1 -1
- package/dist/{chunk-TM2CRDJW.js → chunk-HN5UXNLM.js} +33 -12
- package/dist/{chunk-2UJDNCR7.mjs → chunk-HU2ZYTZL.mjs} +44 -32
- package/dist/{chunk-2F7AZHRH.js → chunk-ILSI74FW.js} +49 -20
- package/dist/chunk-KSEB2U7B.js +318 -0
- package/dist/{chunk-EHJC5RYU.mjs → chunk-M7W3EPWR.mjs} +2 -2
- package/dist/{chunk-323C3SE6.js → chunk-MYALGFOC.js} +3 -3
- package/dist/chunk-OGB3BDE5.js +39 -0
- package/dist/{chunk-77B77QNY.mjs → chunk-VQYZG5YE.mjs} +33 -12
- package/dist/{chunk-NNDVMJGY.mjs → chunk-WTASIX7S.mjs} +17 -15
- package/dist/{chunk-R4GXDUM2.mjs → chunk-WU2HALDD.mjs} +11 -5
- package/dist/{chunk-WCUI5X7P.js → chunk-WYV2VL6T.js} +17 -15
- package/dist/{chunk-NTTC774E.mjs → chunk-XSHN3XHD.mjs} +39 -10
- package/dist/{chunk-EEMND2GI.js → chunk-ZM4LIWD4.js} +3 -3
- package/dist/{chunk-2R2MHEOI.js → chunk-ZO6ZPXB7.js} +5 -5
- package/dist/executors.js +10 -9
- package/dist/executors.mjs +11 -10
- package/dist/generators.js +10 -9
- package/dist/generators.mjs +9 -8
- package/dist/index.d.mts +4 -3
- package/dist/index.d.ts +4 -3
- package/dist/index.js +54 -28
- package/dist/index.mjs +59 -33
- package/dist/src/base/index.js +3 -3
- package/dist/src/base/index.mjs +2 -2
- package/dist/src/executors/npm-publish/executor.js +3 -2
- package/dist/src/executors/npm-publish/executor.mjs +2 -1
- package/dist/src/generators/browser-library/generator.js +4 -4
- package/dist/src/generators/browser-library/generator.mjs +3 -3
- package/dist/src/generators/neutral-library/generator.js +4 -4
- package/dist/src/generators/neutral-library/generator.mjs +3 -3
- package/dist/src/generators/node-library/generator.js +4 -4
- package/dist/src/generators/node-library/generator.mjs +3 -3
- package/dist/src/generators/preset/generator.js +4 -3
- package/dist/src/generators/preset/generator.mjs +3 -2
- package/dist/src/plugins/rust/cargo-toml.js +6 -2
- package/dist/src/plugins/rust/cargo-toml.mjs +5 -1
- package/dist/src/plugins/rust/index.js +6 -2
- package/dist/src/plugins/rust/index.mjs +5 -1
- package/dist/src/plugins/typescript/index.js +19 -14
- package/dist/src/plugins/typescript/index.mjs +20 -15
- package/dist/src/plugins/typescript/tsdown.js +16 -11
- package/dist/src/plugins/typescript/tsdown.mjs +16 -11
- package/dist/src/plugins/typescript/tsup.js +16 -11
- package/dist/src/plugins/typescript/tsup.mjs +16 -11
- package/dist/src/plugins/typescript/untyped-schema.js +15 -7
- package/dist/src/plugins/typescript/untyped-schema.mjs +15 -7
- package/dist/src/utils/index.d.mts +4 -3
- package/dist/src/utils/index.d.ts +4 -3
- package/dist/src/utils/index.js +37 -10
- package/dist/src/utils/index.mjs +45 -18
- package/dist/src/utils/lock-file.d.mts +16 -4
- package/dist/src/utils/lock-file.d.ts +16 -4
- package/dist/src/utils/lock-file.js +12 -2
- package/dist/src/utils/lock-file.mjs +11 -1
- package/dist/src/utils/nx-json.js +2 -2
- package/dist/src/utils/nx-json.mjs +1 -1
- package/dist/src/utils/package-manager.d.mts +33 -0
- package/dist/src/utils/package-manager.d.ts +33 -0
- package/dist/src/utils/package-manager.js +14 -0
- package/dist/src/utils/package-manager.mjs +15 -0
- package/dist/src/utils/versions.d.mts +11 -2
- package/dist/src/utils/versions.d.ts +11 -2
- package/dist/src/utils/versions.js +10 -2
- package/dist/src/utils/versions.mjs +11 -3
- package/package.json +15 -10
- package/dist/chunk-F6U5OQR6.js +0 -502
- /package/dist/{chunk-DO2X7OZO.js → chunk-CVKUY5YY.js} +0 -0
- /package/dist/{chunk-XCVH63OO.mjs → chunk-QCN77EOQ.mjs} +0 -0
package/README.md
CHANGED
|
@@ -27,7 +27,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
|
|
|
27
27
|
|
|
28
28
|
<h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
|
|
29
29
|
|
|
30
|
-
[](https://prettier.io/) [](http://nx.dev/) [](https://nextjs.org/) [](http://commitizen.github.io/cz-cli/)  [](https://fumadocs.vercel.app/) 
|
|
31
31
|
|
|
32
32
|
<!-- prettier-ignore-start -->
|
|
33
33
|
<!-- markdownlint-disable -->
|
package/config/base.json
CHANGED
|
@@ -5,15 +5,12 @@
|
|
|
5
5
|
"allProjectFiles": ["sharedGlobals", "{projectRoot}/**/*"],
|
|
6
6
|
"default": ["sharedGlobals", "{projectRoot}/**/*"],
|
|
7
7
|
"sharedGlobals": [
|
|
8
|
-
"{workspaceRoot}/.github/workflows/*.yml",
|
|
9
|
-
"{workspaceRoot}/assets/**/*",
|
|
10
8
|
"{workspaceRoot}/tsconfig.json",
|
|
11
9
|
"{workspaceRoot}/tsconfig.*.json",
|
|
12
10
|
"{workspaceRoot}/.npm@(rc|ignore)",
|
|
13
11
|
"{workspaceRoot}/package.json",
|
|
14
12
|
"{workspaceRoot}/{pnpm-workspace,pnpm-lock,package-lock,yarn-lock}.@(yaml|yml)",
|
|
15
|
-
"{workspaceRoot}/bun.
|
|
16
|
-
"{workspaceRoot}/LICENSE",
|
|
13
|
+
"{workspaceRoot}/bun.lock{,b}",
|
|
17
14
|
"{workspaceRoot}/.git@(attributes|ignore)",
|
|
18
15
|
"{workspaceRoot}/{nx.json,.nxignore}",
|
|
19
16
|
"{workspaceRoot}/storm-workspace{,.*}.@(json|yaml|toml)",
|
|
@@ -21,8 +18,6 @@
|
|
|
21
18
|
"{workspaceRoot}/storm-workspace.config.[jt]s",
|
|
22
19
|
"{workspaceRoot}/.storm-workspace/config{,.*}.[jt]s",
|
|
23
20
|
"{workspaceRoot}/devenv.@(lock|nix|yaml)",
|
|
24
|
-
"{workspaceRoot}/.devenv{,.flake.nix}",
|
|
25
|
-
"{workspaceRoot}/.direnv",
|
|
26
21
|
"{workspaceRoot}/.envrc",
|
|
27
22
|
"{workspaceRoot}/.env{,.local,.*}"
|
|
28
23
|
],
|
|
@@ -30,7 +25,6 @@
|
|
|
30
25
|
"{projectRoot}/**/*",
|
|
31
26
|
"!{projectRoot}/{tools,scripts}/**/*",
|
|
32
27
|
"!{projectRoot}/node_modules/**/*",
|
|
33
|
-
"!{projectRoot}/{dist,out-tsc}/**/*",
|
|
34
28
|
"!{projectRoot}/{api-extractor,tsdoc,typedoc}.json",
|
|
35
29
|
"!{projectRoot}/.eslint-doc-generatorrc.@(js|json)",
|
|
36
30
|
"!{projectRoot}/.storybook/**/*",
|
|
@@ -130,14 +124,12 @@
|
|
|
130
124
|
"{workspaceRoot}/Cargo.lock",
|
|
131
125
|
"{workspaceRoot}/.cargo/config.toml",
|
|
132
126
|
"{workspaceRoot}/rust-toolchain",
|
|
133
|
-
"{workspaceRoot}/rustfmt.toml",
|
|
134
|
-
"{workspaceRoot}/deny.toml",
|
|
135
127
|
"{projectRoot}/Cargo.toml",
|
|
136
128
|
"{projectRoot}/.cargo/config.toml",
|
|
137
129
|
{
|
|
138
130
|
"runtime": "node -p '`${process.platform}_${process.arch}`'"
|
|
139
131
|
},
|
|
140
|
-
"{projectRoot}/
|
|
132
|
+
"{projectRoot}/project.json",
|
|
141
133
|
"{projectRoot}/.env{,.local}",
|
|
142
134
|
"{projectRoot}/**/*.rs",
|
|
143
135
|
"{projectRoot}/**/*.@(proto|acid|acidic|prisma)",
|
|
@@ -152,19 +144,26 @@
|
|
|
152
144
|
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
|
|
153
145
|
"!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)",
|
|
154
146
|
"!{projectRoot}/node_modules/**/*",
|
|
155
|
-
"!{projectRoot}/{dist,out-tsc}/**/*",
|
|
156
147
|
"!{projectRoot}/{benches,e2e,tests,testing}/**/*",
|
|
157
|
-
"!{projectRoot}/docs/**/*",
|
|
158
148
|
"{projectRoot}/package.json",
|
|
159
149
|
"{projectRoot}/tsconfig.json",
|
|
160
150
|
"{projectRoot}/tsconfig.*.json",
|
|
161
|
-
"{projectRoot}/
|
|
151
|
+
"{projectRoot}/project.json",
|
|
162
152
|
"{projectRoot}/.env{,.*}",
|
|
163
|
-
"{projectRoot}
|
|
153
|
+
"!{projectRoot}/docs/**/*",
|
|
154
|
+
"!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)",
|
|
164
155
|
"{projectRoot}/**/*.@(proto|acid|acidic|prisma)",
|
|
165
156
|
"{projectRoot}/src/**/*.@(cts|mts|ts|tsx|graphql|gql|js|cjs|mjs|jsx|json|jsonc|yaml|yml|toml|md|mdx)",
|
|
166
157
|
"{projectRoot}/{build,tsup,tsdown,vite,contentlayer,powerlines,shell-shock,earthquake}.*.[jt]s?(x)",
|
|
167
158
|
"{projectRoot}/{bin,tools,helpers,scripts}/**/*"
|
|
159
|
+
],
|
|
160
|
+
"ci": [
|
|
161
|
+
"sharedGlobals",
|
|
162
|
+
"{workspaceRoot}/.github/workflows/*.yml",
|
|
163
|
+
"{workspaceRoot}/assets/**/*",
|
|
164
|
+
"{workspaceRoot}/devenv.@(lock|nix|yaml)",
|
|
165
|
+
"{workspaceRoot}/.devenv{,.flake.nix}",
|
|
166
|
+
"{workspaceRoot}/.direnv"
|
|
168
167
|
]
|
|
169
168
|
},
|
|
170
169
|
"targetDefaults": {
|
package/config/recommended.json
CHANGED
|
@@ -5,15 +5,12 @@
|
|
|
5
5
|
"allProjectFiles": ["sharedGlobals", "{projectRoot}/**/*"],
|
|
6
6
|
"default": ["sharedGlobals", "{projectRoot}/**/*"],
|
|
7
7
|
"sharedGlobals": [
|
|
8
|
-
"{workspaceRoot}/.github/workflows/*.yml",
|
|
9
|
-
"{workspaceRoot}/assets/**/*",
|
|
10
8
|
"{workspaceRoot}/tsconfig.json",
|
|
11
|
-
"{workspaceRoot}/tsconfig
|
|
9
|
+
"{workspaceRoot}/tsconfig.*.json",
|
|
12
10
|
"{workspaceRoot}/.npm@(rc|ignore)",
|
|
13
11
|
"{workspaceRoot}/package.json",
|
|
14
12
|
"{workspaceRoot}/{pnpm-workspace,pnpm-lock,package-lock,yarn-lock}.@(yaml|yml)",
|
|
15
|
-
"{workspaceRoot}/bun.
|
|
16
|
-
"{workspaceRoot}/LICENSE",
|
|
13
|
+
"{workspaceRoot}/bun.lock{,b}",
|
|
17
14
|
"{workspaceRoot}/.git@(attributes|ignore)",
|
|
18
15
|
"{workspaceRoot}/{nx.json,.nxignore}",
|
|
19
16
|
"{workspaceRoot}/storm-workspace{,.*}.@(json|yaml|toml)",
|
|
@@ -21,7 +18,6 @@
|
|
|
21
18
|
"{workspaceRoot}/storm-workspace.config.[jt]s",
|
|
22
19
|
"{workspaceRoot}/.storm-workspace/config{,.*}.[jt]s",
|
|
23
20
|
"{workspaceRoot}/devenv.@(lock|nix|yaml)",
|
|
24
|
-
"{workspaceRoot}/{flake,shell,devShell}.nix",
|
|
25
21
|
"{workspaceRoot}/.envrc",
|
|
26
22
|
"{workspaceRoot}/.env{,.local,.*}"
|
|
27
23
|
],
|
|
@@ -128,14 +124,12 @@
|
|
|
128
124
|
"{workspaceRoot}/Cargo.lock",
|
|
129
125
|
"{workspaceRoot}/.cargo/config.toml",
|
|
130
126
|
"{workspaceRoot}/rust-toolchain",
|
|
131
|
-
"{workspaceRoot}/rustfmt.toml",
|
|
132
|
-
"{workspaceRoot}/deny.toml",
|
|
133
127
|
"{projectRoot}/Cargo.toml",
|
|
134
128
|
"{projectRoot}/.cargo/config.toml",
|
|
135
129
|
{
|
|
136
130
|
"runtime": "node -p '`${process.platform}_${process.arch}`'"
|
|
137
131
|
},
|
|
138
|
-
"{projectRoot}/
|
|
132
|
+
"{projectRoot}/project.json",
|
|
139
133
|
"{projectRoot}/.env{,.local}",
|
|
140
134
|
"{projectRoot}/**/*.rs",
|
|
141
135
|
"{projectRoot}/**/*.@(proto|acid|acidic|prisma)",
|
|
@@ -154,14 +148,22 @@
|
|
|
154
148
|
"{projectRoot}/package.json",
|
|
155
149
|
"{projectRoot}/tsconfig.json",
|
|
156
150
|
"{projectRoot}/tsconfig.*.json",
|
|
157
|
-
"{projectRoot}/
|
|
151
|
+
"{projectRoot}/project.json",
|
|
158
152
|
"{projectRoot}/.env{,.*}",
|
|
159
|
-
"{projectRoot}/docs/**/*",
|
|
160
|
-
"{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)",
|
|
153
|
+
"!{projectRoot}/docs/**/*",
|
|
154
|
+
"!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)",
|
|
161
155
|
"{projectRoot}/**/*.@(proto|acid|acidic|prisma)",
|
|
162
156
|
"{projectRoot}/src/**/*.@(cts|mts|ts|tsx|graphql|gql|js|cjs|mjs|jsx|json|jsonc|yaml|yml|toml|md|mdx)",
|
|
163
157
|
"{projectRoot}/{build,tsup,tsdown,vite,contentlayer,powerlines,shell-shock,earthquake}.*.[jt]s?(x)",
|
|
164
158
|
"{projectRoot}/{bin,tools,helpers,scripts}/**/*"
|
|
159
|
+
],
|
|
160
|
+
"ci": [
|
|
161
|
+
"sharedGlobals",
|
|
162
|
+
"{workspaceRoot}/.github/workflows/*.yml",
|
|
163
|
+
"{workspaceRoot}/assets/**/*",
|
|
164
|
+
"{workspaceRoot}/devenv.@(lock|nix|yaml)",
|
|
165
|
+
"{workspaceRoot}/.devenv{,.flake.nix}",
|
|
166
|
+
"{workspaceRoot}/.direnv"
|
|
165
167
|
]
|
|
166
168
|
},
|
|
167
169
|
"targetDefaults": {
|
|
@@ -172,8 +174,8 @@
|
|
|
172
174
|
"executor": "nx:run-commands",
|
|
173
175
|
"options": {
|
|
174
176
|
"commands": [
|
|
175
|
-
"
|
|
176
|
-
"
|
|
177
|
+
"rimraf --glob {projectRoot}/dist",
|
|
178
|
+
"rimraf dist/{projectRoot}"
|
|
177
179
|
]
|
|
178
180
|
}
|
|
179
181
|
},
|
|
@@ -193,7 +195,7 @@
|
|
|
193
195
|
"version": {
|
|
194
196
|
"currentVersionResolver": "git-tag",
|
|
195
197
|
"specifierSource": "conventional-commits",
|
|
196
|
-
"groupPreVersionCommand": "
|
|
198
|
+
"groupPreVersionCommand": "build",
|
|
197
199
|
"manifestRootsToUpdate": [
|
|
198
200
|
"{projectRoot}",
|
|
199
201
|
{
|
|
@@ -16,7 +16,16 @@ var lintStagedVersion = "15.0.2";
|
|
|
16
16
|
var semanticReleaseVersion = "22.0.7";
|
|
17
17
|
var nxVersion = "^18.0.4";
|
|
18
18
|
var nodeVersion = "20.11.0";
|
|
19
|
-
var pnpmVersion = "
|
|
19
|
+
var pnpmVersion = "10.3.0";
|
|
20
|
+
var npmVersion = "10.9.0";
|
|
21
|
+
var yarnVersion = "4.6.0";
|
|
22
|
+
var bunVersion = "1.2.0";
|
|
23
|
+
var packageManagerVersions = {
|
|
24
|
+
npm: npmVersion,
|
|
25
|
+
yarn: yarnVersion,
|
|
26
|
+
pnpm: pnpmVersion,
|
|
27
|
+
bun: bunVersion
|
|
28
|
+
};
|
|
20
29
|
|
|
21
30
|
|
|
22
31
|
|
|
@@ -37,4 +46,8 @@ var pnpmVersion = "8.10.2";
|
|
|
37
46
|
|
|
38
47
|
|
|
39
48
|
|
|
40
|
-
|
|
49
|
+
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
exports.tsupVersion = tsupVersion; exports.prettierPackageJsonVersion = prettierPackageJsonVersion; exports.prettierPrismaVersion = prettierPrismaVersion; exports.prettierVersion = prettierVersion; exports.swcCliVersion = swcCliVersion; exports.swcCoreVersion = swcCoreVersion; exports.swcHelpersVersion = swcHelpersVersion; exports.swcNodeVersion = swcNodeVersion; exports.tsLibVersion = tsLibVersion; exports.typesNodeVersion = typesNodeVersion; exports.verdaccioVersion = verdaccioVersion; exports.typescriptVersion = typescriptVersion; exports.eslintVersion = eslintVersion; exports.lintStagedVersion = lintStagedVersion; exports.semanticReleaseVersion = semanticReleaseVersion; exports.nxVersion = nxVersion; exports.nodeVersion = nodeVersion; exports.pnpmVersion = pnpmVersion; exports.npmVersion = npmVersion; exports.yarnVersion = yarnVersion; exports.bunVersion = bunVersion; exports.packageManagerVersions = packageManagerVersions;
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import {
|
|
2
|
+
getConfig
|
|
3
|
+
} from "./chunk-VO3QUJGP.mjs";
|
|
4
|
+
|
|
5
|
+
// src/utils/package-manager.ts
|
|
6
|
+
import {
|
|
7
|
+
detectPackageManager,
|
|
8
|
+
getPackageManagerCommand
|
|
9
|
+
} from "@nx/devkit";
|
|
10
|
+
async function getWorkspacePackageManager(workspaceRoot, config) {
|
|
11
|
+
let packageManager = config?.packageManager;
|
|
12
|
+
if (!packageManager) {
|
|
13
|
+
try {
|
|
14
|
+
packageManager = (await getConfig(workspaceRoot)).packageManager;
|
|
15
|
+
} catch {
|
|
16
|
+
packageManager = void 0;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
if (packageManager === "npm" || packageManager === "yarn" || packageManager === "pnpm" || packageManager === "bun") {
|
|
20
|
+
return packageManager;
|
|
21
|
+
}
|
|
22
|
+
return detectPackageManager(workspaceRoot);
|
|
23
|
+
}
|
|
24
|
+
async function getWorkspacePackageManagerCommand(workspaceRoot, config) {
|
|
25
|
+
const packageManager = await getWorkspacePackageManager(
|
|
26
|
+
workspaceRoot,
|
|
27
|
+
config
|
|
28
|
+
);
|
|
29
|
+
return getPackageManagerCommand(packageManager, workspaceRoot);
|
|
30
|
+
}
|
|
31
|
+
function getInstallCommand(packageManager) {
|
|
32
|
+
return getPackageManagerCommand(packageManager).install;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export {
|
|
36
|
+
getWorkspacePackageManager,
|
|
37
|
+
getWorkspacePackageManagerCommand,
|
|
38
|
+
getInstallCommand
|
|
39
|
+
};
|
|
@@ -3,6 +3,9 @@
|
|
|
3
3
|
var _chunkBAPFD3TOjs = require('./chunk-BAPFD3TO.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
|
+
var _chunkOGB3BDE5js = require('./chunk-OGB3BDE5.js');
|
|
7
|
+
|
|
8
|
+
|
|
6
9
|
|
|
7
10
|
var _chunkHYK7OVZ3js = require('./chunk-HYK7OVZ3.js');
|
|
8
11
|
|
|
@@ -33,6 +36,9 @@ var DefaultCargoPluginProfileMap = {
|
|
|
33
36
|
var createNodesV2 = [
|
|
34
37
|
"*/**/Cargo.toml",
|
|
35
38
|
async (configFiles, options, context) => {
|
|
39
|
+
const { exec } = await _chunkOGB3BDE5js.getWorkspacePackageManagerCommand.call(void 0,
|
|
40
|
+
context.workspaceRoot
|
|
41
|
+
);
|
|
36
42
|
return await _devkit.createNodesFromFiles.call(void 0,
|
|
37
43
|
(configFile, options2, context2) => {
|
|
38
44
|
try {
|
|
@@ -97,7 +103,7 @@ var createNodesV2 = [
|
|
|
97
103
|
dependsOn: ["^lint-markdown"],
|
|
98
104
|
executor: "nx:run-commands",
|
|
99
105
|
options: {
|
|
100
|
-
command:
|
|
106
|
+
command: `${exec} markdownlint-cli2 "{projectRoot}/*.{md,mdx}" "{projectRoot}/**/*.{md,mdx}" --config "node_modules/@storm-software/markdownlint/config/recommended.markdownlint-cli2.jsonc" --fix`
|
|
101
107
|
}
|
|
102
108
|
},
|
|
103
109
|
"lint-ls": {
|
|
@@ -105,7 +111,7 @@ var createNodesV2 = [
|
|
|
105
111
|
inputs: ["linting", "rust", "^production"],
|
|
106
112
|
dependsOn: ["^lint-ls"],
|
|
107
113
|
options: {
|
|
108
|
-
command:
|
|
114
|
+
command: `${exec} ls-lint --config="./node_modules/@storm-software/linting-tools/ls-lint/.ls-lint.yml" `,
|
|
109
115
|
color: true
|
|
110
116
|
}
|
|
111
117
|
},
|
|
@@ -143,7 +149,7 @@ var createNodesV2 = [
|
|
|
143
149
|
dependsOn: ["^format-readme"],
|
|
144
150
|
executor: "nx:run-commands",
|
|
145
151
|
options: {
|
|
146
|
-
command:
|
|
152
|
+
command: `${exec} storm-git readme --templates="tools/readme-templates" --project="{projectName}"`
|
|
147
153
|
}
|
|
148
154
|
},
|
|
149
155
|
"format-toml": {
|
|
@@ -153,7 +159,7 @@ var createNodesV2 = [
|
|
|
153
159
|
dependsOn: ["^format-toml"],
|
|
154
160
|
executor: "nx:run-commands",
|
|
155
161
|
options: {
|
|
156
|
-
command:
|
|
162
|
+
command: `${exec} taplo format --config="node_modules/@storm-software/linting-tools/taplo/config.toml" --cache-path="node_modules/.cache/taplo/{projectRoot}" --colors="always" "{projectRoot}/*.toml" "{projectRoot}/**/*.toml" `
|
|
157
163
|
}
|
|
158
164
|
},
|
|
159
165
|
"format-clippy": {
|
|
@@ -191,7 +197,7 @@ var createNodesV2 = [
|
|
|
191
197
|
outputs: [`{workspaceRoot}/dist/{projectRoot}/target`],
|
|
192
198
|
executor: "nx:run-commands",
|
|
193
199
|
options: {
|
|
194
|
-
command:
|
|
200
|
+
command: `${exec} rimraf dist/{projectRoot}/target`,
|
|
195
201
|
color: true,
|
|
196
202
|
cwd: "{workspaceRoot}"
|
|
197
203
|
}
|
|
@@ -16,7 +16,16 @@ var lintStagedVersion = "15.0.2";
|
|
|
16
16
|
var semanticReleaseVersion = "22.0.7";
|
|
17
17
|
var nxVersion = "^18.0.4";
|
|
18
18
|
var nodeVersion = "20.11.0";
|
|
19
|
-
var pnpmVersion = "
|
|
19
|
+
var pnpmVersion = "10.3.0";
|
|
20
|
+
var npmVersion = "10.9.0";
|
|
21
|
+
var yarnVersion = "4.6.0";
|
|
22
|
+
var bunVersion = "1.2.0";
|
|
23
|
+
var packageManagerVersions = {
|
|
24
|
+
npm: npmVersion,
|
|
25
|
+
yarn: yarnVersion,
|
|
26
|
+
pnpm: pnpmVersion,
|
|
27
|
+
bun: bunVersion
|
|
28
|
+
};
|
|
20
29
|
|
|
21
30
|
export {
|
|
22
31
|
tsupVersion,
|
|
@@ -36,5 +45,9 @@ export {
|
|
|
36
45
|
semanticReleaseVersion,
|
|
37
46
|
nxVersion,
|
|
38
47
|
nodeVersion,
|
|
39
|
-
pnpmVersion
|
|
48
|
+
pnpmVersion,
|
|
49
|
+
npmVersion,
|
|
50
|
+
yarnVersion,
|
|
51
|
+
bunVersion,
|
|
52
|
+
packageManagerVersions
|
|
40
53
|
};
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import {
|
|
2
|
+
getWorkspacePackageManager
|
|
3
|
+
} from "./chunk-5BGCA73V.mjs";
|
|
1
4
|
import {
|
|
2
5
|
getGitHubTools
|
|
3
6
|
} from "./chunk-54BBSJHK.mjs";
|
|
@@ -7,219 +10,32 @@ import {
|
|
|
7
10
|
import {
|
|
8
11
|
getConfig
|
|
9
12
|
} from "./chunk-VO3QUJGP.mjs";
|
|
10
|
-
import {
|
|
11
|
-
findWorkspaceRoot
|
|
12
|
-
} from "./chunk-JUJWJXED.mjs";
|
|
13
13
|
import {
|
|
14
14
|
joinPaths
|
|
15
15
|
} from "./chunk-TBW5MCN6.mjs";
|
|
16
16
|
|
|
17
|
-
//
|
|
18
|
-
import {
|
|
19
|
-
import {
|
|
20
|
-
import stripAnsi from "strip-ansi";
|
|
21
|
-
|
|
22
|
-
// ../npm-tools/src/helpers/get-registry.ts
|
|
23
|
-
import { exec } from "node:child_process";
|
|
24
|
-
|
|
25
|
-
// ../pnpm-tools/src/helpers/catalog.ts
|
|
26
|
-
import { coerce, gt, valid as valid2 } from "semver";
|
|
27
|
-
|
|
28
|
-
// ../pnpm-tools/src/helpers/pnpm-workspace.ts
|
|
29
|
-
import { existsSync } from "node:fs";
|
|
17
|
+
// src/executors/npm-publish/executor.ts
|
|
18
|
+
import { createJiti } from "jiti";
|
|
19
|
+
import { execSync } from "node:child_process";
|
|
30
20
|
import { readFile, writeFile } from "node:fs/promises";
|
|
31
|
-
import { parse, stringify } from "yaml";
|
|
32
|
-
function getPnpmWorkspaceFilePath(workspaceRoot = findWorkspaceRoot(process.cwd())) {
|
|
33
|
-
const pnpmWorkspacePath = joinPaths(workspaceRoot, "pnpm-workspace.yaml");
|
|
34
|
-
if (!existsSync(pnpmWorkspacePath)) {
|
|
35
|
-
throw new Error(
|
|
36
|
-
`No \`pnpm-workspace.yaml\` file found in workspace root (searched in: ${pnpmWorkspacePath}).`
|
|
37
|
-
);
|
|
38
|
-
}
|
|
39
|
-
return pnpmWorkspacePath;
|
|
40
|
-
}
|
|
41
|
-
async function readPnpmWorkspaceFile(workspaceRoot = findWorkspaceRoot(process.cwd())) {
|
|
42
|
-
const result = await readFile(
|
|
43
|
-
getPnpmWorkspaceFilePath(workspaceRoot),
|
|
44
|
-
"utf8"
|
|
45
|
-
);
|
|
46
|
-
if (!result) {
|
|
47
|
-
return void 0;
|
|
48
|
-
}
|
|
49
|
-
return parse(result);
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
// ../pnpm-tools/src/helpers/catalog.ts
|
|
53
|
-
async function getCatalogSafe(workspaceRoot = findWorkspaceRoot(process.cwd())) {
|
|
54
|
-
const pnpmWorkspaceFile = await readPnpmWorkspaceFile(workspaceRoot);
|
|
55
|
-
if (!pnpmWorkspaceFile) {
|
|
56
|
-
throw new Error("No pnpm-workspace.yaml file found");
|
|
57
|
-
}
|
|
58
|
-
if (pnpmWorkspaceFile?.catalog) {
|
|
59
|
-
return Object.fromEntries(
|
|
60
|
-
Object.entries(pnpmWorkspaceFile.catalog).map(([key, value]) => {
|
|
61
|
-
return [key, value.replaceAll('"', "").replaceAll("'", "")];
|
|
62
|
-
})
|
|
63
|
-
);
|
|
64
|
-
} else {
|
|
65
|
-
console.warn(
|
|
66
|
-
`No catalog found in pnpm-workspace.yaml file located in workspace root: ${workspaceRoot}
|
|
67
|
-
File content: ${JSON.stringify(
|
|
68
|
-
pnpmWorkspaceFile,
|
|
69
|
-
null,
|
|
70
|
-
2
|
|
71
|
-
)}`
|
|
72
|
-
);
|
|
73
|
-
}
|
|
74
|
-
return void 0;
|
|
75
|
-
}
|
|
76
|
-
async function getCatalog(workspaceRoot = findWorkspaceRoot(process.cwd())) {
|
|
77
|
-
const catalog = await getCatalogSafe(workspaceRoot);
|
|
78
|
-
if (!catalog) {
|
|
79
|
-
throw new Error("No catalog entries found in pnpm-workspace.yaml file");
|
|
80
|
-
}
|
|
81
|
-
return catalog;
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
// ../pnpm-tools/src/helpers/replace-deps-aliases.ts
|
|
85
|
-
import {
|
|
86
|
-
createProjectGraphAsync,
|
|
87
|
-
readCachedProjectGraph
|
|
88
|
-
} from "@nx/devkit";
|
|
89
|
-
import { existsSync as existsSync2 } from "node:fs";
|
|
90
|
-
import { readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
|
|
91
21
|
import { format } from "prettier";
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
"No package.json file found in package root: " + packageRoot
|
|
98
|
-
);
|
|
99
|
-
}
|
|
100
|
-
const catalog = await getCatalog(workspaceRoot);
|
|
101
|
-
const packageJson = JSON.parse(packageJsonFile);
|
|
102
|
-
const pnpmWorkspacePath = joinPaths(workspaceRoot, "pnpm-workspace.yaml");
|
|
103
|
-
if (!existsSync2(pnpmWorkspacePath)) {
|
|
104
|
-
console.warn(
|
|
105
|
-
`No \`pnpm-workspace.yaml\` file found in workspace root (searching in: ${pnpmWorkspacePath}). Skipping pnpm catalog read for now.`
|
|
106
|
-
);
|
|
107
|
-
return packageJson;
|
|
108
|
-
}
|
|
109
|
-
if (!catalog) {
|
|
110
|
-
console.warn(
|
|
111
|
-
`No pnpm catalog found. Skipping dependencies replacement for now.`
|
|
112
|
-
);
|
|
113
|
-
return;
|
|
114
|
-
}
|
|
115
|
-
for (const dependencyType of [
|
|
116
|
-
"dependencies",
|
|
117
|
-
"devDependencies",
|
|
118
|
-
"peerDependencies"
|
|
119
|
-
]) {
|
|
120
|
-
const dependencies = packageJson[dependencyType];
|
|
121
|
-
if (!dependencies) {
|
|
122
|
-
continue;
|
|
123
|
-
}
|
|
124
|
-
for (const dependencyName of Object.keys(dependencies)) {
|
|
125
|
-
if (dependencies[dependencyName] === "catalog:") {
|
|
126
|
-
if (!catalog) {
|
|
127
|
-
throw new Error(
|
|
128
|
-
`Dependency ${dependencyName} is marked as \`catalog:\`, but no catalog exists in the workspace root's \`pnpm-workspace.yaml\` file.`
|
|
129
|
-
);
|
|
130
|
-
}
|
|
131
|
-
const catalogVersion = catalog[dependencyName];
|
|
132
|
-
if (!catalogVersion) {
|
|
133
|
-
throw new Error("Missing pnpm catalog version for " + dependencyName);
|
|
134
|
-
}
|
|
135
|
-
dependencies[dependencyName] = catalogVersion;
|
|
136
|
-
} else if (dependencies[dependencyName].startsWith("catalog:")) {
|
|
137
|
-
throw new Error("multiple named catalogs not supported");
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
|
-
let projectGraph;
|
|
142
|
-
try {
|
|
143
|
-
projectGraph = readCachedProjectGraph();
|
|
144
|
-
} catch {
|
|
145
|
-
await createProjectGraphAsync();
|
|
146
|
-
projectGraph = readCachedProjectGraph();
|
|
147
|
-
}
|
|
148
|
-
const workspacePackages = {};
|
|
149
|
-
if (projectGraph) {
|
|
150
|
-
await Promise.all(
|
|
151
|
-
Object.keys(projectGraph.nodes).map(async (node) => {
|
|
152
|
-
const projectNode = projectGraph.nodes[node];
|
|
153
|
-
if (projectNode?.data.root) {
|
|
154
|
-
const projectPackageJsonPath = joinPaths(
|
|
155
|
-
workspaceRoot,
|
|
156
|
-
projectNode.data.root,
|
|
157
|
-
"package.json"
|
|
158
|
-
);
|
|
159
|
-
if (existsSync2(projectPackageJsonPath)) {
|
|
160
|
-
const projectPackageJsonContent = await readFile2(
|
|
161
|
-
projectPackageJsonPath,
|
|
162
|
-
"utf8"
|
|
163
|
-
);
|
|
164
|
-
const projectPackageJson = JSON.parse(projectPackageJsonContent);
|
|
165
|
-
if (projectPackageJson.private !== true) {
|
|
166
|
-
workspacePackages[projectPackageJson.name] = projectPackageJson.version;
|
|
167
|
-
}
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
})
|
|
171
|
-
);
|
|
22
|
+
var LARGE_BUFFER = 1024 * 1e6;
|
|
23
|
+
async function replaceDepsAliases(jiti, packageRoot, workspaceRoot, packageManager) {
|
|
24
|
+
if (packageManager === "bun") {
|
|
25
|
+
const { replaceDepsAliases: replaceBunDepsAliases } = await jiti.import(jiti.esmResolve("@storm-software/bun-tools"));
|
|
26
|
+
return replaceBunDepsAliases(packageRoot, workspaceRoot);
|
|
172
27
|
}
|
|
173
|
-
|
|
174
|
-
"
|
|
175
|
-
|
|
176
|
-
"peerDependencies"
|
|
177
|
-
]) {
|
|
178
|
-
const dependencies = packageJson[dependencyType];
|
|
179
|
-
if (!dependencies) {
|
|
180
|
-
continue;
|
|
181
|
-
}
|
|
182
|
-
for (const dependencyName of Object.keys(dependencies)) {
|
|
183
|
-
if (dependencies[dependencyName].startsWith("workspace:")) {
|
|
184
|
-
if (workspacePackages[dependencyName]) {
|
|
185
|
-
dependencies[dependencyName] = `^${workspacePackages[dependencyName]}`;
|
|
186
|
-
} else {
|
|
187
|
-
throw new Error(
|
|
188
|
-
`Workspace dependency ${dependencyName} not found in workspace packages.`
|
|
189
|
-
);
|
|
190
|
-
}
|
|
191
|
-
}
|
|
192
|
-
}
|
|
28
|
+
if (packageManager === "pnpm") {
|
|
29
|
+
const { replaceDepsAliases: replacePnpmDepsAliases } = await jiti.import(jiti.esmResolve("@storm-software/pnpm-tools"));
|
|
30
|
+
return replacePnpmDepsAliases(packageRoot, workspaceRoot);
|
|
193
31
|
}
|
|
194
|
-
return writeFile2(
|
|
195
|
-
packageJsonPath,
|
|
196
|
-
await format(JSON.stringify(packageJson), {
|
|
197
|
-
parser: "json",
|
|
198
|
-
proseWrap: "preserve",
|
|
199
|
-
trailingComma: "none",
|
|
200
|
-
tabWidth: 2,
|
|
201
|
-
semi: true,
|
|
202
|
-
singleQuote: false,
|
|
203
|
-
quoteProps: "as-needed",
|
|
204
|
-
insertPragma: false,
|
|
205
|
-
bracketSameLine: true,
|
|
206
|
-
printWidth: 80,
|
|
207
|
-
bracketSpacing: true,
|
|
208
|
-
arrowParens: "avoid",
|
|
209
|
-
endOfLine: "lf",
|
|
210
|
-
plugins: ["prettier-plugin-packagejson"]
|
|
211
|
-
})
|
|
212
|
-
);
|
|
213
32
|
}
|
|
214
|
-
|
|
215
|
-
// src/executors/npm-publish/executor.ts
|
|
216
|
-
import { createJiti } from "jiti";
|
|
217
|
-
import { execSync } from "node:child_process";
|
|
218
|
-
import { readFile as readFile3, writeFile as writeFile3 } from "node:fs/promises";
|
|
219
|
-
import { format as format2 } from "prettier";
|
|
220
|
-
var LARGE_BUFFER = 1024 * 1e6;
|
|
221
33
|
async function npmPublishExecutorFn(options, context) {
|
|
222
34
|
const workspaceConfig = await getConfig(context.root);
|
|
35
|
+
const packageManager = await getWorkspacePackageManager(
|
|
36
|
+
context.root,
|
|
37
|
+
workspaceConfig
|
|
38
|
+
);
|
|
223
39
|
const github = await getGitHubTools(workspaceConfig);
|
|
224
40
|
const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
|
|
225
41
|
if (!context.projectName) {
|
|
@@ -246,16 +62,16 @@ async function npmPublishExecutorFn(options, context) {
|
|
|
246
62
|
fsCache: joinPaths(context.root, "node_modules/.cache/storm", "jiti"),
|
|
247
63
|
interopDefault: true
|
|
248
64
|
});
|
|
249
|
-
const { getNpmRegistry, getRegistry
|
|
65
|
+
const { getNpmRegistry, getRegistry } = await jiti.import(jiti.esmResolve("@storm-software/npm-tools/helpers"));
|
|
250
66
|
const packageJsonPath = joinPaths(packageRoot, "package.json");
|
|
251
|
-
const packageJsonFile = await
|
|
67
|
+
const packageJsonFile = await readFile(packageJsonPath, "utf8");
|
|
252
68
|
if (!packageJsonFile) {
|
|
253
69
|
github.error(`Could not find \`package.json\` at ${packageJsonPath}`);
|
|
254
70
|
return { success: false };
|
|
255
71
|
}
|
|
256
72
|
const packageJson = JSON.parse(packageJsonFile);
|
|
257
73
|
const projectPackageJsonPath = joinPaths(projectRoot, "package.json");
|
|
258
|
-
const projectPackageJsonFile = await
|
|
74
|
+
const projectPackageJsonFile = await readFile(projectPackageJsonPath, "utf8");
|
|
259
75
|
if (!projectPackageJsonFile) {
|
|
260
76
|
github.error(
|
|
261
77
|
`Could not find \`package.json\` at ${projectPackageJsonPath}`
|
|
@@ -269,9 +85,9 @@ async function npmPublishExecutorFn(options, context) {
|
|
|
269
85
|
);
|
|
270
86
|
if (projectPackageJson.version) {
|
|
271
87
|
packageJson.version = projectPackageJson.version;
|
|
272
|
-
await
|
|
88
|
+
await writeFile(
|
|
273
89
|
packageJsonPath,
|
|
274
|
-
await
|
|
90
|
+
await format(JSON.stringify(packageJson), {
|
|
275
91
|
parser: "json",
|
|
276
92
|
proseWrap: "preserve",
|
|
277
93
|
trailingComma: "none",
|
|
@@ -301,14 +117,14 @@ async function npmPublishExecutorFn(options, context) {
|
|
|
301
117
|
);
|
|
302
118
|
return { success: true };
|
|
303
119
|
}
|
|
304
|
-
await replaceDepsAliases(packageRoot, context.root);
|
|
120
|
+
await replaceDepsAliases(jiti, packageRoot, context.root, packageManager);
|
|
305
121
|
await addPackageJsonGitHead(packageRoot);
|
|
306
122
|
const npmPublishCommandSegments = [`npm publish --json`];
|
|
307
123
|
const npmViewCommandSegments = [
|
|
308
124
|
`npm view ${packageName} versions dist-tags --json`
|
|
309
125
|
];
|
|
310
126
|
const registry = await Promise.resolve(
|
|
311
|
-
options.registry ?? (await
|
|
127
|
+
options.registry ?? (await getRegistry() || getNpmRegistry())
|
|
312
128
|
);
|
|
313
129
|
if (registry) {
|
|
314
130
|
npmPublishCommandSegments.push(`--registry="${registry}" `);
|