Merge branch 'main' into dependabot/npm_and_yarn/get-func-name-2.0.2

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: cimg/node:16.18.0
+      - image: cimg/node:lts
     resource_class: xlarge
 
     working_directory: ~/repo

.eslintrc.js

@@ -11,7 +11,7 @@ module.exports = {
     'plugin:@typescript-eslint/recommended',
     'plugin:import/recommended',
     'plugin:import/typescript',
-    'plugin:json/recommended',
+    'plugin:json/recommended-with-comments',
     'plugin:react/recommended',
   ],
   parser: '@typescript-eslint/parser',

.github/workflows/chromatic-main-and-prs.yml

@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
       - name: install
         run: yarn install --frozen-lockfile
       - uses: chromaui/action@v1

.github/workflows/chromatic-prod.yml

@@ -10,7 +10,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
       - name: install
         run: yarn install --frozen-lockfile
       - uses: chromaui/action-next@v1

.github/workflows/chromatic-staging.yml

@@ -10,7 +10,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
       - name: install
         run: yarn install --frozen-lockfile
       - uses: chromaui/action-canary@v1

.github/workflows/smoke-test-action.yml

@@ -10,7 +10,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
       - run: yarn
       - run: yarn build
       - uses: ./

.github/workflows/smoke-test-node-api.yml

@@ -10,10 +10,10 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: latest
       - run: yarn
       - name: run chromatic via node
-        run: yarn ts-node ./scripts/run-via-node.ts
+        run: ./scripts/run-via-node.mjs
         env:
           LOG_LEVEL: debug
           DEBUG: chromatic-cli

.github/workflows/smoke-test-npx.yml

@@ -10,7 +10,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
       - name: install
         run: yarn && git status --porcelain
       - name: prep package

.github/workflows/smoke-test-windows.yml

@@ -10,11 +10,11 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
       - name: install
-        run: yarn
+        run: yarn && git status --porcelain
       - name: prep package
-        run: node ./scripts/rename.js storybook-chromatic
+        run: ./scripts/rename.js storybook-chromatic
       - run: yarn build
       - name: run chromatic
         run: npx -p . chromatic --build-script-name build-test-storybook --exit-zero-on-changes --force-rebuild

.github/workflows/smoke-test-yarn-berry.yml

