Skip to content

Commit

Permalink
Merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
ghengeveld committed Sep 1, 2023
1 parent c042671 commit 54d4958
Show file tree
Hide file tree
Showing 41 changed files with 44,835 additions and 100 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/smoke-test-node14.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: '14'
node-version: 14
- run: yarn
- run: yarn build
- uses: ./
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/smoke-test-node16.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: '16'
node-version: 16
- run: yarn
- run: yarn build
- uses: ./
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/smoke-test-node18.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Smoke test via Node 18
on: push

jobs:
self-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 18
- run: yarn
- run: yarn build
- uses: ./
with:
buildScriptName: build-test-storybook
exitZeroOnChanges: true
forceRebuild: true
onlyChanged: true
env:
LOG_LEVEL: debug
DEBUG: chromatic-cli
CHROMATIC_PROJECT_TOKEN: ${{ secrets.SMOKE_TESTS_CHROMATIC_PROJECT_TOKEN }}
25 changes: 25 additions & 0 deletions .github/workflows/smoke-test-node20.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Smoke test via Node 20
on: push

jobs:
self-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 20
- run: yarn
- run: yarn build
- uses: ./
with:
buildScriptName: build-test-storybook
exitZeroOnChanges: true
forceRebuild: true
onlyChanged: true
env:
LOG_LEVEL: debug
DEBUG: chromatic-cli
CHROMATIC_PROJECT_TOKEN: ${{ secrets.SMOKE_TESTS_CHROMATIC_PROJECT_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/smoke-test-npx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ jobs:
chromatic:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v1
with:
node-version: '16.x'
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 16
- name: install
run: yarn && git status --porcelain
- name: prep package
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/smoke-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ jobs:
chromatic:
runs-on: windows-latest
steps:
- uses: actions/setup-node@v1
with:
node-version: '16.x'
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 16
- name: install
run: yarn
- name: prep package
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoke-test-yarn-berry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: '18'
node-version: 18
- run: rm -rf subdir # remove conflicting subproject
- run: yarn set version berry
- name: install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoke-test-yarn-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: '18'
node-version: 18
- run: rm -rf subdir # remove conflicting subproject
- run: yarn set version canary
- name: install
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/smoke-test-yarn-classic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ jobs:
chromatic:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v1
with:
node-version: '16.x'
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 16
- run: rm -rf subdir # remove conflicting subproject
- run: yarn set version 1.x.x
- run: yarn install
Expand Down
34 changes: 34 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,43 @@
# 6.24.1 - 2023-08-25

- [803](https://github.com/chromaui/chromatic-cli/pull/803) Support Mode Name as Suffix for Build Progress Indicator

# 6.24.0 - 2023-08-24

- [801](https://github.com/chromaui/chromatic-cli/pull/801) Fix `Unexpected build status: PREPARED` error
- [802](https://github.com/chromaui/chromatic-cli/pull/802) Include all commit info in `GitInfo`

# 6.23.1 - 2023-08-24

- [800](https://github.com/chromaui/chromatic-cli/pull/800) Fix type signature for `runAll` and `runBuild`

# 6.23.0 - 2023-08-22

- [795](https://github.com/chromaui/chromatic-cli/pull/795) Add `--local` flag and pass to builds as `isLocalBuild`
- [796](https://github.com/chromaui/chromatic-cli/pull/796) Pass `gitUserEmailHash` up with new builds and use `localBuilds` filter in baseline calculations

# 6.22.0 - 2023-08-15

- [798](https://github.com/chromaui/chromatic-cli/pull/798) Calculate and record `uncommittedHash` when creating a build

# 6.21.0 - 2023-08-07

- [794](https://github.com/chromaui/chromatic-cli/pull/794) Add `getGitInfo` function exported by the Node API
- [780](https://github.com/chromaui/chromatic-cli/pull/780) Add support for `schedule` GitHub Action workflow trigger
- [793](https://github.com/chromaui/chromatic-cli/pull/793) Update snyk parser and added tests for yarn berry

# 6.20.0 - 2023-07-21

- [788](https://github.com/chromaui/chromatic-cli/pull/788) Track Build ID for Storybook Uploads

# 6.19.9 - 2023-06-22

- [734](https://github.com/chromaui/chromatic-cli/pull/734) Add support for `release` event to Github action.
- [750](https://github.com/chromaui/chromatic-cli/pull/750) Update CI to store tokens in environment variables
- [775](https://github.com/chromaui/chromatic-cli/pull/775) Increase timeout for Git command(s) execution

# 6.19.8 - 2023-06-16

- [765](https://github.com/chromaui/chromatic-cli/pull/765) Add some fields to package.json to help resolve types in entrypoints
- [773](https://github.com/chromaui/chromatic-cli/pull/773) Bump the Loggly Dependency

Expand Down
6 changes: 6 additions & 0 deletions action-src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ const getBuildInfo = (event: typeof context) => {
slug: event.payload.repository.full_name,
};
}
case 'schedule':
return {
sha: event.sha,
branch: event.ref.replace('refs/heads/', ''),
slug: event.payload.repository.full_name,
};
case 'release': {
return {
sha: event.sha,
Expand Down
184 changes: 184 additions & 0 deletions node-src/__mocks__/dependencyChanges/berry-chalk-package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
{
"name": "chromatic",
"version": "6.20.0",
"description": "Automate visual testing across browsers. Gather UI feedback. Versioned documentation.",
"keywords": ["storybook-addon", "storybook", "addon", "test", "popular"],
"homepage": "https://www.chromatic.com",
"bugs": {
"url": "https://github.com/chromaui/chromatic-cli",
"email": "support@chromatic.com"
},
"repository": {
"type": "git",
"url": "https://github.com/chromaui/chromatic-cli.git"
},
"license": "MIT",
"exports": {
".": {
"types": "./dist/node.d.ts",
"require": "./isChromatic.js",
"import": "./isChromatic.mjs"
},
"./node": {
"types": "./dist/node.d.ts",
"require": "./dist/node.js",
"node": "./dist/node.js"
},
"./isChromatic": {
"types": "./isChromatic.d.ts",
"require": "./isChromatic.js",
"import": "./isChromatic.mjs"
}
},
"main": "isChromatic.js",
"module": "isChromatic.mjs",
"typesVersions": {
"*": {
"*": ["./isChromatic.d.ts"],
"isChromatic": ["./isChromatic.d.ts"],
"node": ["dist/node.d.ts"]
}
},
"bin": {
"chroma": "dist/bin.js",
"chromatic": "dist/bin.js",
"chromatic-cli": "dist/bin.js"
},
"files": ["dist/*.js", "dist/node.d.ts", "isChromatic.js", "isChromatic.mjs", "isChromatic.d.ts"],
"scripts": {
"build": "tsup",
"build-storybook": "build-storybook -s static",
"build-test-storybook": "cross-env SMOKE_TEST=true build-storybook -o test-storybook",
"build-subdir": "cd subdir ; yarn build ; cd ..",
"chromatic": "./dist/bin.js",
"chromatic-prebuilt": "./dist/bin.js --storybook-build-dir=\"storybook-static\"",
"chromatic-staging": "CHROMATIC_INDEX_URL=https://www.staging-chromatic.com ./dist/bin.js",
"chromatic-verbose": "cross-env LOG_LEVEL=verbose ./dist/bin.js",
"lint": "yarn lint:js .storybook bin-src node-src test-stories ./isChromatic.js ./isChromatic.mjs",
"lint:js": "cross-env NODE_ENV=production eslint --fix --cache --cache-location=.cache/eslint --ext .js,.json,.mjs,.ts,.cjs --report-unused-disable-directives",
"lint:package": "sort-package-json",
"release": "node scripts/release.js",
"trace": "node -r esm bin-src/trace.js",
"trim-stats": "node -r esm bin-src/trim-stats-file.js",
"storybook": "start-storybook -p 9009 -s static",
"test": "jest",
"prepare": "husky install && npm run build",
"dev": "tsup --watch",
"lint-staged": "lint-staged"
},
"lint-staged": {
"*.ts": ["yarn lint:js --fix"],
"*.js": ["yarn lint:js --fix"],
"*.json": ["yarn lint:js --fix"],
"package.json": ["yarn lint:package"]
},
"resolutions": {
"any-observable": "^0.5.1",
"chalk": "^4.1.2"
},
"devDependencies": {
"@actions/core": "^1.10.0",
"@actions/github": "^5.0.0",
"@babel/cli": "^7.14.8",
"@babel/core": "^7.15.0",
"@babel/node": "^7.15.4",
"@babel/plugin-transform-runtime": "^7.15.0",
"@babel/preset-env": "^7.15.0",
"@babel/preset-typescript": "^7.15.0",
"@babel/runtime": "^7.15.3",
"@discoveryjs/json-ext": "^0.5.7",
"@storybook/addon-essentials": "^6.5.6",
"@storybook/builder-webpack5": "^6.5.6",
"@storybook/csf-tools": "^7.0.12",
"@storybook/eslint-config-storybook": "^3.1.2",
"@storybook/linter-config": "^3.1.2",
"@storybook/manager-webpack5": "^6.5.6",
"@storybook/react": "^6.5.6",
"@types/archiver": "^5.3.1",
"@types/async-retry": "^1.4.3",
"@types/cross-spawn": "^6.0.2",
"@types/fs-extra": "^9.0.13",
"@types/jest": "^27.5.0",
"@types/jsonfile": "^6.0.1",
"@types/listr": "^0.14.4",
"@types/node": "^14.14.25",
"@types/picomatch": "^2.3.0",
"@types/progress-stream": "^2.0.2",
"@types/semver": "^7.3.9",
"@typescript-eslint/eslint-plugin": "^5.59.8",
"@typescript-eslint/parser": "^5.59.8",
"ansi-html": "0.0.8",
"any-observable": "^0.5.1",
"archiver": "^5.3.0",
"async-retry": "^1.3.3",
"babel-preset-minify": "^0.5.1",
"chalk": "5.3.0",
"cpy": "^8.1.2",
"cross-env": "^7.0.3",
"cross-spawn": "^7.0.3",
"debug": "^4.3.2",
"dotenv": "^8.2.0",
"env-ci": "^5.0.2",
"esbuild-jest": "^0.5.0",
"eslint": "^7.32.0",
"eslint-plugin-jest": "^27.2.1",
"esm": "^3.2.25",
"execa": "^5.0.0",
"fake-tag": "^2.0.0",
"fs-extra": "^10.0.0",
"https-proxy-agent": "^5.0.0",
"husky": "^8.0.3",
"jest": "^27.0.6",
"jsonfile": "^6.0.1",
"junit-report-builder": "2.1.0",
"lint-staged": "^11.1.2",
"listr": "0.14.3",
"meow": "^9.0.0",
"mock-fs": "^5.1.2",
"no-proxy": "^1.0.3",
"node-ask": "^1.0.1",
"node-fetch": "3.2.10",
"node-loggly-bulk": "^4.0.1",
"npm-run-all": "^4.0.2",
"observable": "^2.1.4",
"os-browserify": "^0.3.0",
"p-limit": "3.1.0",
"picomatch": "2.2.2",
"pkg-up": "^3.1.0",
"pluralize": "^8.0.0",
"prettier": "^2.3.2",
"progress-stream": "^2.0.0",
"prop-types": "^15.7.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"read-pkg-up": "^7.0.1",
"semver": "^7.3.5",
"slash": "^3.0.0",
"snyk-nodejs-lockfile-parser": "^1.52.1",
"sort-package-json": "1.50.0",
"string-argv": "^0.3.1",
"strip-ansi": "6.0.0",
"tmp-promise": "3.0.2",
"tree-kill": "^1.2.2",
"ts-dedent": "^1.0.0",
"ts-loader": "^9.2.5",
"ts-node": "^10.9.1",
"tsup": "^6.7.0",
"typescript": "^4.3.5",
"util-deprecate": "^1.0.2",
"uuid": "^8.3.2",
"why-is-node-running": "^2.1.2",
"yarn-or-npm": "^3.0.1",
"zen-observable": "^0.8.15"
},
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org/"
},
"docs": "https://www.chromatic.com/docs/cli",
"storybook": {
"icon": "https://user-images.githubusercontent.com/263385/101995175-2e087800-3c96-11eb-9a33-9860a1c3ce62.gif",
"displayName": "Chromatic"
},
"packageManager": "yarn@3.6.1"
}
Loading

0 comments on commit 54d4958

Please sign in to comment.