Skip to content

Try #2: Upgrade @wordpress packages to pre-React 18 #73890

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

Merged
tyxla merged 56 commits into from
Mar 13, 2023
Merged

Try #2: Upgrade @wordpress packages to pre-React 18 #73890

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
4819ea4
Update packages to pre- react 18 versions
tyxla Feb 28, 2023
1e7cf25
Noop some type packages with stale @wordpress/data module declarations
tyxla Feb 28, 2023
88e7597
Fix some TS errors
tyxla Feb 9, 2023
afb5603
Fix some unit tests
tyxla Feb 9, 2023
a63151a
Fix TS errors in wpcom-checkout
tyxla Feb 9, 2023
266cc23
Fix more TS errors
tyxla Feb 13, 2023
ba554bb
Fix TS errors in wpcom-plans-ui data store
tyxla Feb 28, 2023
868db66
Fix a bunch of other TS errors
tyxla Feb 13, 2023
2760aa8
Fix a bunch of other TS errors
tyxla Feb 13, 2023
bb07c00
Fix a bunch more TS errors
tyxla Feb 13, 2023
97bdf7f
Fix type confusion
tyxla Feb 13, 2023
990750a
Add core/data temp placeholder types
tyxla Feb 13, 2023
6b1ac77
deduplicate packages
tyxla Feb 28, 2023
787a9f2
Ignore some logs
tyxla Feb 28, 2023
2fd2d15
Fix another failing test
tyxla Feb 14, 2023
0684633
Fix a couple more tests
tyxla Feb 14, 2023
b8e4a20
Fix a bad import
tyxla Feb 14, 2023
39c8d53
Force @wordpress/element resolution
tyxla Feb 28, 2023
3070be4
Fix more code style errors
tyxla Feb 23, 2023
3f7ba02
Fix some code style errors
tyxla Feb 23, 2023
684a109
Declare TS modules of the nooped types
tyxla Feb 28, 2023
c6ffa97
Pin @wordpress/data-controls version
tyxla Feb 28, 2023
5489d74
Fix a ton of ETK TS errors
tyxla Mar 2, 2023
62fc636
Remove some undesired obsolete type packages
tyxla Mar 2, 2023
0131606
Restore @wordpress/data-controls types
tyxla Mar 2, 2023
6aca0fd
Add necessary @wordpress/blocks types inline
tyxla Mar 2, 2023
9254527
Remove a duplicate __i18n_text_domain__
tyxla Mar 2, 2023
3fd901e
Dedupe again
tyxla Mar 2, 2023
ebc0e59
Revert "Remove a duplicate __i18n_text_domain__"
tyxla Mar 2, 2023
ec4d5a6
Workaround a __i18n_text_domain__ duplication
tyxla Mar 2, 2023
bb7139d
Fix a bunch of store and checkout TS errors
tyxla Mar 2, 2023
9487ea0
Fix more package TS errors
tyxla Mar 2, 2023
e684094
Start fixing some more TS errors
tyxla Mar 6, 2023
93bdb81
More TS fixes
tyxla Mar 7, 2023
e026b9e
Fix a bunch more TS errors
tyxla Mar 7, 2023
5971e49
More TS error fixes
tyxla Mar 7, 2023
80003b4
Fix some imports
tyxla Mar 7, 2023
217d151
More TS errors
tyxla Mar 7, 2023
25f49de
Fix bad import
tyxla Mar 7, 2023
effc4d7
A few more TS fixes
tyxla Mar 7, 2023
9c29f87
More TS errors fixed
tyxla Mar 7, 2023
ebb6b5d
Add @automattic/global-styles to tsconfig references
tyxla Mar 7, 2023
00f0469
Fix a few more type errors
tyxla Mar 7, 2023
cc70ca0
Fix a few more TS errors
tyxla Mar 7, 2023
a012406
Ignore another log entry
tyxla Mar 8, 2023
c88396f
Fix more TS errors
tyxla Mar 8, 2023
7e8bd30
Pin @wordpress/base-styles
tyxla Mar 8, 2023
2891422
Revert @wordpress/env upgrade
tyxla Mar 8, 2023
ed8ceb8
Add missing select dependency
noahtallen Mar 8, 2023
6b61059
Add missing data dependencies to useSelect calls
noahtallen Mar 8, 2023
11edb1a
Remove some now uneeded ts-ignore lines
noahtallen Mar 8, 2023
d740121
Polish some useSelect dependencies
tyxla Mar 9, 2023
3f2cac9
Polish another useSelect data dependency
noahtallen Mar 9, 2023
c5df3e5
Account for possibly undefined stores
noahtallen Mar 9, 2023
cd45678
Add more data dependencies to useSelect calls
noahtallen Mar 10, 2023
b8a0f10
Fix render loop caused by obj reference changing each render
noahtallen Mar 10, 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
Prev Previous commit
Next Next commit
Revert @wordpress/env upgrade
  • Loading branch information
