Merge pull request #93 from 10up/develop

Version Release
10up · Jul 26, 2021 · cd33861 · cd33861
2 parents 9726743 + 304e0ca
commit cd33861
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md
@@ -2,7 +2,10 @@
 
 All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/).
 
-## 1.0.8
+## 1.0.10
+- Fixed empty scripts output when a CSS entry is added.[#91](https://github.com/10up/10up-toolkit/pull/91)
+
+## 1.0.9
 - Updated deps [82](https://github.com/10up/10up-toolkit/pull/82)
 - Remove husky from 10up-toolkit [81] (Updated: Husky to 6.x)
 

diff --git a/packages/toolkit/README.md b/packages/toolkit/README.md
@@ -51,7 +51,7 @@ Runs Jest on current project.
 
 Verify the Node and npm satisfy minimum `package.json` versions.
 
-*Project is a fork of [wp-scripts](https://github.com/WordPress/gutenberg/tree/master/packages/scripts)*
+*Project is a fork of [wp-scripts](https://github.com/WordPress/gutenberg/tree/trunk/packages/scripts)*
 
 ## Configuration and Extension
 
@@ -123,7 +123,7 @@ To override you will need to define `10up-toolkit.entry` in your `package.json`
 
 ### Webpack
 
-10up-toolkit will use 10up standard Webpack configuration located in [/config/webpack.config.js](https://github.com/10up/10up-toolkit/blob/master/config/webpack.config.js) UNLESS you define a Webpack config file in your project e.g. you have a `webpack.config.js` in your project root. If you just need to change entry points, see the Entry Points section below.
+10up-toolkit will use 10up standard Webpack configuration located in [/config/webpack.config.js](https://github.com/10up/10up-toolkit/blob/trunk/packages/toolkit/config/webpack.config.js) UNLESS you define a Webpack config file in your project e.g. you have a `webpack.config.js` in your project root. If you just need to change entry points, see the Entry Points section below.
 
 Here's an example `webpack.config.js` you could add to the root of your project to extend `10up/scripts` Webpack.
 
@@ -139,15 +139,15 @@ module.exports = {
 
 ### ESLint
 
-10up-toolkit will use 10up standard ESLint configuration located in [/config/.eslintrc.js](https://github.com/10up/10up-toolkit/blob/master/config/.eslintrc.js) which extends [@10up/eslint-config](https://github.com/10up/eslint-config) UNLESS you define a ESLint config file in your project e.g. you have a `.eslintrc.js` in your project root. 
+10up-toolkit will use 10up standard ESLint configuration located in [/config/.eslintrc.js](https://github.com/10up/10up-toolkit/blob/trunk/packages/toolkit/config/.eslintrc.js) which extends [@10up/eslint-config](https://github.com/10up/eslint-config) UNLESS you define a ESLint config file in your project e.g. you have a `.eslintrc.js` in your project root. 
 
 ### Stylelint
 
-10up-toolkit will use 10up standard Stylelint configuration located in [/config/stylelint.config.js](https://github.com/10up/10up-toolkit/blob/master/config/stylelint.config.js) which extends [@10up/stylelint-config](https://github.com/10up/stylelint-config) UNLESS you define a Stylelint config file in your project e.g. you have a `stylelint.config.js` in your project root.
+10up-toolkit will use 10up standard Stylelint configuration located in [/config/stylelint.config.js](https://github.com/10up/10up-toolkit/blob/trunk/packages/toolkit/config/stylelint.config.js) which extends [@10up/stylelint-config](https://github.com/10up/stylelint-config) UNLESS you define a Stylelint config file in your project e.g. you have a `stylelint.config.js` in your project root.
 
 ### PostCSS
 
-10up-toolkit will use 10up standard PostCSS configuration located in [/config/postcss.config.js](https://github.com/10up/10up-toolkit/blob/master/config/postcss.config.js) UNLESS you define a PostCSS config file in your project e.g. you have a `postcss.config.js` in your project root.
+10up-toolkit will use 10up standard PostCSS configuration located in [/config/postcss.config.js](https://github.com/10up/10up-toolkit/blob/trunk/packages/toolkit/config/postcss.config.js) UNLESS you define a PostCSS config file in your project e.g. you have a `postcss.config.js` in your project root.
 
 ### Babel
 

diff --git a/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap b/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap
@@ -168,6 +168,7 @@ Object {
     StylelintWebpackPlugin: {"extensions":["css","scss","sass"],"emitError":true,"emitWarning":true,"failOnError":true,"context":"/assets","files":"**/*.(s(c|a)ss|css)","allowEmptyInput":true,"configFile":"/config/stylelint.config.js"},
     WebpackBarPlugin: {"name":"webpack","color":"green","reporters":["basic"],"reporter":null},
     CleanExtractedDeps: {},
+    WebpackRemoveEmptyScriptsPlugin: {"verbose":false,"extensions":["css","scss","sass","less","styl"],"scriptExtensions":["js","mjs"],"ignore":[]},
   ],
   "resolve": Object {
     "alias": Object {
@@ -344,6 +345,7 @@ Object {
     StylelintWebpackPlugin: {"extensions":["css","scss","sass"],"emitError":true,"emitWarning":true,"failOnError":true,"context":"/assets","files":"**/*.(s(c|a)ss|css)","allowEmptyInput":true},
     WebpackBarPlugin: {"name":"webpack","color":"green","reporters":["basic"],"reporter":null},
     CleanExtractedDeps: {},
+    WebpackRemoveEmptyScriptsPlugin: {"verbose":false,"extensions":["css","scss","sass","less","styl"],"scriptExtensions":["js","mjs"],"ignore":[]},
   ],
   "resolve": Object {
     "alias": Object {
@@ -509,6 +511,7 @@ Object {
     WebpackBarPlugin: {"name":"webpack","color":"green","reporters":["basic"],"reporter":null},
     DependencyExtractionWebpackPlugin: {"combineAssets":false,"combinedOutputFile":null,"injectPolyfill":true,"outputFormat":"php","useDefaults":true},
     CleanExtractedDeps: {},
+    WebpackRemoveEmptyScriptsPlugin: {"verbose":false,"extensions":["css","scss","sass","less","styl"],"scriptExtensions":["js","mjs"],"ignore":[]},
   ],
   "resolve": Object {
     "alias": Object {
@@ -706,6 +709,7 @@ Object {
     StylelintWebpackPlugin: {"extensions":["css","scss","sass"],"emitError":true,"emitWarning":true,"failOnError":true,"context":"/assets","files":"**/*.(s(c|a)ss|css)","allowEmptyInput":true,"configFile":"/config/stylelint.config.js"},
     WebpackBarPlugin: {"name":"webpack","color":"green","reporters":["basic"],"reporter":null},
     CleanExtractedDeps: {},
+    WebpackRemoveEmptyScriptsPlugin: {"verbose":false,"extensions":["css","scss","sass","less","styl"],"scriptExtensions":["js","mjs"],"ignore":[]},
   ],
   "resolve": Object {
     "alias": Object {
@@ -895,6 +899,7 @@ Object {
     StylelintWebpackPlugin: {"extensions":["css","scss","sass"],"emitError":true,"emitWarning":true,"failOnError":true,"context":"/assets","files":"**/*.(s(c|a)ss|css)","allowEmptyInput":true,"configFile":"/config/stylelint.config.js"},
     WebpackBarPlugin: {"name":"webpack","color":"green","reporters":["basic"],"reporter":null},
     CleanExtractedDeps: {},
+    WebpackRemoveEmptyScriptsPlugin: {"verbose":false,"extensions":["css","scss","sass","less","styl"],"scriptExtensions":["js","mjs"],"ignore":[]},
   ],
   "resolve": Object {
     "alias": Object {
@@ -1093,6 +1098,7 @@ Object {
     StylelintWebpackPlugin: {"extensions":["css","scss","sass"],"emitError":true,"emitWarning":true,"failOnError":true,"context":"/assets","files":"**/*.(s(c|a)ss|css)","allowEmptyInput":true,"configFile":"/config/stylelint.config.js"},
     WebpackBarPlugin: {"name":"webpack","color":"green","reporters":["basic"],"reporter":null},
     CleanExtractedDeps: {},
+    WebpackRemoveEmptyScriptsPlugin: {"verbose":false,"extensions":["css","scss","sass","less","styl"],"scriptExtensions":["js","mjs"],"ignore":[]},
   ],
   "resolve": Object {
     "alias": Object {
@@ -1281,6 +1287,7 @@ Object {
     WebpackBarPlugin: {"name":"webpack","color":"green","reporters":["basic"],"reporter":null},
     DependencyExtractionWebpackPlugin: {"combineAssets":false,"combinedOutputFile":null,"injectPolyfill":true,"outputFormat":"php","useDefaults":true},
     CleanExtractedDeps: {},
+    WebpackRemoveEmptyScriptsPlugin: {"verbose":false,"extensions":["css","scss","sass","less","styl"],"scriptExtensions":["js","mjs"],"ignore":[]},
   ],
   "resolve": Object {
     "alias": Object {

diff --git a/packages/toolkit/config/webpack/plugins.js b/packages/toolkit/config/webpack/plugins.js
@@ -8,6 +8,7 @@ const StyleLintPlugin = require('stylelint-webpack-plugin');
 const WebpackBar = require('webpackbar');
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+const RemoveEmptyScriptsPlugin = require('webpack-remove-empty-scripts');
 const CleanExtractedDeps = require('../../utils/clean-extracted-deps');
 
 const { hasStylelintConfig, fromConfigRoot, hasProjectFile } = require('../../utils');
@@ -101,5 +102,6 @@ module.exports = ({
 				injectPolyfill: true,
 			}),
 		new CleanExtractedDeps(),
+		new RemoveEmptyScriptsPlugin(),
 	].filter(Boolean);
 };
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -13,7 +13,7 @@
     "url": "git+https://github.com/10up/10up-toolkit.git",
     "directory": "packages/toolkit"
   },
-  "version": "1.0.9",
+  "version": "1.0.10",
   "bin": {
     "10up-toolkit": "bin/10up-toolkit.js"
   },
@@ -85,6 +85,7 @@
     "webpack": "^5.41.1",
     "webpack-bundle-analyzer": "^4.4.2",
     "webpack-dev-server": "^3.11.2",
+    "webpack-remove-empty-scripts": "^0.7.1",
     "webpack-sources": "^2.3.0",
     "webpackbar": "^5.0.0-3"
   },