Skip to content

Commit 9f862a7

Browse files
committed
fix(cli): refactored versions
1 parent 8962542 commit 9f862a7

File tree

10 files changed

+401
-315
lines changed

10 files changed

+401
-315
lines changed

nx.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,21 @@
77
"appsDir": "apps",
88
"libsDir": "packages"
99
},
10+
"release": {
11+
"version": {
12+
"generatorOptions": {
13+
"currentVersionResolver": "disk"
14+
}
15+
}
16+
},
1017
"targetDefaults": {
1118
"lint": {
1219
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
1320
"cache": true
1421
},
22+
"version-dry": {
23+
"dependsOn": ["^version-dry"]
24+
},
1525
"build-bin": {
1626
"cache": true
1727
},

package.json

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
"@floating-ui/core": "1.4.1",
4040
"@floating-ui/dom": "^1.5.1",
4141
"@fontsource-variable/inter": "5.0.8",
42-
"@jscutlery/semver": "^3.1.0",
42+
"@img/sharp-linux-x64": "^0.33.0",
43+
"@jscutlery/semver": "^4.2.0",
4344
"@k11r/nx-cloudflare-wrangler": "2.7.1",
4445
"@nx/cypress": "17.1.3",
4546
"@nx/eslint": "17.1.3",
@@ -50,6 +51,7 @@
5051
"@nx/storybook": "17.1.3",
5152
"@nx/vite": "17.1.3",
5253
"@nx/workspace": "17.1.3",
54+
"@oddbird/popover-polyfill": "0.3.7",
5355
"@storybook/addon-a11y": "7.6.0",
5456
"@storybook/addon-coverage": "^0.0.9",
5557
"@storybook/addon-essentials": "7.6.0",
@@ -74,6 +76,11 @@
7476
"all-contributors-cli": "^6.26.1",
7577
"autoprefixer": "^10.4.15",
7678
"axe-core": "^4.7.2",
79+
"body-scroll-lock-upgrade": "1.1.0",
80+
"canvas-confetti": "1.9.2",
81+
"class-variance-authority": "0.7.0",
82+
"clsx": "2.0.0",
83+
"tslib": "^2.6.2",
7784
"chromatic": "^6.24.1",
7885
"clipboard-copy": "4.0.1",
7986
"commitizen": "^4.3.0",
@@ -130,7 +137,11 @@
130137
"vite-plugin-static-copy": "0.17.0",
131138
"vite-tsconfig-paths": "4.2.0",
132139
"vitest": "^0.34.3",
133-
"wrangler": "^3.11.0"
140+
"wrangler": "^3.11.0",
141+
"@clack/prompts": "^0.7.0",
142+
"@nx/devkit": "17.1.3",
143+
"kleur": "^4.1.5",
144+
"yargs": "17.7.2"
134145
},
135146
"config": {
136147
"commitizen": {
@@ -142,17 +153,7 @@
142153
"qwik ui components",
143154
"components library"
144155
],
145-
"dependencies": {
146-
"@fontsource-variable/inter": "5.0.8",
147-
"@img/sharp-linux-x64": "^0.33.0",
148-
"@oddbird/popover-polyfill": "0.3.7",
149-
"body-scroll-lock-upgrade": "1.1.0",
150-
"canvas-confetti": "1.9.2",
151-
"class-variance-authority": "0.7.0",
152-
"clsx": "2.0.0",
153-
"shiki": "0.14.5",
154-
"tslib": "^2.6.2"
155-
},
156+
"dependencies": {},
156157
"nx": {
157158
"includedScripts": []
158159
}

packages/cli/bin/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ async function installNxIfNeeded() {
249249
execSync(`${getPackageManagerCommand().addDev} nx@latest`, {
250250
stdio: 'inherit',
251251
});
252+
// TODO: Just add "nx: {} " to package.json and see if it still works
252253
execSync(`${getPackageManagerCommand().exec} nx init --interactive false`, {
253254
stdio: 'inherit',
254255
});

packages/cli/project.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,22 @@
4747
]
4848
}
4949
},
50+
"version-dry": {
51+
"executor": "@jscutlery/semver:version",
52+
"options": {
53+
"dryRun": true,
54+
"trackDeps": true,
55+
"noVerify": true,
56+
"skipCommit": true
57+
}
58+
},
59+
"version": {
60+
"executor": "@jscutlery/semver:version",
61+
"options": {
62+
"trackDeps": true,
63+
"noVerify": true
64+
}
65+
},
5066
"publish": {
5167
"dependsOn": ["build"],
5268
"executor": "ngx-deploy-npm:deploy",

packages/kit-fluffy/project.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,16 @@
9292
}
9393
}
9494
},
95+
"version-dry": {
96+
"executor": "@jscutlery/semver:version",
97+
"options": {
98+
"dryRun": true,
99+
"trackDeps": true,
100+
"noVerify": true,
101+
"skipCommit": true,
102+
"skipProjectChangelog": true
103+
}
104+
},
95105
"publish": {
96106
"dependsOn": ["build"],
97107
"executor": "ngx-deploy-npm:deploy",
@@ -104,13 +114,6 @@
104114
"executor": "@jscutlery/semver:version",
105115
"options": {}
106116
},
107-
"version-dry": {
108-
"executor": "@jscutlery/semver:version",
109-
"options": {
110-
"dryRun": true,
111-
"releaseAs": "patch"
112-
}
113-
},
114117
"version-publish": {
115118
"executor": "@jscutlery/semver:version",
116119
"options": {
@@ -120,7 +123,6 @@
120123
"postTargets": ["fluffy:publish", "fluffy:push-to-github"]
121124
}
122125
},
123-
124126
"push-to-github": {
125127
"executor": "@jscutlery/semver:github",
126128
"options": {

packages/kit-headless/project.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
"executor": "@jscutlery/semver:version",
3737
"options": {
3838
"dryRun": true,
39-
"releaseAs": "patch"
39+
"trackDeps": true,
40+
"noVerify": true,
41+
"skipCommit": true
4042
}
4143
},
4244

packages/utils/project.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
"executor": "@jscutlery/semver:version",
3131
"options": {
3232
"dryRun": true,
33-
"releaseAs": "patch"
33+
"trackDeps": true,
34+
"noVerify": true,
35+
"skipCommit": true
3436
}
3537
},
3638
"version": {

packages/utils/vite.config.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { defineConfig } from 'vite';
33

44
import * as path from 'path';
55
import dts from 'vite-plugin-dts';
6+
import { viteStaticCopy } from 'vite-plugin-static-copy';
67
import viteTsConfigPaths from 'vite-tsconfig-paths';
78

89
export default defineConfig({
@@ -17,6 +18,9 @@ export default defineConfig({
1718
viteTsConfigPaths({
1819
root: '../../',
1920
}),
21+
viteStaticCopy({
22+
targets: [{ src: './README.md', dest: './' }],
23+
}),
2024
],
2125

2226
// Uncomment this if you are using workers.

0 commit comments

Comments
 (0)