@dtwo/webpack-builder 3.1.2 → 3.2.1

package/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2022 - Dtwo Team
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2022 - Dtwo Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import pify from 'pify';
-import webpack from 'webpack';
+import webpack, { RuntimeGlobals } from 'webpack';
 import { fromNodeMiddleware, defineEventHandler } from 'h3';
 import webpackDevMiddleware from 'webpack-dev-middleware';
 import webpackHotMiddleware from 'webpack-hot-middleware';
@@ -16,19 +16,19 @@ import { createFsFromVolume, Volume } from 'memfs';
 import VirtualModulesPlugin from 'webpack-virtual-modules';
 import querystring from 'node:querystring';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+import ForkTSCheckerWebpackPlugin from '@dtwojs/fork-ts-checker-webpack-plugin';
 import { cloneDeep, uniq, defaults as defaults$1, merge } from 'lodash-es';
 import TimeFixPlugin from 'time-fix-plugin';
 import WebpackBar from 'webpackbar';
 import FriendlyErrorsWebpackPlugin from '@d2js/friendly-errors-webpack-plugin';
 import escapeRegExp from 'escape-string-regexp';
-import esbuildLoader from 'esbuild-loader';
+import { EsbuildPlugin } from 'esbuild-loader';
 import KduLoaderPlugin from 'kdu-loader/dist/pluginWebpack5.js';
 import { normalizeWebpackManifest } from 'kdu-bundle-renderer';
 import hash$1 from 'hash-sum';
 import fse from 'fs-extra';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
-import ForkTSCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 
 const keyedFunctions = [
   "useState",
@@ -155,6 +155,31 @@ ${options.globalPublicPath} = buildAssetsURL();
   };
 });
 
+const pluginName = "ChunkErrorPlugin";
+const script = `
+if (typeof ${RuntimeGlobals.require} !== "undefined") {
+  var _ensureChunk = ${RuntimeGlobals.ensureChunk};
+  ${RuntimeGlobals.ensureChunk} = function (chunkId) {
+    return Promise.resolve(_ensureChunk(chunkId)).catch(err => {
+      const e = new Event("dtwo.preloadError");
+      e.payload = err;
+      window.dispatchEvent(e);
+      throw err;
+    });
+  };
+};`;
+class ChunkErrorPlugin {
+  apply(compiler) {
+    compiler.hooks.thisCompilation.tap(
+      pluginName,
+      (compilation) => compilation.mainTemplate.hooks.localVars.tap(
+        { name: pluginName, stage: 1 },
+        (source) => source + script
+      )
+    );
+  }
+}
+
 function createMFS() {
   const fs = createFsFromVolume(new Volume());
   const _fs = { ...fs };
@@ -471,7 +496,7 @@ function getEnv(ctx) {
 function esbuild(ctx) {
   const { config } = ctx;
   const target = ctx.isServer ? "es2019" : "chrome85";
-  config.optimization.minimizer.push(new esbuildLoader.ESBuildMinifyPlugin());
+  config.optimization.minimizer.push(new EsbuildPlugin());
   config.module.rules.push(
     {
       test: /\.m?[jt]s$/i,
@@ -970,6 +995,18 @@ function clientPlugins(ctx) {
       ...options.webpack.analyze === true ? {} : options.webpack.analyze
     }));
   }
+  if (!ctx.dtwo.options.ssr) {
+    if (ctx.dtwo.options.typescript.typeCheck === true || ctx.dtwo.options.typescript.typeCheck === "build" && !ctx.dtwo.options.dev) {
+      config.plugins.push(new ForkTSCheckerWebpackPlugin({
+        logger,
+        typescript: {
+          extensions: {
+            kdu: { compiler: "@kdujs/compiler-sfc" }
+          }
+        }
+      }));
+    }
+  }
 }
 
 function node(ctx) {
@@ -1066,7 +1103,14 @@ function serverPlugins(ctx) {
     }));
   }
   if (ctx.dtwo.options.typescript.typeCheck === true || ctx.dtwo.options.typescript.typeCheck === "build" && !ctx.dtwo.options.dev) {
-    config.plugins.push(new ForkTSCheckerWebpackPlugin({ logger }));
+    config.plugins.push(new ForkTSCheckerWebpackPlugin({
+      logger,
+      typescript: {
+        extensions: {
+          kdu: { compiler: "@kdujs/compiler-sfc" }
+        }
+      }
+    }));
   }
 }
 
