Skip to content

Commit

Permalink
Merge branch 'main' of github.com:chromaui/chromatic-cli into reuben/…
Browse files Browse the repository at this point in the history
…upgrade-storybook
  • Loading branch information
ethriel3695 committed May 29, 2024
2 parents d11e44a + 3141b14 commit 1ba069a
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- v4-dependencies-
- run: corepack use yarn@4.2.2
- run: yarn set version berry
- run: yarn install
- run: yarn install --immutable

- save_cache:
paths:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
Binary file modified .yarn/install-state.gz
Binary file not shown.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# v11.4.1 (Mon May 27 2024)

#### 🐛 Bug Fix

- Pass `CI=1` environment variable to Storybook build command to disable prompts [#991](https://github.com/chromaui/chromatic-cli/pull/991) ([@ghengeveld](https://github.com/ghengeveld))
- Setup Slack plugin for auto to notify on new CLI releases [#990](https://github.com/chromaui/chromatic-cli/pull/990) ([@ghengeveld](https://github.com/ghengeveld))

#### Authors: 1

- Gert Hengeveld ([@ghengeveld](https://github.com/ghengeveld))

---

# v11.4.0 (Tue May 21 2024)

#### 🚀 Enhancement
Expand Down
4 changes: 2 additions & 2 deletions node-src/tasks/build.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ describe('buildStorybook', () => {
await buildStorybook(ctx);
expect(command).toHaveBeenCalledWith(
ctx.buildCommand,
expect.objectContaining({ env: { NODE_ENV: 'production' } })
expect.objectContaining({ env: { CI: '1', NODE_ENV: 'production' } })
);
});

Expand All @@ -167,7 +167,7 @@ describe('buildStorybook', () => {
await buildStorybook(ctx);
expect(command).toHaveBeenCalledWith(
ctx.buildCommand,
expect.objectContaining({ env: { NODE_ENV: 'test' } })
expect.objectContaining({ env: { CI: '1', NODE_ENV: 'test' } })
);
});
});
Expand Down
3 changes: 2 additions & 1 deletion node-src/tasks/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,9 @@ export const buildStorybook = async (ctx: Context) => {

const subprocess = execaCommand(ctx.buildCommand, {
stdio: [null, logFile, null],
preferLocal: true,
signal,
env: { NODE_ENV: ctx.env.STORYBOOK_NODE_ENV || 'production' },
env: { CI: '1', NODE_ENV: ctx.env.STORYBOOK_NODE_ENV || 'production' },
});
await Promise.race([subprocess, timeoutAfter(ctx.env.STORYBOOK_BUILD_TIMEOUT)]);
} catch (e) {
Expand Down
10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chromatic",
"version": "11.4.0",
"version": "11.4.1",
"description": "Automate visual testing across browsers. Gather UI feedback. Versioned documentation.",
"keywords": [
"storybook-addon",
Expand Down Expand Up @@ -112,6 +112,7 @@
"@actions/github": "^5.0.0",
"@antfu/ni": "^0.21.5",
"@auto-it/exec": "^11.0.4",
"@auto-it/slack": "^11.1.6",
"@discoveryjs/json-ext": "^0.5.7",
"@storybook/addon-essentials": "^8.1.2",
"@storybook/addon-webpack5-compiler-swc": "^1.0.2",
Expand Down Expand Up @@ -237,6 +238,13 @@
{
"afterShipIt": "yarn run publish-action"
}
],
[
"slack",
{
"atTarget": "support-team",
"iconEmoji": ":package:"
}
]
]
},
Expand Down
24 changes: 24 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ __metadata:
languageName: node
linkType: hard

"@atomist/slack-messages@npm:^1.2.2":
version: 1.2.2
resolution: "@atomist/slack-messages@npm:1.2.2"
checksum: 10c0/1d060a0a19a047e3f95596c9bb08051d7309c88a8fcbc08d172ec6c415bca0a3b08f8497a05dbaeb5320bf6f5dbc98d8134168bbd4cc12e8107204479e3ab6af
languageName: node
linkType: hard

"@auto-it/bot-list@npm:11.1.6":
version: 11.1.6
resolution: "@auto-it/bot-list@npm:11.1.6"
Expand Down Expand Up @@ -191,6 +198,22 @@ __metadata:
languageName: node
linkType: hard

"@auto-it/slack@npm:^11.1.6":
version: 11.1.6
resolution: "@auto-it/slack@npm:11.1.6"
dependencies:
"@atomist/slack-messages": "npm:^1.2.2"
"@auto-it/core": "npm:11.1.6"
"@octokit/rest": "npm:^18.12.0"
fp-ts: "npm:^2.5.3"
https-proxy-agent: "npm:^5.0.0"
io-ts: "npm:^2.1.2"
node-fetch: "npm:2.6.7"
tslib: "npm:2.1.0"
checksum: 10c0/8e68d0b97836184e50bb4ba297a5230d2da6faf1c46f856df3deda31bacd926983d576a87edf365ee1891ea0f36dff77b47f3af0f7e05cc7717f9513d8970b38
languageName: node
linkType: hard

"@auto-it/version-file@npm:11.1.6":
version: 11.1.6
resolution: "@auto-it/version-file@npm:11.1.6"
Expand Down Expand Up @@ -6491,6 +6514,7 @@ __metadata:
"@actions/github": "npm:^5.0.0"
"@antfu/ni": "npm:^0.21.5"
"@auto-it/exec": "npm:^11.0.4"
"@auto-it/slack": "npm:^11.1.6"
"@discoveryjs/json-ext": "npm:^0.5.7"
"@storybook/addon-essentials": "npm:^8.1.2"
"@storybook/addon-webpack5-compiler-swc": "npm:^1.0.2"
Expand Down

0 comments on commit 1ba069a

Please sign in to comment.