Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert to yarn 1 #13

Merged
merged 6 commits into from
Jul 21, 2023
Merged

Revert to yarn 1 #13

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c79d9f
Revert "switch to use pnpm"
tmeasday Jul 14, 2023
9f5f061
overrides -> resolutiosn
tmeasday Jul 14, 2023
52296ee
Force jackspeak version
tmeasday Jul 14, 2023
4cf8033
Fix typo
tmeasday Jul 14, 2023
24be97a
Merge branch 'main' into tom/ap-3365-revert-from-pnpm-yarn-1
tmeasday Jul 15, 2023
9d0624d
Merge branch 'main' into tom/ap-3365-revert-from-pnpm-yarn-1
tmeasday Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/chromatic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ jobs:
fetch-depth: 0

- name: Install dependencies
uses: pnpm/action-setup@v2
with:
version: 8
run_install: true
run: yarn install --ignore-scripts

- name: Publish to Chromatic
uses: chromaui/action@v1
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@ jobs:
uses: actions/checkout@v2

- name: Install dependencies
uses: pnpm/action-setup@v2
with:
version: 8
run_install: true
run: yarn install --ignore-scripts

- name: Create Release
run: pnpm run release
run: yarn run release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
9 changes: 3 additions & 6 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@ jobs:
uses: actions/checkout@v2

- name: Install dependencies
uses: pnpm/action-setup@v2
with:
version: 8
run_install: true
run: yarn install --ignore-scripts

- name: Lint
run: pnpm lint
run: yarn lint

# Currently we don't have any tests written, this is here for when we do
# - name: Test
# run: pnpm test
# run: yarn test
2 changes: 1 addition & 1 deletion .storybook/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const config: StorybookConfig = {
options: {},
},
staticDirs: ["../public"],
stories: ["../src/**/*.stories.@(js|jsx|ts|tsx)"],
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
logLevel: "debug",
};

Expand Down
32 changes: 13 additions & 19 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Visual Testing addon with Chromatic",
"engines": {
"node": ">=18.0.0",
"pnpm": ">=8.6.2"
"yarn": ">=1.22.18"
},
"keywords": [
"tests",
Expand Down Expand Up @@ -49,7 +49,7 @@
"chromatic": "chromatic -t 9b39ff142a7f",
"codegen": "graphql-codegen",
"lint": "eslint src --max-warnings 0 --report-unused-disable-directives",
"release": "pnpm run build && auto shipit",
"release": "yarn run build && auto shipit",
"start": "run-p build:watch 'storybook --quiet'",
"storybook": "storybook dev -p 6006"
},
Expand Down Expand Up @@ -105,13 +105,13 @@
"zx": "^1.14.1"
},
"peerDependencies": {
"@storybook/blocks": "^7.1.0-alpha.34",
"@storybook/components": "^7.1.0-alpha.34",
"@storybook/core-events": "^7.1.0-alpha.34",
"@storybook/manager-api": "^7.1.0-alpha.34",
"@storybook/preview-api": "^7.1.0-alpha.34",
"@storybook/theming": "^7.1.0-alpha.34",
"@storybook/types": "^7.1.0-alpha.34",
"@storybook/blocks": "^7.1.0-alpha.32",
"@storybook/components": "^7.1.0-alpha.32",
"@storybook/core-events": "^7.1.0-alpha.32",
"@storybook/manager-api": "^7.1.0-alpha.32",
"@storybook/preview-api": "^7.1.0-alpha.32",
"@storybook/theming": "^7.1.0-alpha.32",
"@storybook/types": "^7.1.0-alpha.32",
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
},
Expand All @@ -129,16 +129,10 @@
"msw": {
"workerDirectory": "public"
},
"pnpm": {
"overrides": {
"react": "^18.0.0",
"react-dom": "^18.0.0",
"@storybook/addon-docs": "^7.1.0-alpha.34",
"@storybook/addons": "^7.1.0-alpha.34",
"@storybook/api": "^7.1.0-alpha.34",
"@storybook/components": "^7.1.0-alpha.34",
"@storybook/theming": "^7.1.0-alpha.34"
Comment on lines -139 to -143
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add these as resolutions as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why that would be necessary. Perhaps someone can enlighten me. It seems to work without them.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm also unsure why the react resolutions were there.

}
"resolutions": {
"react": "^18.0.0",
"react-dom": "^18.0.0",
"jackspeak": "2.1.1"
},
"storybook": {
"displayName": "Visual Tests",
Expand Down
Loading