From 49d5d57d70528e84cf6266f90885f8ccbd747f4e Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 17 Feb 2021 13:50:30 +0100 Subject: [PATCH 1/5] revert meow upgrade --- package.json | 2 +- yarn.lock | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 89ed85d6c..6d18c9955 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "jsonfile": "^6.0.1", "junit-report-builder": "2.1.0", "listr": "0.14.3", - "meow": "^9.0.0", + "meow": "^8.0.0", "node-ask": "^1.0.1", "node-fetch": "^2.6.0", "node-loggly-bulk": "^2.2.4", diff --git a/yarn.lock b/yarn.lock index 3a92768da..974f1d64f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8985,14 +8985,13 @@ memorystream@^0.3.1: resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI= -meow@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364" - integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ== +meow@^8.0.0: + version "8.1.2" + resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897" + integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q== dependencies: "@types/minimist" "^1.2.0" camelcase-keys "^6.2.2" - decamelize "^1.2.0" decamelize-keys "^1.1.0" hard-rejection "^2.1.0" minimist-options "4.1.0" From 1cbf5251d639b10319425c26c6b2d8638acc1602 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 17 Feb 2021 13:56:19 +0100 Subject: [PATCH 2/5] remove reference to chromaticqa.com and fix staging url --- .github/workflows/chromatic-staging-action.yml | 2 +- .github/workflows/chromatic-staging-manual.yml | 2 +- .github/workflows/chromatic-staging-windows.yml | 2 +- CHANGELOG.md | 6 +++--- bin/lib/getEnv.js | 2 +- bin/ui/tasks/tunnel.stories.js | 4 ++-- package.json | 2 +- stories/timing.stories-disabled.js | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/chromatic-staging-action.yml b/.github/workflows/chromatic-staging-action.yml index 8d2b80750..e2b255782 100644 --- a/.github/workflows/chromatic-staging-action.yml +++ b/.github/workflows/chromatic-staging-action.yml @@ -12,7 +12,7 @@ jobs: DEBUG: chromatic-cli CHROMATIC_APP_CODE: mpm7osoy9sa CHROMATIC_PROJECT_TOKEN: mpm7osoy9sa - CHROMATIC_INDEX_URL: https://staging-www.chromaticqa.com + CHROMATIC_INDEX_URL: https://www.staging-chromatic.com with: appCode: mpm7osoy9sa projectToken: mpm7osoy9sa diff --git a/.github/workflows/chromatic-staging-manual.yml b/.github/workflows/chromatic-staging-manual.yml index c60c4bcbb..0c0808865 100644 --- a/.github/workflows/chromatic-staging-manual.yml +++ b/.github/workflows/chromatic-staging-manual.yml @@ -19,4 +19,4 @@ jobs: env: CHROMATIC_APP_CODE: mpm7osoy9sa CHROMATIC_PROJECT_TOKEN: mpm7osoy9sa - CHROMATIC_INDEX_URL: https://staging-www.chromaticqa.com \ No newline at end of file + CHROMATIC_INDEX_URL: https://www.staging-chromatic.com \ No newline at end of file diff --git a/.github/workflows/chromatic-staging-windows.yml b/.github/workflows/chromatic-staging-windows.yml index 4b77d6c98..575f1435d 100644 --- a/.github/workflows/chromatic-staging-windows.yml +++ b/.github/workflows/chromatic-staging-windows.yml @@ -19,4 +19,4 @@ jobs: env: CHROMATIC_APP_CODE: mpm7osoy9sa CHROMATIC_PROJECT_TOKEN: mpm7osoy9sa - CHROMATIC_INDEX_URL: https://staging-www.chromaticqa.com \ No newline at end of file + CHROMATIC_INDEX_URL: https://www.staging-chromatic.com \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index b1bd5f14a..5076eb54c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -216,7 +216,7 @@ - Allow controlling package initialization timing via `import configure from 'storybook-chromatic/configure'; configure()` -- Add a flag `--ignore-last-build-on-branch=X` to not use the last build on a branch no matter what (which helps with rebasing, see: http://docs.chromaticqa.com/branching-and-baselines#rebasing). +- Add a flag `--ignore-last-build-on-branch=X` to not use the last build on a branch no matter what (which helps with rebasing, see: http://docs.chromatic.com/branching-and-baselines#rebasing). # 1.2.1 - 2018-12-04 @@ -227,8 +227,8 @@ - Pass `chromatic` parameters from Storybook@4, supporting: - - Viewports: http://docs.chromaticqa.com/viewports - - Delay: http://docs.chromaticqa.com/delay + - Viewports: http://docs.chromatic.com/viewports + - Delay: http://docs.chromatic.com/delay - Better logging from the package to allow us to debug build problems. diff --git a/bin/lib/getEnv.js b/bin/lib/getEnv.js index 3c1fa9a00..83891a7eb 100644 --- a/bin/lib/getEnv.js +++ b/bin/lib/getEnv.js @@ -2,7 +2,7 @@ const { CHROMATIC_SERVER_PORT = 3004, CHROMATIC_INDEX_URL = 'https://index.chromatic.com', - CHROMATIC_TUNNEL_URL = 'https://tunnel.chromaticqa.com', + CHROMATIC_TUNNEL_URL = 'https://tunnel.chromatic.com', CHROMATIC_CREATE_TUNNEL = 'true', CHROMATIC_RETRIES = 5, CHROMATIC_POLL_INTERVAL = 1000, diff --git a/bin/ui/tasks/tunnel.stories.js b/bin/ui/tasks/tunnel.stories.js index 1b770e907..fd3794bb2 100644 --- a/bin/ui/tasks/tunnel.stories.js +++ b/bin/ui/tasks/tunnel.stories.js @@ -6,8 +6,8 @@ export default { decorators: [(storyFn) => task(storyFn())], }; -const CHROMATIC_TUNNEL_URL = 'https://tunnel.chromaticqa.com'; -const cachedUrl = 'https://fdeulpymiq.tunnel.chromaticqa.com/iframe.html'; +const CHROMATIC_TUNNEL_URL = 'https://tunnel.chromatic.com'; +const cachedUrl = 'https://fdeulpymiq.tunnel.chromatic.com/iframe.html'; export const Initial = () => initial; diff --git a/package.json b/package.json index 6d18c9955..4a8acbbd2 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "build:bin": "cross-env BABEL_ENV=build babel -s -d ./dist ./src -D", "chromatic": "node ./bin/register.js", "chromatic-prebuild": "node ./bin/register.js --storybook-build-dir=\"storybook-static\"", - "chromatic-staging": "CHROMATIC_INDEX_URL=https://staging-www.chromaticqa.com node ./bin/register.js", + "chromatic-staging": "CHROMATIC_INDEX_URL=https://www.staging-chromatic.com node ./bin/register.js", "chromatic-verbose": "cross-env LOG_LEVEL=verbose node ./bin/register.js", "dev": "npm-run-all --parallel -l 'build:** -- --watch'", "lint": "yarn lint:js src .storybook bin stories", diff --git a/stories/timing.stories-disabled.js b/stories/timing.stories-disabled.js index 3fd9f89bf..0cac2c528 100644 --- a/stories/timing.stories-disabled.js +++ b/stories/timing.stories-disabled.js @@ -6,7 +6,7 @@ import React, { useState } from 'react'; // Some stories to test out timing code. Disabled by default // These stories are available at (e.g.) -// http://vmdbnybkvx.staging-tunnel.chromaticqa.com/iframe.html?id=timing--5s +// http://vmdbnybkvx.tunnel.staging-chromatic.com/iframe.html?id=timing--5s // A component that guarantees the load event won't load for timeout seconds // Note that the img loading tends to take a litle longer so this is a minimum From 2be8ffb0996f09aa6ced2fe45711c898e9bb2036 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 17 Feb 2021 14:02:28 +0100 Subject: [PATCH 3/5] update CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5076eb54c..0b5601465 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 5.6.3 - 2021-02-17 + +- [282](https://github.com/chromaui/chromatic-cli/pull/282) Revert meow upgrade (will upgrade again in next major release) # 5.6.2 - 2021-02-10 - [269](https://github.com/chromaui/chromatic-cli/pull/269) Record CI service name on build From a7129a92977e257848aed8dd43461cedf6fa2ae9 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 17 Feb 2021 14:13:56 +0100 Subject: [PATCH 4/5] cleanup --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b5601465..c6b79d9ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 5.6.3 - 2021-02-17 - [282](https://github.com/chromaui/chromatic-cli/pull/282) Revert meow upgrade (will upgrade again in next major release) + # 5.6.2 - 2021-02-10 - [269](https://github.com/chromaui/chromatic-cli/pull/269) Record CI service name on build From f394c5b263bd4b95ee3391ab9b9d32224a4f671f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 17 Feb 2021 14:15:11 +0100 Subject: [PATCH 5/5] fix docs urls --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6b79d9ce..51612d3f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -220,7 +220,7 @@ - Allow controlling package initialization timing via `import configure from 'storybook-chromatic/configure'; configure()` -- Add a flag `--ignore-last-build-on-branch=X` to not use the last build on a branch no matter what (which helps with rebasing, see: http://docs.chromatic.com/branching-and-baselines#rebasing). +- Add a flag `--ignore-last-build-on-branch=X` to not use the last build on a branch no matter what (which helps with rebasing, see: http://chromatic.com/docs/branching-and-baselines#rebasing). # 1.2.1 - 2018-12-04 @@ -231,8 +231,8 @@ - Pass `chromatic` parameters from Storybook@4, supporting: - - Viewports: http://docs.chromatic.com/viewports - - Delay: http://docs.chromatic.com/delay + - Viewports: http://chromatic.com/docs/viewports + - Delay: http://chromatic.com/docs/delay - Better logging from the package to allow us to debug build problems.