Skip to content

Commit 922bf67

Browse files
anomiexmatticbot
authored andcommitted
Remove most pnpm hoisting, fix phantom deps (#24096)
We've long had pnpm's public hoisting disabled, but it also privately hoists everything into `node_modules/.pnpm/node_modules/` for compatibility with packages that have undeclared dependencies. Let's disable most of that private hoisting and see what turns up. Changes of note: * We still hoist a bunch of eslint plugins (and one prettier plugin) as untangling that mess seems like enough work to put off for later. * Only a few upstream packages have bugs that need working around: * `@mdx-js/loader`: mdx-js/mdx#2019 * `@automattic/components`: Missing dep on `@wordpress/base-styles`. And the next version will probably be unusable for us due to added `i18n-calypso`. * `@automattic/popup-monitor`: Missing dep on `events`. * markdown-it`: Missing dep on `punycode`. markdown-it/markdown-it#230 * `@samverschueren/stream-to-observable`: Outdated dep on `any-observable`. SamVerschueren/stream-to-observable#9 Hacking around that should also fix p1649254510834369-slack-CBG1CP4EN. * `git-node-fs`: Missing peer dep on `js-git`. creationix/git-node-fs#8 * `fetch-mock`'s peer dep on `node-fetch` is optional, but only because they also allow running in-browser. It's required for node. * Added `webpack-cli` alongside `webpack` everywhere to make sure p1650571211251179-slack-CBG1CP4EN is fixed. Dropped Webpack entirely from Boost instead though, they don't use it. * Had our webpack-config package point to its own copy of `@babel/runtime` instead of making that a peer dep. * Jetpack's extensions tests use a ton of `@wordpress/` packages that weren't being directly depended on. Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/2234009376
1 parent affd090 commit 922bf67

8 files changed

+5973
-6017
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ This is an alpha version! The changes listed here are not final.
1212
### Added
1313
- Add 'Jetpack Dashboard' background color
1414
- Added TypeScript support
15+
- Add missing JavaScript dependencies.
1516
- Add missing JS peer dependencies.
1617
- Declare cross-project build dependencies to ensure that the storybook is rebuilt when those are changed.
1718
- Storybook: Add protect into storybook projects list

docs/92.fdabf76a25305f7eeed4.manager.bundle.js renamed to docs/238.31e5d6f474064d9ebdd9.manager.bundle.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/31.182b6344.iframe.bundle.js renamed to docs/269.bb8605aa.iframe.bundle.js

Lines changed: 487 additions & 532 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/iframe.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,4 +345,4 @@
345345

346346

347347

348-
window['STORIES'] = [{"titlePrefix":"","directory":"./storybook/stories","files":"**/*.@(js|jsx|mdx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:storybook\\/stories(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx|ts|tsx))$"},{"titlePrefix":"","directory":"../components/components","files":"**/stories/*.@(js|jsx|mdx|ts|tsx)","importPathMatcher":"^(?:\\.\\.\\/components\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx|ts|tsx))$"},{"titlePrefix":"","directory":"../connection/components","files":"**/stories/*.@(js|jsx|mdx|ts|tsx)","importPathMatcher":"^(?:\\.\\.\\/connection\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx|ts|tsx))$"},{"titlePrefix":"","directory":"../idc/components","files":"**/stories/*.@(js|jsx|mdx|ts|tsx)","importPathMatcher":"^(?:\\.\\.\\/idc\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx|ts|tsx))$"},{"titlePrefix":"","directory":"../../packages/my-jetpack/_inc/components","files":"**/stories/*.@(js|jsx|mdx|ts|tsx)","importPathMatcher":"^(?:\\.\\.\\/\\.\\.\\/packages\\/my-jetpack\\/_inc\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx|ts|tsx))$"},{"titlePrefix":"","directory":"../../plugins/protect/src/js/components","files":"**/stories/*.@(js|jsx|mdx|ts|tsx)","importPathMatcher":"^(?:\\.\\.\\/\\.\\.\\/plugins\\/protect\\/src\\/js\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx|ts|tsx))$"}];</script><script src="runtime~main.2cac346e.iframe.bundle.js"></script><script src="31.182b6344.iframe.bundle.js"></script><script src="main.20e97b30.iframe.bundle.js"></script></body></html>
348+
window['STORIES'] = [{"titlePrefix":"","directory":"./storybook/stories","files":"**/*.@(js|jsx|mdx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:storybook\\/stories(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx|ts|tsx))$"},{"titlePrefix":"","directory":"../components/components","files":"**/stories/*.@(js|jsx|mdx|ts|tsx)","importPathMatcher":"^(?:\\.\\.\\/components\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx|ts|tsx))$"},{"titlePrefix":"","directory":"../connection/components","files":"**/stories/*.@(js|jsx|mdx|ts|tsx)","importPathMatcher":"^(?:\\.\\.\\/connection\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx|ts|tsx))$"},{"titlePrefix":"","directory":"../idc/components","files":"**/stories/*.@(js|jsx|mdx|ts|tsx)","importPathMatcher":"^(?:\\.\\.\\/idc\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx|ts|tsx))$"},{"titlePrefix":"","directory":"../../packages/my-jetpack/_inc/components","files":"**/stories/*.@(js|jsx|mdx|ts|tsx)","importPathMatcher":"^(?:\\.\\.\\/\\.\\.\\/packages\\/my-jetpack\\/_inc\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx|ts|tsx))$"},{"titlePrefix":"","directory":"../../plugins/protect/src/js/components","files":"**/stories/*.@(js|jsx|mdx|ts|tsx)","importPathMatcher":"^(?:\\.\\.\\/\\.\\.\\/plugins\\/protect\\/src\\/js\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx|ts|tsx))$"}];</script><script src="runtime~main.2cac346e.iframe.bundle.js"></script><script src="269.bb8605aa.iframe.bundle.js"></script><script src="main.bd567a0a.iframe.bundle.js"></script></body></html>

docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@
5656

5757

5858

59-
window['DOCS_MODE'] = false;</script><script src="runtime~main.9c776ede0dab45493d88.manager.bundle.js"></script><script src="92.fdabf76a25305f7eeed4.manager.bundle.js"></script><script src="main.ce6b09c93936e41eedc3.manager.bundle.js"></script></body></html>
59+
window['DOCS_MODE'] = false;</script><script src="runtime~main.9c776ede0dab45493d88.manager.bundle.js"></script><script src="238.31e5d6f474064d9ebdd9.manager.bundle.js"></script><script src="main.251c23bb0f7c9aa3b3a7.manager.bundle.js"></script></body></html>

docs/main.20e97b30.iframe.bundle.js

Lines changed: 0 additions & 5479 deletions
This file was deleted.

docs/main.ce6b09c93936e41eedc3.manager.bundle.js renamed to docs/main.251c23bb0f7c9aa3b3a7.manager.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)