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.

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 #6952 and bump @wordpress/scripts to 22.1.0 #6955

Merged
merged 2 commits into from
Mar 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 22 additions & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@wordpress/hooks": "3.3.1",
"@wordpress/jest-puppeteer-axe": "4.0.1",
"@wordpress/plugins": "4.1.3",
"@wordpress/scripts": "22.0.1",
"@wordpress/scripts": "22.1.0",
Copy link
Member

Choose a reason for hiding this comment

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

So this includes WordPress/gutenberg#39171 and since --webpack-copy-php is not present the PHP files won't be copied.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

That's correct.

"axios": "0.26.0",
"babel-plugin-inline-react-svg": "2.0.1",
"babel-plugin-transform-react-remove-prop-types": "0.4.24",
Expand Down
13 changes: 1 addition & 12 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,7 @@ const sharedConfig = {
return plugin;
},
)
.filter( ( plugin ) => ! [
'CleanWebpackPlugin',
/**
* After introducing WordPress/gutenberg#38715, PHP files from the `src` folder are copied over
* to the output directory (i.e. `assets`). To prevent this, the `CopyWebpackPlugin` is excluded
* from the plugins list. It is safe since the only other file type the plugin copies is `block.json`
* that is not used in `amp-wp`.
*
* @see https://github.com/ampproject/amp-wp/issues/6947
*/
'CopyWebpackPlugin',
].includes( plugin.constructor.name ) ),
.filter( ( plugin ) => plugin.constructor.name !== 'CleanWebpackPlugin' ),
new RtlCssPlugin( {
filename: '../css/[name]-rtl.css',
} ),
Expand Down