Skip to content

Commit 6e6a31c

Browse files
kasperpeulenkasperpeulen
committed
Fix
1 parent 7c89c17 commit 6e6a31c

File tree

52 files changed

+59
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+59
-27
lines changed

‎.github/workflows/nx.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
nx:
1919
runs-on: ubuntu-latest
2020
env:
21-
ALL_TASKS: check,knip,test,pretty-docs,lint,sandbox,build,e2e-tests,e2e-tests-dev,test-runner,vitest-integration,check-sandbox,e2e-ui,jest,vitest,playwright-ct,cypress
21+
ALL_TASKS: compile,check,knip,test,pretty-docs,lint,sandbox,build,e2e-tests,e2e-tests-dev,test-runner,vitest-integration,check-sandbox,e2e-ui,jest,vitest,playwright-ct,cypress
2222
steps:
2323
- uses: actions/checkout@v4
2424
with:

‎code/addons/vitest/src/vitest-plugin/index.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,10 @@ export const storybookTest = async (options?: UserOptions): Promise<Plugin[]> =>
135135

136136
const stories = await presets.apply('stories', []);
137137

138-
const root = resolve(finalOptions.configDir, '..');
138+
// We can probably add more config here. See code/builders/builder-vite/src/vite-config.ts
139+
// This one is specifically needed for code/builders/builder-vite/src/preset.ts
140+
const commonConfig = { root: resolve(finalOptions.configDir, '..') };
141+
139142
const [
140143
{ storiesGlobs },
141144
framework,
@@ -150,7 +153,7 @@ export const storybookTest = async (options?: UserOptions): Promise<Plugin[]> =>
150153
getStoryGlobsAndFiles(presets, directories),
151154
presets.apply('framework', undefined),
152155
presets.apply('env', {}),
153-
presets.apply<{ plugins?: Plugin[] }>('viteFinal', { root } as any),
156+
presets.apply<{ plugins?: Plugin[]; root: string }>('viteFinal', commonConfig),
154157
presets.apply('staticDirs', []),
155158
extractTagsFromPreview(finalOptions.configDir),
156159
presets.apply('core'),

‎code/renderers/svelte/project.json‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@
55
"compile": {},
66
"check": {
77
"executor": "nx:run-commands",
8-
"options": {
9-
"cwd": "{projectRoot}",
10-
"command": "svelte-check"
11-
},
12-
"dependsOn": [
13-
{
14-
"projects": ["*"],
15-
"target": "compile"
16-
}
17-
]
8+
"options": { "cwd": "{projectRoot}", "command": "svelte-check" }
189
}
1910
},
2011
"tags": ["ci:normal"]

‎code/renderers/vue3/project.json‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@
55
"compile": {},
66
"check": {
77
"executor": "nx:run-commands",
8-
"options": {
9-
"cwd": "{projectRoot}",
10-
"command": "vue-tsc --noEmit"
11-
},
12-
"dependsOn": [
13-
{
14-
"projects": ["*"],
15-
"target": "compile"
16-
}
17-
]
8+
"options": { "cwd": "{projectRoot}", "command": "vue-tsc --noEmit" }
189
}
1910
},
2011
"tags": ["ci:normal"]

‎code/sandbox/angular-cli-default-ts/project.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "angular-cli/default-ts",
3+
"description": "Do not edit. Auto generated by scripts/create-nx-sandbox-projects.ts.",
34
"projectType": "application",
45
"implicitDependencies": [
56
"core",

‎code/sandbox/angular-cli-prerelease/project.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "angular-cli/prerelease",
3+
"description": "Do not edit. Auto generated by scripts/create-nx-sandbox-projects.ts.",
34
"projectType": "application",
45
"implicitDependencies": [
56
"core",

‎code/sandbox/bench-react-vite-default-ts-nodocs/project.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "bench/react-vite-default-ts-nodocs",
3+
"description": "Do not edit. Auto generated by scripts/create-nx-sandbox-projects.ts.",
34
"projectType": "application",
45
"implicitDependencies": [
56
"core",

‎code/sandbox/bench-react-vite-default-ts-test-build/project.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "bench/react-vite-default-ts-test-build",
3+
"description": "Do not edit. Auto generated by scripts/create-nx-sandbox-projects.ts.",
34
"projectType": "application",
45
"implicitDependencies": [
56
"core",

‎code/sandbox/bench-react-vite-default-ts/project.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "bench/react-vite-default-ts",
3+
"description": "Do not edit. Auto generated by scripts/create-nx-sandbox-projects.ts.",
34
"projectType": "application",
45
"implicitDependencies": [
56
"core",

‎code/sandbox/bench-react-webpack-18-ts-test-build/project.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "bench/react-webpack-18-ts-test-build",
3+
"description": "Do not edit. Auto generated by scripts/create-nx-sandbox-projects.ts.",
34
"projectType": "application",
45
"implicitDependencies": [
56
"core",

0 commit comments

Comments
 (0)