@tyxla
tyxla committed Mar 13, 2023
commit 28914221c15afe723d3462d15fd4c167c9d44d22
2 changes: 1 addition & 1 deletion apps/editing-toolkit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"@wordpress/edit-post": "^6.19.0",
"@wordpress/editor": "^12.21.0",
"@wordpress/element": "^4.20.0",
"@wordpress/env": "^5.7.0",
"@wordpress/env": "^4.7.0",
Copy link
Member Author

@tyxla tyxla Mar 9, 2023

Choose a reason for hiding this comment

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

Noting that we intentionally didn't change this dependency, because:

  • The @wordpress/env package isn't a dependency of any other package and doesn't have any other packages as dependencies. Therefore, it can be updated separately and independently.
  • There's a breaking change in the way the PHPUnit tests are set up. Ideally, we should take care of that in a separate PR.

Copy link
Contributor

@noahtallen noahtallen Mar 9, 2023

Choose a reason for hiding this comment

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

Good observation, that matches my experience with wp-env updates. (I also have a WIP PR somewhere for this phpunit change, which I should resurrect!)

"@wordpress/escape-html": "^2.22.0",
"@wordpress/hooks": "^3.22.0",
"@wordpress/html-entities": "^3.22.0",
Expand Down
91 changes: 77 additions & 14 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1872,7 +1872,7 @@ __metadata:
"@wordpress/edit-post": ^6.19.0
"@wordpress/editor": ^12.21.0
"@wordpress/element": ^4.20.0
"@wordpress/env": ^5.7.0
"@wordpress/env": ^4.7.0
"@wordpress/escape-html": ^2.22.0
"@wordpress/eslint-plugin": ^13.6.0
"@wordpress/hooks": ^3.22.0
Expand Down Expand Up @@ -4941,6 +4941,13 @@ __metadata:
languageName: node
linkType: hard

"@sindresorhus/is@npm:^2.0.0":
version: 2.1.1
resolution: "@sindresorhus/is@npm:2.1.1"
checksum: 0e19eb3024a44e2de575e169e49a3a7fcea5558b52f2173ce249d57ad3d45fe6d0401b0d0c0a190feb92974c9be523bd0dfd6d660f651c74d8c2b4532b748105
languageName: node
linkType: hard

"@sindresorhus/is@npm:^4.0.0":
version: 4.2.0
resolution: "@sindresorhus/is@npm:4.2.0"
Expand Down Expand Up @@ -6254,12 +6261,12 @@ __metadata:
languageName: node
linkType: hard

"@szmarczak/http-timer@npm:^4.0.5":
version: 4.0.5
resolution: "@szmarczak/http-timer@npm:4.0.5"
"@szmarczak/http-timer@npm:^4.0.0, @szmarczak/http-timer@npm:^4.0.5":
version: 4.0.6
resolution: "@szmarczak/http-timer@npm:4.0.6"
dependencies:
defer-to-connect: ^2.0.0
checksum: de3f5054e08b72762b88e9ee837018d4e513e5df20e1d9f8c671d813f22b0972148509e0781b85c1de7fc60a7c9be10c2b7d4b8372ba80ffc11c43e6a24e945f
checksum: 73946918c025339db68b09abd91fa3001e87fc749c619d2e9c2003a663039d4c3cb89836c98a96598b3d47dec2481284ba85355392644911f5ecd2336536697f
languageName: node
linkType: hard

Expand Down Expand Up @@ -8824,15 +8831,15 @@ __metadata:
languageName: node
linkType: hard

"@wordpress/env@npm:^5.7.0":
version: 5.12.0
resolution: "@wordpress/env@npm:5.12.0"
"@wordpress/env@npm:^4.7.0":
version: 4.9.0
resolution: "@wordpress/env@npm:4.9.0"
dependencies:
chalk: ^4.0.0
copy-dir: ^1.3.0
docker-compose: ^0.22.2
extract-zip: ^1.6.7
got: ^11.8.5
got: ^10.7.0
inquirer: ^7.1.0
js-yaml: ^3.13.1
ora: ^4.0.2
Expand All @@ -8842,7 +8849,7 @@ __metadata:
yargs: ^17.3.0
bin:
wp-env: bin/wp-env
checksum: 901055c5a0306f60114ea705ded5759d24e204949c7d37f077032ee3f26dbe524a1390ac21858348cc9a4062ff380771cef8d432cf053b9a8e5886e204b2fde5
checksum: affe6177da88e74639f6d9086f0cfb3a3470b68d45101103db3e96b64187a937e4dda20fb719d0c3139585014624f1b13be35f2c6e483313532379afcc360bc4
languageName: node
linkType: hard

