Skip to content

Commit

Permalink
Merge pull request #282 from chromaui/revert-meow-upgrade
Browse files Browse the repository at this point in the history
revert meow upgrade
  • Loading branch information
ndelangen committed Feb 17, 2021
2 parents 27009f9 + f394c5b commit 2a070af
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/chromatic-staging-action.yml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/chromatic-staging-manual.yml
Expand Up @@ -19,4 +19,4 @@ jobs:
env:
CHROMATIC_APP_CODE: mpm7osoy9sa
CHROMATIC_PROJECT_TOKEN: mpm7osoy9sa
CHROMATIC_INDEX_URL: https://staging-www.chromaticqa.com
CHROMATIC_INDEX_URL: https://www.staging-chromatic.com
2 changes: 1 addition & 1 deletion .github/workflows/chromatic-staging-windows.yml
Expand Up @@ -19,4 +19,4 @@ jobs:
env:
CHROMATIC_APP_CODE: mpm7osoy9sa
CHROMATIC_PROJECT_TOKEN: mpm7osoy9sa
CHROMATIC_INDEX_URL: https://staging-www.chromaticqa.com
CHROMATIC_INDEX_URL: https://www.staging-chromatic.com
10 changes: 7 additions & 3 deletions CHANGELOG.md
@@ -1,3 +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
Expand Down Expand Up @@ -216,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.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://chromatic.com/docs/branching-and-baselines#rebasing).

# 1.2.1 - 2018-12-04

Expand All @@ -227,8 +231,8 @@

- Pass `chromatic` parameters from Storybook@4, supporting:

- Viewports: http://docs.chromaticqa.com/viewports
- Delay: http://docs.chromaticqa.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.

Expand Down
2 changes: 1 addition & 1 deletion bin/lib/getEnv.js
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions bin/ui/tasks/tunnel.stories.js
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion stories/timing.stories-disabled.js
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions yarn.lock
Expand Up @@ -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"
Expand Down

0 comments on commit 2a070af

Please sign in to comment.