diff --git a/package.json b/package.json index eebf55b32509..5add9b064b81 100644 --- a/package.json +++ b/package.json @@ -26,16 +26,16 @@ "nx": "nx", "pretty-docs": "cd scripts; yarn install >/dev/null; yarn docs:prettier:write", "start": "yarn task --task dev --template react-vite/default-ts --start-from=install", - "svelte-ecosystem-ci:before-test": "node ./scripts/ecosystem-ci/before-test.js svelte-kit/skeleton-ts && cd ../storybook-sandboxes/svelte-kit-skeleton-ts && yarn install", - "svelte-ecosystem-ci:build": "yarn task --task install && yarn --cwd code build svelte && yarn task --task sandbox --template svelte-kit/skeleton-ts --start-from=compile --no-link --skip-cache", - "svelte-ecosystem-ci:test": "yarn task --task test-runner --template svelte-kit/skeleton-ts --start-from=build --no-link --skip-cache && yarn task --task vitest-integration --template svelte-kit/skeleton-ts --start-from vitest-integration --no-link --skip-cache", + "svelte-ecosystem-ci:before-test": "STORYBOOK_SANDBOX_ROOT=./storybook-sandboxes node ./scripts/ecosystem-ci/before-test.js svelte-kit/skeleton-ts && cd ./storybook-sandboxes/svelte-kit-skeleton-ts && STORYBOOK_SANDBOX_ROOT=./storybook-sandboxes yarn install", + "svelte-ecosystem-ci:build": "yarn task --task install && yarn --cwd code build svelte && STORYBOOK_SANDBOX_ROOT=./storybook-sandboxes yarn task --task sandbox --template svelte-kit/skeleton-ts --start-from=compile --no-link --skip-cache", + "svelte-ecosystem-ci:test": "STORYBOOK_SANDBOX_ROOT=./storybook-sandboxes yarn task --task test-runner --template svelte-kit/skeleton-ts --start-from=build --no-link --skip-cache && STORYBOOK_SANDBOX_ROOT=./storybook-sandboxes yarn task --task vitest-integration --template svelte-kit/skeleton-ts --start-from=vitest-integration --no-link --skip-cache", "task": "yarn --cwd=./scripts task", "test": "cd code; yarn test", "test:watch": "cd code; yarn test:watch", "upload-bench": "cd scripts; yarn upload-bench", - "vite-ecosystem-ci:before-test": "node ./scripts/ecosystem-ci/before-test.js react-vite/default-ts && cd ../storybook-sandboxes/react-vite-default-ts && yarn install", - "vite-ecosystem-ci:build": "yarn task --task sandbox --template react-vite/default-ts --start-from=install --skip-cache", - "vite-ecosystem-ci:test": "yarn task --task test-runner-dev --template react-vite/default-ts --start-from=dev && yarn task --task test-runner --template react-vite/default-ts --start-from=build && yarn task --task vitest-integration --template react-vite/default-ts --start-from vitest-integration" + "vite-ecosystem-ci:before-test": "STORYBOOK_SANDBOX_ROOT=./storybook-sandboxes node ./scripts/ecosystem-ci/before-test.js react-vite/default-ts && cd ./storybook-sandboxes/react-vite-default-ts && yarn install", + "vite-ecosystem-ci:build": "STORYBOOK_SANDBOX_ROOT=./storybook-sandboxes yarn task --task sandbox --template react-vite/default-ts --start-from=install --skip-cache", + "vite-ecosystem-ci:test": "STORYBOOK_SANDBOX_ROOT=./storybook-sandboxes yarn task --task test-runner-dev --template react-vite/default-ts --start-from=dev && yarn task --task test-runner --template react-vite/default-ts --start-from=build && yarn task --task vitest-integration --template react-vite/default-ts --start-from=vitest-integration" }, "packageManager": "yarn@4.10.3", "engines": { diff --git a/scripts/ecosystem-ci/before-test.js b/scripts/ecosystem-ci/before-test.js index e98b8f35c805..12da33ce7e56 100644 --- a/scripts/ecosystem-ci/before-test.js +++ b/scripts/ecosystem-ci/before-test.js @@ -19,7 +19,7 @@ const sandbox = process.argv[2] ?? 'react-vite/default-ts'; const rootPackageJsonPath = resolve(__dirname, '../../package.json'); const sandboxPackageJsonPath = resolve( __dirname, - `../../../storybook-sandboxes/${sandbox.replace('/', '-')}/package.json` + `../../storybook-sandboxes/${sandbox.replace('/', '-')}/package.json` ); const rootPackageJson = JSON.parse(await readFile(rootPackageJsonPath, 'utf-8')); diff --git a/scripts/utils/yarn.ts b/scripts/utils/yarn.ts index dc186f06aa9a..999d1343f77c 100644 --- a/scripts/utils/yarn.ts +++ b/scripts/utils/yarn.ts @@ -72,8 +72,8 @@ export const installYarn2 = async ({ cwd, dryRun, debug }: YarnOptions) => { { dryRun, debug, - startMessage: `🧶 Installing Yarn 2`, - errorMessage: `🚨 Installing Yarn 2 failed`, + startMessage: `🧶 Installing Yarn`, + errorMessage: `🚨 Installing Yarn failed`, } ); };