Expand Down Expand Up @@ -11616,6 +11623,16 @@ __metadata:
languageName: node
linkType: hard

"cacheable-lookup@npm:^2.0.0":
version: 2.0.1
resolution: "cacheable-lookup@npm:2.0.1"
dependencies:
"@types/keyv": ^3.1.1
keyv: ^4.0.0
checksum: d9ac1e91736939ea619ad9bec50f09347f57308c7d9fb15e0d1de1e8d0d5152df364f6d8c7e611f62a53c35d059fc867858c0431d66366438247557e68f7e4b0
languageName: node
linkType: hard

"cacheable-lookup@npm:^5.0.3":
version: 5.0.4
resolution: "cacheable-lookup@npm:5.0.4"
Expand All @@ -11638,7 +11655,7 @@ __metadata:
languageName: node
linkType: hard

"cacheable-request@npm:^7.0.2":
"cacheable-request@npm:^7.0.1, cacheable-request@npm:^7.0.2":
version: 7.0.2
resolution: "cacheable-request@npm:7.0.2"
dependencies:
Expand Down Expand Up @@ -14257,6 +14274,15 @@ __metadata:
languageName: node
linkType: hard

"decompress-response@npm:^5.0.0":
version: 5.0.0
resolution: "decompress-response@npm:5.0.0"
dependencies:
mimic-response: ^2.0.0
checksum: d76c4fc4fa21f4b39a7bf711a655b2b56d37b44c99754c3fb44d64b83a8132cfd916c81951477c94478d2cba47058cf8c73da26bb999b07f1b9c8d466a2b4346
languageName: node
linkType: hard

"decompress-response@npm:^6.0.0":
version: 6.0.0
resolution: "decompress-response@npm:6.0.0"
Expand Down Expand Up @@ -18255,7 +18281,30 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"got@npm:^11.7.0, got@npm:^11.8.5":
"got@npm:^10.7.0":
version: 10.7.0
resolution: "got@npm:10.7.0"
dependencies:
"@sindresorhus/is": ^2.0.0
"@szmarczak/http-timer": ^4.0.0
"@types/cacheable-request": ^6.0.1
cacheable-lookup: ^2.0.0
cacheable-request: ^7.0.1
decompress-response: ^5.0.0
duplexer3: ^0.1.4
get-stream: ^5.0.0
lowercase-keys: ^2.0.0
mimic-response: ^2.1.0
p-cancelable: ^2.0.0
p-event: ^4.0.0
responselike: ^2.0.0
to-readable-stream: ^2.0.0
type-fest: ^0.10.0
checksum: 3972cbbd2f99b8331f3447596e92849adb0e486c6c4feebbbedbf243e95f0ed79e62c34d8ff354d2e861ba69dd18c8870842aefae15cf3db3d5bb1019e8b837b
languageName: node
linkType: hard

"got@npm:^11.7.0":
version: 11.8.6
resolution: "got@npm:11.8.6"
dependencies:
Expand Down Expand Up @@ -23109,7 +23158,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"mimic-response@npm:^2.0.0":
"mimic-response@npm:^2.0.0, mimic-response@npm:^2.1.0":
version: 2.1.0
resolution: "mimic-response@npm:2.1.0"
checksum: 717475c840f20deca87a16cb2f7561f9115f5de225ea2377739e09890c81aec72f43c81fd4984650c4044e66be5a846fa7a517ac7908f01009e1e624e19864d5
Expand Down Expand Up @@ -24634,7 +24683,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"p-event@npm:^4.1.0":
"p-event@npm:^4.0.0, p-event@npm:^4.1.0":
version: 4.2.0
resolution: "p-event@npm:4.2.0"
dependencies:
Expand Down Expand Up @@ -31470,6 +31519,13 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"to-readable-stream@npm:^2.0.0":
version: 2.1.0
resolution: "to-readable-stream@npm:2.1.0"
checksum: c0d7269a5232a4c4d254073478a7bfdc302f955999d3afbd417af15cbdf98aeacbc66318957426bbe5b84b681e4d0eba4be640bed6c1ee8cf705f500d4521289
languageName: node
linkType: hard

"to-regex-range@npm:^2.1.0":
version: 2.1.1
resolution: "to-regex-range@npm:2.1.1"
Expand Down Expand Up @@ -31878,6 +31934,13 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"type-fest@npm:^0.10.0":
version: 0.10.0
resolution: "type-fest@npm:0.10.0"
checksum: 6c079d80dce172b4c182238c46add55e77549b9e2a360f08d291f64c2eb5bc72aa955a10389cd55bac0da9464044c9f7317069c8b9ce7557c18b5007874fd5fb
languageName: node
linkType: hard

"type-fest@npm:^0.13.1":
version: 0.13.1
resolution: "type-fest@npm:0.13.1"
Expand Down