@@ -1083,6 +1127,9 @@ async function bundle(dtwo) {
     config.plugins.push(DynamicBasePlugin.webpack({
       sourcemap: dtwo.options.sourcemap[config.name]
     }));
+    if (config.name === "client" && dtwo.options.experimental.emitRouteChunkError) {
+      config.plugins.push(new ChunkErrorPlugin());
+    }
     config.plugins.push(composableKeysPlugin.webpack({
       sourcemap: dtwo.options.sourcemap[config.name],
       rootDir: dtwo.options.rootDir

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dtwo/webpack-builder",
-  "version": "3.1.2",
+  "version": "3.2.1",
   "repository": "d2js/dtwo",
   "license": "MIT",
   "type": "module",
@@ -15,26 +15,26 @@
   "dependencies": {
     "@babel/core": "7.20.12",
     "@d2js/friendly-errors-webpack-plugin": "2.5.2",
-    "@dtwo/kit": "3.1.2",
-    "@dtwo/unplugin": "1.0.0",
+    "@dtwo/kit": "3.2.1",
+    "@dtwo/unplugin": "1.4.0",
+    "@dtwojs/fork-ts-checker-webpack-plugin": "7.3.0",
     "autoprefixer": "10.4.13",
     "css-loader": "6.7.3",
     "css-minimizer-webpack-plugin": "4.2.2",
-    "cssnano": "5.1.14",
-    "esbuild-loader": "2.21.0",
+    "cssnano": "5.1.15",
+    "esbuild-loader": "3.0.1",
     "escape-string-regexp": "5.0.0",
     "estree-walker": "3.0.3",
     "file-loader": "6.2.0",
-    "fork-ts-checker-webpack-plugin": "7.3.0",
     "fs-extra": "11.1.0",
     "hash-sum": "2.0.0",
-    "kdu-bundle-renderer": "1.0.0",
+    "kdu-bundle-renderer": "1.0.2-1",
     "kdu-loader": "17.0.0",
     "lodash-es": "4.17.21",
-    "magic-string": "0.27.0",
+    "magic-string": "0.29.0",
     "memfs": "3.4.13",
     "mini-css-extract-plugin": "2.7.2",
-    "mlly": "1.1.0",
+    "mlly": "1.1.1",
     "ohash": "1.0.0",
     "pathe": "1.1.0",
     "pify": "6.1.0",
@@ -44,17 +44,17 @@
     "postcss-url": "10.1.3",
     "style-resources-loader": "1.5.0",
     "time-fix-plugin": "2.0.7",
-    "ufo": "1.0.1",
+    "ufo": "1.1.0",
     "url-loader": "4.1.1",
     "webpack": "5.75.0",
-    "webpack-bundle-analyzer": "4.7.0",
+    "webpack-bundle-analyzer": "4.8.0",
     "webpack-dev-middleware": "6.0.1",
     "webpack-hot-middleware": "2.25.3",
     "webpack-virtual-modules": "0.5.0",
     "webpackbar": "5.0.2"
   },
   "devDependencies": {
-    "@dtwo/schema": "3.1.2",
+    "@dtwo/schema": "3.2.1",
     "@types/lodash-es": "4.17.6",
     "@types/pify": "5.0.1",
     "@types/webpack-bundle-analyzer": "4.6.0",
@@ -68,7 +68,7 @@
     "kdu": "^3.2.47"
   },
   "engines": {
-    "node": "^14.16.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
   },
   "scripts": {}
 }

package/README.md

@@ -1,7 +0,0 @@
-# Dtwo
-
-Dtwo 3: **The Intuitive Web Framework** ✨
-
-## License
-
-[MIT](./LICENSE)