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

Jump to bottom

Core: fix PnP compatibility for @storybook/ui and @storybook/router packages #18412

Merged
merged 4 commits into from Jun 10, 2022
Merged

Core: fix PnP compatibility for @storybook/ui and @storybook/router packages #18412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a4433b
Fixed PnP compatibility for bundled ui and router packages
Andarist Jun 6, 2022
c09e922
chore(CI): reenable cra pnp tests
yannbf Jun 6, 2022
90819e3
fix: change the way presets are required
yannbf Jun 7, 2022
b77e07b
Merge branch 'next' into fix/pnp-compat-2
Andarist Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 22 additions & 23 deletions .circleci/config.yml
View file
Open in desktop
Expand Up @@ -265,32 +265,31 @@ jobs:
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
# TODO: we disabled this one because it keeps failing, we should fix it, and enable it again!
# - attach_workspace:
# at: .
# - run:
# name: Running local registry
# command: yarn local-registry --port 6000 --open
# background: true
# - run:
# name: Wait for registry
# command: yarn wait-on http://localhost:6000
# - run:
# name: run e2e tests cra
# command: yarn test:e2e-framework --pnp cra
- attach_workspace:
at: .
- run:
name: Running local registry
command: yarn local-registry --port 6000 --open
background: true
- run:
name: Wait for registry
command: yarn wait-on http://localhost:6000
- run:
name: run e2e tests cra
command: yarn test:e2e-framework --pnp cra
# - run:
# name: run e2e tests vue
# command: yarn test:e2e-framework --pnp sfcVue
# - run:
# name: prep artifacts
# when: always
# command: zip -r /tmp/storybook-e2e-testing-out.zip /tmp/storybook-e2e-testing
# - store_artifacts:
# path: /tmp/cypress-record
# destination: cypress
# - store_artifacts:
# path: /tmp/storybook-e2e-testing-out.zip
# destination: e2e
- run:
name: prep artifacts
when: always
command: zip -r /tmp/storybook-e2e-testing-out.zip /tmp/storybook-e2e-testing
- store_artifacts:
path: /tmp/cypress-record
destination: cypress
- store_artifacts:
path: /tmp/storybook-e2e-testing-out.zip
destination: e2e
e2e-tests-examples:
executor:
class: small
Expand Down
2 changes: 1 addition & 1 deletion lib/core-common/src/presets.ts
View file
Open in desktop
Expand Up @@ -97,7 +97,7 @@ export const resolveAddonName = (
const managerFile = safeResolve(`${path}/manager`);
const registerFile = safeResolve(`${path}/register`) || safeResolve(`${path}/register-panel`);
const previewFile = safeResolve(`${path}/preview`);
const presetFile = safeResolve(`${path}/preset`);
const presetFile = r(`${path}/preset`);

if (!(managerFile || previewFile) && presetFile) {
return {
Expand Down
2 changes: 1 addition & 1 deletion lib/router/package.json
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@
"dependencies": {
"@storybook/client-logger": "6.5.0-rc.1",
"core-js": "^3.8.2",
"qs": "^6.10.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

but I've audited the whole lib direcotry and found this offender too

"regenerator-runtime": "^0.13.7"
},
"devDependencies": {
Expand All @@ -50,7 +51,6 @@
"history": "5.0.0",
"lodash": "^4.17.21",
"memoizerific": "^1.11.3",
"qs": "^6.10.0",
"react-router": "6.0.2",
"react-router-dom": "6.0.2",
"ts-dedent": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/package.json
View file
Open in desktop
Expand Up @@ -50,6 +50,7 @@
"@storybook/semver": "^7.3.2",
"@storybook/theming": "6.5.0-rc.1",
"core-js": "^3.8.2",
"qs": "^6.10.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The reported issue was only related to this package

"regenerator-runtime": "^0.13.7",
"resolve-from": "^5.0.0"
},
Expand All @@ -67,7 +68,6 @@
"markdown-to-jsx": "^7.1.3",
"memoizerific": "^1.11.3",
"polished": "^4.2.2",
"qs": "^6.10.0",
"react-draggable": "^4.4.3",
"react-helmet-async": "^1.0.7",
"react-sizeme": "^3.0.1",
Expand Down