From d6f584cc547e8854ce39abb4d0f38e8d0a64c873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcholas=20Oliveira?= Date: Mon, 25 Sep 2023 11:40:05 -0300 Subject: [PATCH 1/3] Remove browser-sync --- packages/toolkit/config/webpack/plugins.js | 37 ---------------------- 1 file changed, 37 deletions(-) diff --git a/packages/toolkit/config/webpack/plugins.js b/packages/toolkit/config/webpack/plugins.js index 3567ac11..b07872c6 100644 --- a/packages/toolkit/config/webpack/plugins.js +++ b/packages/toolkit/config/webpack/plugins.js @@ -12,16 +12,13 @@ const { resolve } = require('path'); const RemoveEmptyScriptsPlugin = require('./plugins/remove-empty-scripts'); const CleanExtractedDeps = require('./plugins/clean-extracted-deps'); const TenUpToolkitTscPlugin = require('./plugins/tsc'); -const NoBrowserSyncPlugin = require('./plugins/no-browser-sync'); const { hasStylelintConfig, fromConfigRoot, hasProjectFile, - getArgFromCLI, maybeInsertStyleVersionHash, } = require('../../utils'); -const { isPackageInstalled } = require('../../utils/package'); const removeDistFolder = (file) => { return file.replace(/(^\.\/dist\/)|^dist\//, ''); @@ -38,7 +35,6 @@ module.exports = ({ projectConfig: { devServer, filenames, - devURL, devServerPort, paths, wpDependencyExternals, @@ -51,38 +47,6 @@ module.exports = ({ }) => { const hasReactFastRefresh = hot && !isProduction; - const hasBrowserSync = - isPackageInstalled('browser-sync-webpack-plugin') && isPackageInstalled('browser-sync'); - - const shouldLoadBrowserSync = !isProduction && devURL && !hasReactFastRefresh && hasBrowserSync; - - let browserSync = !isProduction && devURL ? new NoBrowserSyncPlugin() : false; - if (shouldLoadBrowserSync) { - // eslint-disable-next-line global-require, import/no-extraneous-dependencies - const BrowserSyncPlugin = require('browser-sync-webpack-plugin'); - browserSync = new BrowserSyncPlugin( - { - host: 'localhost', - port: getArgFromCLI('--port') || 3000, - proxy: devURL, - open: false, - files: ['**/*.php', '**/*.js', 'dist/**/*.css'], - ignore: ['dist/**/*.php', 'dist/**/*.js'], - serveStatic: ['.'], - rewriteRules: [ - { - match: /wp-content\/themes\/.*\/dist/g, - replace: 'dist', - }, - ], - }, - { - injectCss: true, - reload: false, - }, - ); - } - const blocksSourceDirectory = resolve(process.cwd(), paths.blocksDir); return [ @@ -180,7 +144,6 @@ module.exports = ({ }, ].filter(Boolean), }), - devURL && browserSync, // Lint CSS. new StyleLintPlugin({ context: path.resolve(process.cwd(), paths.srcDir), From 964041b5871e0c76a93f7fc4b754655d8df69a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcholas=20Oliveira?= Date: Mon, 25 Sep 2023 11:47:20 -0300 Subject: [PATCH 2/3] changeset --- .changeset/gold-scissors-shake.md | 5 ++++ .../webpack-basic-config.js.snap | 1 - .../webpack-cli-arguments.js.snap | 1 - .../config/webpack/plugins/no-browser-sync.js | 27 ------------------- 4 files changed, 5 insertions(+), 29 deletions(-) create mode 100644 .changeset/gold-scissors-shake.md delete mode 100644 packages/toolkit/config/webpack/plugins/no-browser-sync.js diff --git a/.changeset/gold-scissors-shake.md b/.changeset/gold-scissors-shake.md new file mode 100644 index 00000000..3cb62724 --- /dev/null +++ b/.changeset/gold-scissors-shake.md @@ -0,0 +1,5 @@ +--- +"10up-toolkit": major +--- + +Remove browser-sync support diff --git a/packages/toolkit/config/__tests__/__snapshots__/webpack-basic-config.js.snap b/packages/toolkit/config/__tests__/__snapshots__/webpack-basic-config.js.snap index b67ef4e4..32204480 100644 --- a/packages/toolkit/config/__tests__/__snapshots__/webpack-basic-config.js.snap +++ b/packages/toolkit/config/__tests__/__snapshots__/webpack-basic-config.js.snap @@ -1596,7 +1596,6 @@ Object { ESLintWebpackPlugin: {"extensions":"js","emitError":true,"emitWarning":true,"failOnError":false,"resourceQueryExclude":[],"fix":false,"lintDirtyModulesOnly":true}, MiniCssExtractPlugin: {"ignoreOrder":false,"runtime":true,"chunkFilename":"[id].css"}, CopyPlugin: {}, - NoBrowserSyncPlugin: {}, StylelintWebpackPlugin: {"cache":true,"cacheLocation":"node_modules/.cache/stylelint-webpack-plugin/.stylelintcache","extensions":["css","scss","sass"],"emitError":true,"emitWarning":true,"failOnError":false,"context":"/assets2","files":"**/*.(s(c|a)ss|css)","allowEmptyInput":true,"lintDirtyModulesOnly":true,"configFile":"/config/stylelint.config.js"}, WebpackBarPlugin: {"name":"webpack","color":"green","reporters":["basic"],"reporter":null}, DependencyExtractionWebpackPlugin: {"combineAssets":false,"combinedOutputFile":null,"externalizedReport":false,"injectPolyfill":false,"outputFormat":"php","outputFilename":null,"useDefaults":true}, diff --git a/packages/toolkit/config/__tests__/__snapshots__/webpack-cli-arguments.js.snap b/packages/toolkit/config/__tests__/__snapshots__/webpack-cli-arguments.js.snap index a2ec8b2d..bb79ebd8 100644 --- a/packages/toolkit/config/__tests__/__snapshots__/webpack-cli-arguments.js.snap +++ b/packages/toolkit/config/__tests__/__snapshots__/webpack-cli-arguments.js.snap @@ -483,7 +483,6 @@ Object { ESLintWebpackPlugin: {"extensions":"js","emitError":true,"emitWarning":true,"failOnError":false,"resourceQueryExclude":[],"fix":false,"lintDirtyModulesOnly":true}, MiniCssExtractPlugin: {"ignoreOrder":false,"runtime":true,"chunkFilename":"[id].css"}, CopyPlugin: {}, - NoBrowserSyncPlugin: {}, StylelintWebpackPlugin: {"cache":true,"cacheLocation":"node_modules/.cache/stylelint-webpack-plugin/.stylelintcache","extensions":["css","scss","sass"],"emitError":true,"emitWarning":true,"failOnError":false,"context":"/assets","files":"**/*.(s(c|a)ss|css)","allowEmptyInput":true,"lintDirtyModulesOnly":true}, WebpackBarPlugin: {"name":"webpack","color":"green","reporters":["basic"],"reporter":null}, DependencyExtractionWebpackPlugin: {"combineAssets":false,"combinedOutputFile":null,"externalizedReport":false,"injectPolyfill":false,"outputFormat":"php","outputFilename":null,"useDefaults":true}, diff --git a/packages/toolkit/config/webpack/plugins/no-browser-sync.js b/packages/toolkit/config/webpack/plugins/no-browser-sync.js deleted file mode 100644 index 37b7d06b..00000000 --- a/packages/toolkit/config/webpack/plugins/no-browser-sync.js +++ /dev/null @@ -1,27 +0,0 @@ -class NoBrowserSyncPlugin { - constructor() { - this.displayed = false; - } - - // Define `apply` as its prototype method which is supplied with compiler as its argument - apply(compiler) { - compiler.hooks.compilation.tap('NoBrowserSyncPlugin', (compilation) => { - if (!this.displayed) { - this.displayed = true; - const logger = compilation.getLogger('10upToolkitBrowserSyncDeprecationNotice'); - logger.warn( - 'BrowserSync suppport has been deprecated in 10up-toolkit in favor of the `--hot` option and will be completely removed in the next major release!', - ); - logger.warn( - 'If you still wish to use BrowserSync you must manually install the `browser-sync` and `browser-sync-webpack-plugin` packages.', - ); - logger.warn( - 'If those packages are installed 10up-toolkit will start browser-sync automatically!', - ); - logger.warn('See https://github.com/10up/10up-toolkit/issues/158 for more info'); - } - }); - } -} - -module.exports = NoBrowserSyncPlugin; From 0fea5d89b2f09cf4f79ca0127f8225df82c24d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcholas=20Oliveira?= Date: Mon, 25 Sep 2023 11:55:55 -0300 Subject: [PATCH 3/3] update lock file --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5ab6d68b..9e5529f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20810,7 +20810,7 @@ }, "packages/stylelint-config": { "name": "@10up/stylelint-config", - "version": "2.0.5-next.0", + "version": "2.0.5", "license": "GPL-2.0-or-later", "dependencies": { "@wordpress/stylelint-config": "^20.0.3", @@ -20829,7 +20829,7 @@ }, "packages/toolkit": { "name": "10up-toolkit", - "version": "5.2.2-next.0", + "version": "5.2.2", "license": "GPL-2.0-or-later", "dependencies": { "@babel/core": "^7.21.8", @@ -20888,7 +20888,7 @@ "devDependencies": { "@10up/babel-preset-default": "^2.1.0", "@10up/eslint-config": "^3.1.1", - "@10up/stylelint-config": "^2.0.5-next.0" + "@10up/stylelint-config": "^2.0.5" }, "engines": { "node": ">=14", @@ -20939,7 +20939,7 @@ "@linaria/babel-preset": "^4.3.3", "@linaria/webpack-loader": "^4.1.11", "@wordpress/env": "^5.0.0", - "10up-toolkit": "^5.2.2-next.0" + "10up-toolkit": "^5.2.2" }, "engines": { "node": ">=12.0.0" @@ -20956,7 +20956,7 @@ "@testing-library/dom": "^7.29.4", "@testing-library/jest-dom": "^5.11.9", "@testing-library/user-event": "^12.6.3", - "10up-toolkit": "^5.2.2-next.0", + "10up-toolkit": "^5.2.2", "jest-axe": "^4.1.0" } }, @@ -20968,7 +20968,7 @@ "xss": "^1.0.11" }, "devDependencies": { - "10up-toolkit": "^5.2.2-next.0" + "10up-toolkit": "^5.2.2" } }, "projects/library/node_modules/@testing-library/dom": {