@@ -10,7 +10,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: lts/*
       - run: rm -rf subdir # remove conflicting subproject
       - run: yarn set version berry
       - name: install

.github/workflows/smoke-test-yarn-canary.yml

@@ -10,7 +10,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: lts/*
       - run: rm -rf subdir # remove conflicting subproject
       - run: yarn set version canary
       - name: install

.github/workflows/smoke-test-yarn-classic.yml

@@ -10,7 +10,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
       - run: rm -rf subdir # remove conflicting subproject
       - run: yarn set version 1.x.x
       - run: yarn install

.github/workflows/smoke-test-yarn.yml

@@ -10,7 +10,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
       - run: yarn
       - run: yarn build
       - run: yarn chromatic --build-script-name build-test-storybook --exit-zero-on-changes --force-rebuild

CHANGELOG.md

@@ -1,3 +1,29 @@
+# v8.0.0 (Thu Nov 09 2023)
+
+#### 💥 Breaking Change
+
+- Drop official support for Node 14/16 [#839](https://github.com/chromaui/chromatic-cli/pull/839) ([@ghengeveld](https://github.com/ghengeveld))
+
+#### 🚀 Enhancement
+
+- Merge Group (Queues) GitHub Action Event Support [#825](https://github.com/chromaui/chromatic-cli/pull/825) ([@mhemmings](https://github.com/mhemmings) [@thafryer](https://github.com/thafryer))
+
+#### 🐛 Bug Fix
+
+- Bump browserify-sign from 4.2.1 to 4.2.2 [#848](https://github.com/chromaui/chromatic-cli/pull/848) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump semver from 7.3.5 to 7.5.2 [#778](https://github.com/chromaui/chromatic-cli/pull/778) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump browserify-sign from 4.2.1 to 4.2.2 in /subdir [#849](https://github.com/chromaui/chromatic-cli/pull/849) ([@dependabot[bot]](https://github.com/dependabot[bot]) [@thafryer](https://github.com/thafryer))
+- Configure auto with `prerelease` setting and update readme [#847](https://github.com/chromaui/chromatic-cli/pull/847) ([@ghengeveld](https://github.com/ghengeveld))
+
+#### Authors: 4
+
+- [@dependabot[bot]](https://github.com/dependabot[bot])
+- Gert Hengeveld ([@ghengeveld](https://github.com/ghengeveld))
+- Jarel Fryer ([@thafryer](https://github.com/thafryer))
+- Mark Hemmings ([@mhemmings](https://github.com/mhemmings))
+
+---
+
 # v7.6.0 (Tue Oct 31 2023)
 
 #### 🚀 Enhancement

README.md

@@ -15,7 +15,17 @@ Publishes your Storybook to Chromatic and kicks off tests if they're enabled.
 
 👉 Read the [Chromatic CLI docs](https://www.chromatic.com/docs/cli)
 
-📝 View the [Changelog](https://github.com/chromaui/chromatic-cli/blob/main/CHANGELOG.md#readme)
+📝 View the [Changelog](https://github.com/chromaui/chromatic-cli/blob/main/CHANGELOG.md)
+
+## System requirements
+
+The Chromatic CLI (and GitHub Action) is built to run in a variety of environments. We provide support for the following platforms:
+
+- Latest (LTS) versions of Ubuntu, Windows (Server), macOS
+- Node.js Current, Active or Maintenance (LTS) versions, according to their [release schedule](https://github.com/nodejs/release#release-schedule)
+- Storybook 6.5+
+
+Other platforms/versions may work, but are not officially supported. Certain features may not be available on certain platforms/versions, even if otherwise supported.
 
 ## Contributing
 

action.yml

@@ -128,4 +128,4 @@ outputs:
 
 runs:
   main: action/register.js
-  using: node16
+  using: node20 # Sync with `target` in tsup.config.ts

node-src/lib/compress.test.ts

@@ -16,7 +16,7 @@ afterEach(() => {
 const testContext = { sourceDir: '/chromatic-tmp', log: new TestLogger() } as any;
 const files = [{ localPath: '/chromatic-tmp/file1', targetPath: 'file1', contentLength: 1 }];
 
-describe('makeZipFile', () => {
+describe.skip('makeZipFile', () => {
   it('adds files to an archive', async () => {
     mockFs({
       '/chromatic-tmp': {

node-src/tasks/build.test.ts

@@ -56,7 +56,10 @@ describe('setBuildCommand', () => {
   });
 
   it('supports yarn', async () => {
-    mockfs({ './package.json': JSON.stringify({ packageManager: 'yarn' }) });
+    mockfs({
+      './package.json': JSON.stringify({ packageManager: 'yarn' }),
+      './yarn.lock': '',
+    });
 
     const ctx = {
       sourceDir: './source-dir/',
@@ -70,7 +73,10 @@ describe('setBuildCommand', () => {
   });
 
   it('supports pnpm', async () => {
-    mockfs({ './package.json': JSON.stringify({ packageManager: 'pnpm' }) });
+    mockfs({
+      './package.json': JSON.stringify({ packageManager: 'pnpm' }),
+      './pnpm-lock.yaml': '',
+    });
 
     const ctx = {
       sourceDir: './source-dir/',

node-src/tasks/initialize.test.ts

@@ -56,7 +56,10 @@ describe('setRuntimeMetadata', () => {
   });
 
   it('supports yarn', async () => {
-    mockfs({ './package.json': JSON.stringify({ packageManager: 'yarn' }) });
+    mockfs({
+      './package.json': JSON.stringify({ packageManager: 'yarn' }),
+      './yarn.lock': '',
+    });
 
     const ctx = {
       sourceDir: './source-dir/',
@@ -75,7 +78,10 @@ describe('setRuntimeMetadata', () => {
   });
 
   it('supports pnpm', async () => {
-    mockfs({ './package.json': JSON.stringify({ packageManager: 'pnpm' }) });
+    mockfs({
+      './package.json': JSON.stringify({ packageManager: 'pnpm' }),
+      './pnpm-lock.yaml': '',
+    });
 
     const ctx = {
       sourceDir: './source-dir/',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chromatic",
-  "version": "7.6.0",
+  "version": "8.0.0",
   "description": "Automate visual testing across browsers. Gather UI feedback. Versioned documentation.",
   "keywords": [
     "storybook-addon",
@@ -108,38 +108,31 @@
     "@actions/core": "^1.10.0",
     "@actions/github": "^5.0.0",
     "@antfu/ni": "^0.21.5",
-    "@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/linter-config": "^3.1.2",
     "@storybook/manager-webpack5": "^6.5.6",
     "@storybook/react": "^6.5.6",
+    "@tsconfig/node16": "^16.1.1",
     "@types/archiver": "^5.3.1",
     "@types/async-retry": "^1.4.3",
     "@types/cross-spawn": "^6.0.2",
     "@types/fs-extra": "^9.0.13",
     "@types/jsonfile": "^6.0.1",
     "@types/listr": "^0.14.4",
-    "@types/node": "^14.14.25",
+    "@types/node": "18.x",
     "@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",
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
     "ansi-html": "0.0.8",
     "any-observable": "^0.5.1",
     "archiver": "^5.3.0",
     "async-retry": "^1.3.3",
     "auto": "^11.0.4",
-    "babel-preset-minify": "^0.5.1",
     "chalk": "^4.1.2",
     "cpy": "^8.1.2",
     "cross-env": "^7.0.3",
@@ -190,9 +183,8 @@
     "tmp-promise": "3.0.2",
     "ts-dedent": "^1.0.0",
     "ts-loader": "^9.2.5",
-    "ts-node": "^10.9.1",
-    "tsup": "^6.7.0",
-    "typescript": "^4.3.5",
+    "tsup": "^7.2.0",
+    "typescript": "^5.2.2",
     "util-deprecate": "^1.0.2",
     "uuid": "^8.3.2",
     "vite": "^4.4.9",

scripts/run-via-node.ts → scripts/run-via-node.mjs

@@ -1,5 +1,7 @@
+#!/usr/bin/env node
+
 import process from 'process';
-import { run } from '../dist/node';
+import { run } from '../dist/node.js';
 
 run({
   flags: {

tsconfig.eslint.json

@@ -1,8 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "allowJs": true,
-    "resolveJsonModule": true
+    "allowJs": true
   },
   "include": [
     ".*.js",