Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -325,9 +325,9 @@ jobs:
- run:
command: |
corepack enable
cp /tmp/storybook-sandboxes /tmp/storybook/sandbox -r --remove-destination
TEMPLATE=$(yarn get-template --cadence << pipeline.parameters.workflow >> --task chromatic)
cd $(STORYBOOK_SANDBOX_ROOT=./sandbox yarn get-sandbox-dir --template $TEMPLATE) && yarn
cd $(yarn get-sandbox-dir --template $TEMPLATE) && yarn
cp /tmp/storybook-sandboxes /tmp/storybook/sandbox -r --remove-destination
name: Install sandbox dependencies
- run:
command: STORYBOOK_SANDBOX_ROOT=./sandbox yarn task --task chromatic --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task chromatic) --no-link --start-from=never --junit
Expand Down Expand Up @@ -775,7 +775,7 @@ jobs:
steps:
- checkout
- attach_workspace:
at: /tmp
at: C:\Users\circleci
- run:
command: |
choco install nodejs-lts --version=22.11.0 -y
Expand Down Expand Up @@ -924,6 +924,7 @@ jobs:
STORYBOOK_INIT_EMPTY_TYPE: << parameters.template >>
name: Storybook init from empty directory (Windows --skip-install)
shell: bash.exe
working_directory: C:\Users\circleci\storybook
test-init-features:
executor:
class: small
Expand Down
4 changes: 2 additions & 2 deletions .circleci/src/jobs/chromatic-sandboxes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ steps:
# chromatic can only run in a git directory
command: |
corepack enable
cp /tmp/storybook-sandboxes /tmp/storybook/sandbox -r --remove-destination
TEMPLATE=$(yarn get-template --cadence << pipeline.parameters.workflow >> --task chromatic)
cd $(STORYBOOK_SANDBOX_ROOT=./sandbox yarn get-sandbox-dir --template $TEMPLATE) && yarn
cd $(yarn get-sandbox-dir --template $TEMPLATE) && yarn
cp /tmp/storybook-sandboxes /tmp/storybook/sandbox -r --remove-destination
- run:
name: Running Chromatic
command: STORYBOOK_SANDBOX_ROOT=./sandbox yarn task --task chromatic --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task chromatic) --no-link --start-from=never --junit
Expand Down
4 changes: 3 additions & 1 deletion .circleci/src/jobs/test-init-empty-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ parameters:
template:
type: string

working_directory: 'C:\Users\circleci\storybook'

steps:
- checkout
- attach_workspace:
at: /tmp
at: 'C:\Users\circleci'
- run:
name: Setup Node & Yarn on Windows
shell: bash.exe
Expand Down
4 changes: 1 addition & 3 deletions code/lib/cli-storybook/src/sandbox-templates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -629,9 +629,7 @@ export const baseTemplates = {
script:
'npx -p @angular/cli@next ng new angular-v16 --directory {{beforeDir}} --routing=true --minimal=true --style=scss --strict --skip-git --skip-install --package-manager=yarn --ssr',
modifications: {
// Angular 21 has introduced a peer dependency requirement on standard-schema via @angular/forms`
// TODO: use @angular/forms@next as soon as @angular/cli@next points to the same version
extraDependencies: ['@standard-schema/spec@^1', '@angular/forms@^21.0.0'],
extraDependencies: ['@standard-schema/spec@^1', '@angular/forms@next'],
},
expected: {
framework: '@storybook/angular',
Expand Down
4 changes: 2 additions & 2 deletions scripts/sandbox/generate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ const withLocalRegistry = async ({ action, cwd, env, debug }: LocalRegistryProps
console.log(`📦 Configuring local registry: ${LOCAL_REGISTRY_URL}`);
// NOTE: for some reason yarn prefers the npm registry in
// local development, so always use npm
await runCommand(`npm config set registry ${LOCAL_REGISTRY_URL}`, { cwd, env }, debug);
await runCommand(`npm config set registry ${LOCAL_REGISTRY_URL} -g`, { cwd, env }, debug);
await action();
} catch (e) {
error = e;
} finally {
console.log(`📦 Restoring registry: ${prevUrl}`);
await runCommand(`npm config set registry ${prevUrl}`, { cwd, env }, debug);
await runCommand(`npm config set registry ${prevUrl} -g`, { cwd, env }, debug);

if (error) {
throw error;
Expand Down