@merkur/tool-webpack 0.27.1 → 0.28.0

package/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.28.0](https://github.com/mjancarik/merkur/compare/v0.27.6...v0.28.0) (2022-04-20)
+
+
+### Code Refactoring
+
+* 💡 move liveReloadServer to merkur/tools ([f81e0e8](https://github.com/mjancarik/merkur/commit/f81e0e89eff4a72985c89d23079be6a9344a3b2e))
+
+
+### BREAKING CHANGES
+
+* 🧨 The liveReloadServer.cjs file is moved to @merkur/tools. The
+@merkur/tool-webpack re-export createLiveReloadServer for keeping
+backward compatability.
+
+
+
+
+
+## [0.27.4](https://github.com/mjancarik/merkur/compare/v0.27.3...v0.27.4) (2021-10-06)
+
+
+### Features
+
+* 🎸 Allow CssMinimizerPlugin options override ([#114](https://github.com/mjancarik/merkur/issues/114)) ([c02dd0b](https://github.com/mjancarik/merkur/commit/c02dd0bf06a44bbf45880c9b1932a33e287f35ce))
+
+
+
+
+
+## [0.27.3](https://github.com/mjancarik/merkur/compare/v0.27.2...v0.27.3) (2021-10-04)
+
+
+### Bug Fixes
+
+* 🐛 Windows babel es5 build issue with exclude pattern ([#113](https://github.com/mjancarik/merkur/issues/113)) ([26387ea](https://github.com/mjancarik/merkur/commit/26387ea01d840d5d6f55d4748d34c87c7f3f5f10))
+
+
+
+
+
 ## [0.27.1](https://github.com/mjancarik/merkur/compare/v0.27.0...v0.27.1) (2021-09-30)
 
 **Note:** Version bump only for package @merkur/tool-webpack

package/index.cjs

@@ -9,7 +9,9 @@ const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const CompressionPlugin = require('compression-webpack-plugin');
 
 const { createCache, createCacheKey } = require('./webpack/cache.cjs');
-const { createLiveReloadServer } = require('./webpack/liveReloadServer.cjs');
+const {
+  createLiveReloadServer,
+} = require('@merkur/tools/liveReloadServer.cjs');
 const { applyBundleAnalyzer } = require('./module/bundleAnalyzer.cjs');
 const {
   findLoaders,
@@ -168,7 +170,7 @@ function createWebConfig(config, context) {
     module: {
       ...baseConfig?.module,
       rules: [
-        ...baseConfig?.module?.rules,
+        ...(baseConfig?.module?.rules ?? []),
         {
           test: /\.m?js/,
           resolve: {

package/module/babelLoader.cjs

@@ -123,7 +123,9 @@ function createESTransformation(
   if (babelLoaders.length === 0) {
     config.module.rules.push({
       test: /\.(js|ts|tsx|mjs|jsx)$/,
-      exclude: /node_modules\/(?!(abort-controller)\/).*/,
+      exclude: (modulePath) =>
+        /node_modules/.test(modulePath) &&
+        !/node_modules\/(abort-controller|event-target-shim)/.test(modulePath),
       use: {
         loader: require.resolve('babel-loader'),
         options: {
@@ -131,7 +133,7 @@ function createESTransformation(
           cacheIdentifier: createCacheKey(
             environment,
             config?.name,
-            ...cache?.versionDependencies
+            ...(cache?.versionDependencies ?? [])
           ),
           cacheDirectory: true,
           cacheCompression: false,

package/module/styleLoader.cjs

@@ -2,7 +2,7 @@ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 function getStyleLoaders({ isServer, isProduction }, useLess) {
-  let importLoaders = isServer;
+  let importLoaders = isServer ? 0 : 1;
 
   if (useLess) {
     importLoaders += 1;
@@ -29,6 +29,7 @@ function getStyleLoaders({ isServer, isProduction }, useLess) {
     !isServer && {
       loader: require.resolve('postcss-loader'),
       options: {
+        implementation: require('postcss'),
         postcssOptions: {
           plugins: [
             'postcss-flexbugs-fixes',
@@ -40,7 +41,7 @@ function getStyleLoaders({ isServer, isProduction }, useLess) {
                 },
                 stage: 3,
                 features: {
-                  'custom-properties': false,
+                  'custom-properties': true,
                 },
               },
             ],
@@ -80,7 +81,7 @@ function applyStyleLoaders(config, context) {
 
   config.optimization = {
     ...config.optimization,
-    minimizer: ['...', new CssMinimizerPlugin()],
+    minimizer: ['...', new CssMinimizerPlugin(plugins.CssMinimizerPlugin)],
   };
 
   config.plugins.push(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/tool-webpack",
-  "version": "0.27.1",
+  "version": "0.28.0",
   "description": "Merkur tool webpack.",
   "main": "index.cjs",
   "scripts": {
@@ -28,31 +28,33 @@
   },
   "homepage": "https://merkur.js.org/",
   "dependencies": {
-    "@babel/core": "^7.15.5",
-    "@babel/preset-env": "^7.15.6",
-    "autoprefixer": "^10.3.6",
-    "babel-loader": "8.2.2",
+    "@babel/core": "^7.17.9",
+    "@babel/preset-env": "^7.16.11",
+    "autoprefixer": "^10.4.4",
+    "babel-loader": "8.2.4",
     "clean-webpack-plugin": "^4.0.0",
-    "compression-webpack-plugin": "^9.0.0",
-    "core-js": "^3.18.1",
-    "css-loader": "^6.3.0",
-    "css-minimizer-webpack-plugin": "^3.0.2",
-    "find-free-port": "^2.0.0",
+    "compression-webpack-plugin": "^9.2.0",
+    "core-js": "^3.22.0",
+    "css-loader": "^6.7.1",
+    "css-minimizer-webpack-plugin": "^3.4.1",
     "json-loader": "0.5.7",
-    "less": "^4.1.1",
-    "less-loader": "^10.0.1",
-    "mini-css-extract-plugin": "^2.3.0",
-    "postcss": "^8.3.8",
+    "less": "^4.1.2",
+    "less-loader": "^10.2.0",
+    "mini-css-extract-plugin": "^2.6.0",
+    "postcss": "^8.4.12",
     "postcss-flexbugs-fixes": "^5.0.2",
-    "postcss-less": "^5.0.0",
-    "postcss-loader": "^6.1.1",
-    "postcss-preset-env": "^6.7.0",
-    "source-map-loader": "^3.0.0",
-    "webpack-bundle-analyzer": "^4.4.2",
-    "webpack-manifest-plugin": "4.0.2",
+    "postcss-less": "^6.0.0",
+    "postcss-loader": "^6.2.1",
+    "postcss-preset-env": "^7.4.3",
+    "source-map-loader": "^3.0.1",
+    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-manifest-plugin": "5.0.0",
     "webpack-modules": "1.0.0",
     "webpack-node-externals": "3.0.0",
     "webpack-shell-plugin-next": "^2.2.2"
   },
-  "gitHead": "7746edd12ea8bf633701e98e8e0f2cd9da48db20"
+  "peerDependencies": {
+    "@merkur/tools": "*"
+  },
+  "gitHead": "8760a1cedbbfc37348055418bacbfc69199a3c06"
 }

package/webpack/cache.cjs

@@ -16,7 +16,7 @@ function createCacheKey(...args) {
 function createCache({ cwd, cache, environment }) {
   return {
     type: 'filesystem',
-    version: createCacheKey(environment, ...cache?.versionDependencies),
+    version: createCacheKey(environment, ...(cache?.versionDependencies ?? [])),
     buildDependencies: {
       defaultWebpack: ['webpack/lib/'],
       config: [path.resolve(cwd, 'webpack.config.js')].filter(fs.existsSync),

package/webpack/liveReloadServer.cjs

@@ -1,20 +0,0 @@
-const fp = require('find-free-port');
-const WebSocket = require('@merkur/tools/websocket.cjs');
-
-async function createLiveReloadServer() {
-  if (process.env.NODE_ENV === 'development') {
-    try {
-      const [freePort] = await fp(4321);
-      process.env.MERKUR_PLAYGROUND_LIVERELOAD_PORT = freePort;
-
-      WebSocket.createServer({
-        port: freePort,
-      });
-    } catch (error) {
-      console.error(error);
-      throw new Error('Unable to retrieve free port for livereload server.');
-    }
-  }
-}
-
-module.exports = { createLiveReloadServer };