@dtwo/webpack-builder 3.1.1 → 3.2.0

package/dist/index.mjs

@@ -11,24 +11,24 @@ import { isAbsolute, relative, join, resolve, normalize, dirname } from 'pathe';
 import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
 import { hash } from 'ohash';
+import { findStaticImports, parseStaticImport, createCommonJS } from 'mlly';
 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 { createCommonJS } from 'mlly';
-import ForkTSCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 
 const keyedFunctions = [
   "useState",
@@ -53,6 +53,7 @@ const composableKeysPlugin = createUnplugin((options) => {
       }
       const { 0: script = code, index: codeIndex = 0 } = code.match(/(?<=<script[^>]*>)[\S\s.]*?(?=<\/script>)/) || { index: 0, 0: code };
       const s = new MagicString(code);
+      let imports;
       let count = 0;
       const relativeID = isAbsolute(id) ? relative(options.rootDir, id) : id;
       walk(this.parse(script, {
@@ -68,6 +69,10 @@ const composableKeysPlugin = createUnplugin((options) => {
           if (!name || !keyedFunctions.includes(name) || node.arguments.length >= 4) {
             return;
           }
+          imports = imports || detectImportNames(script);
+          if (imports.has(name)) {
+            return;
+          }
           switch (name) {
             case "useState":
               if (node.arguments.length >= 2 || stringTypes.includes(node.arguments[0]?.type)) {
@@ -103,6 +108,27 @@ const composableKeysPlugin = createUnplugin((options) => {
     }
   };
 });
+const DTWO_IMPORT_RE = /dtwo|#app|#imports/;
+function detectImportNames(code) {
+  const imports = findStaticImports(code);
+  const names = /* @__PURE__ */ new Set();
+  for (const i of imports) {
+    if (DTWO_IMPORT_RE.test(i.specifier)) {
+      continue;
+    }
+    const { namedImports, defaultImport, namespacedImport } = parseStaticImport(i);
+    for (const name in namedImports || {}) {
+      names.add(namedImports[name]);
+    }
+    if (defaultImport) {
+      names.add(defaultImport);
+    }
+    if (namespacedImport) {
+      names.add(namespacedImport);
+    }
+  }
+  return names;
+}
 
 const defaults = {
   globalPublicPath: "__webpack_public_path__",
@@ -445,7 +471,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,
@@ -944,6 +970,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) {
@@ -1040,7 +1078,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" }
+        }
+      }
+    }));
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dtwo/webpack-builder",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "repository": "d2js/dtwo",
   "license": "MIT",
   "type": "module",
@@ -15,20 +15,20 @@
   "dependencies": {
     "@babel/core": "7.20.12",
     "@d2js/friendly-errors-webpack-plugin": "2.5.2",
-    "@dtwo/kit": "3.1.1",
+    "@dtwo/kit": "3.2.0",
     "@dtwo/unplugin": "1.0.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",
+    "esbuild-loader": "3.0.0",
     "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.1",
     "kdu-loader": "17.0.0",
     "lodash-es": "4.17.21",
     "magic-string": "0.27.0",
@@ -54,18 +54,18 @@
     "webpackbar": "5.0.2"
   },
   "devDependencies": {
-    "@dtwo/schema": "3.1.1",
+    "@dtwo/schema": "3.2.0",
     "@types/lodash-es": "4.17.6",
     "@types/pify": "5.0.1",
     "@types/webpack-bundle-analyzer": "4.6.0",
     "@types/webpack-dev-middleware": "5.3.0",
     "@types/webpack-hot-middleware": "2.25.6",
     "@types/webpack-virtual-modules": "0.1.1",
-    "kdu": "3.2.45",
+    "kdu": "3.2.48",
     "unbuild": "1.1.1"
   },
   "peerDependencies": {
-    "kdu": "^3.2.45"
+    "kdu": "^3.2.47"
   },
   "engines": {
     "node": "^14.16.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"