@dtwo/webpack-builder 3.0.0-rc.14 → 3.1.0-0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 - Dtwo Project
+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

package/README.md

@@ -1,3 +1,7 @@
-# Dtwo Webpack Builder
+# Dtwo
 
-> The [Webpack](https://webpack.js.org) bundler for Dtwo 3
+Dtwo 3: **The Intuitive Web Framework** ✨
+
+## License
+
+[MIT](./LICENSE)

package/dist/index.mjs

@@ -308,6 +308,7 @@ function basePlugins(ctx) {
         clearConsole: false,
         reporter: "consola",
         logLevel: "ERROR"
+        // TODO
       })
     );
   }
@@ -323,11 +324,13 @@ function basePlugins(ctx) {
       reporters: ["stats"],
       stats: !ctx.isDev,
       reporter: {
+        // @ts-ignore
         change: (_, { shortPath }) => {
           if (!ctx.isServer) {
             dtwo.callHook("webpack:change", shortPath);
           }
         },
+        // @ts-ignore
         done: ({ state }) => {
           if (state.hasErrors) {
             dtwo.callHook("webpack:error");
@@ -338,6 +341,7 @@ function basePlugins(ctx) {
         allDone: () => {
           dtwo.callHook("webpack:done");
         },
+        // @ts-ignore
         progress({ statesArray }) {
           dtwo.callHook("webpack:progress", statesArray);
         }
@@ -377,12 +381,16 @@ function baseTranspile(ctx) {
   const { options } = ctx;
   const transpile = [
     /\.kdu\.js/i,
+    // include SFCs in node_modules
     /consola\/src/,
     /kdu-demi/
   ];
   for (let pattern of options.build.transpile) {
     if (typeof pattern === "function") {
-      pattern = pattern(ctx);
+      const result = pattern(ctx);
+      if (result) {
+        pattern = result;
+      }
     }
     if (typeof pattern === "string") {
       transpile.push(new RegExp(escapeRegExp(normalize(pattern))));
@@ -410,6 +418,7 @@ function getOutput(ctx) {
 function getWarningIgnoreFilter(ctx) {
   const { options } = ctx;
   const filters = [
+    // Hide warnings about plugins without a default export (#1179)
     (warn) => warn.name === "ModuleDependencyWarning" && warn.message.includes("export 'default'") && warn.message.includes("dtwo_plugin_"),
     ...options.webpack.warningIgnoreFilters || []
   ];
@@ -508,7 +517,9 @@ class KduSSRClientPlugin {
         all: allFiles,
         initial: initialFiles,
         async: asyncFiles,
-        modules: {},
+        modules: {
+          /* [identifier: string]: Array<index: number> */
+        },
         assetsMapping
       };
       const { entrypoints = {}, namedChunkGroups = {} } = stats;
@@ -545,7 +556,7 @@ class KduSSRClientPlugin {
           }
           assetModules.forEach((m2) => {
             if (m2.chunks.includes(cid)) {
-              files.push.apply(files, m2.assets.map(fileToIndex));
+              files.push(...m2.assets.map(fileToIndex));
             }
           });
         }
@@ -704,6 +715,7 @@ const getPostcssConfig = (dtwo) => {
     return {
       sourceMap: dtwo.options.webpack.cssSourceMap,
       plugins: dtwo.options.postcss.plugins,
+      // Array, String or Function
       order: "autoprefixerAndCssnanoLast"
     };
   }
@@ -731,15 +743,6 @@ const getPostcssConfig = (dtwo) => {
   if (!dtwo.options.webpack.postcss || !dtwo.options.postcss) {
     return false;
   }
-  const configFile = dtwo.options.postcss.config;
-  if (configFile) {
-    return {
-      postcssOptions: {
-        config: configFile
-      },
-      sourceMap: dtwo.options.webpack.cssSourceMap
-    };
-  }
   let postcssOptions = cloneDeep(dtwo.options.postcss);
   if (isPureObject(postcssOptions)) {
     if (Array.isArray(postcssOptions.plugins)) {
@@ -750,6 +753,7 @@ const getPostcssConfig = (dtwo) => {
     }
     delete dtwo.options.webpack.postcss.order;
     return {
+      // @ts-expect-error
       sourceMap: dtwo.options.webpack.cssSourceMap,
       ...dtwo.options.webpack.postcss,
       postcssOptions
@@ -807,10 +811,12 @@ function createdStyleRule(lang, test, processorLoader, ctx) {
   return {
     test,
     oneOf: [
+      // This matches <style module>
       {
         resourceQuery: /module/,
         use: cssModuleLoaders.concat(styleLoaders)
       },
+      // This matches plain <style> or <style scoped>
       {
         use: cssLoaders.concat(styleLoaders)
       }
@@ -835,6 +841,10 @@ function createCssLoadersRule(ctx, cssLoaderOptions) {
     ];
   }
   return [
+    // {
+    //   loader: 'kdu-style-loader',
+    //   options: options.webpack.loaders.kduStyle
+    // },
     cssLoader
   ];
 }
@@ -912,6 +922,7 @@ function clientHMR(ctx) {
   const hotMiddlewareClientOptionsStr = querystring.stringify(hotMiddlewareClientOptions);
   const app = config.entry.app;
   app.unshift(
+    // https://github.com/glenjamin/webpack-hot-middleware#config
     `webpack-hot-middleware/client?${hotMiddlewareClientOptionsStr}`
   );
   config.plugins = config.plugins || [];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dtwo/webpack-builder",
-  "version": "3.0.0-rc.14",
-  "repository": "d2js/framework",
+  "version": "3.1.0-0",
+  "repository": "d2js/dtwo",
   "license": "MIT",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -13,56 +13,56 @@
     "dist"
   ],
   "dependencies": {
-    "@babel/core": "^7.20.2",
-    "@d2js/friendly-errors-webpack-plugin": "^2.5.2",
-    "@dtwo/kit": "3.0.0-rc.14",
-    "@dtwo/unplugin": "^1.0.0",
-    "autoprefixer": "^10.4.13",
-    "css-loader": "^6.7.2",
-    "css-minimizer-webpack-plugin": "^4.2.2",
-    "cssnano": "^5.1.14",
-    "esbuild-loader": "^2.20.0",
-    "escape-string-regexp": "^5.0.0",
-    "estree-walker": "^3.0.1",
-    "file-loader": "^6.2.0",
-    "fork-ts-checker-webpack-plugin": "^7.2.13",
-    "fs-extra": "^10.1.0",
-    "hash-sum": "^2.0.0",
-    "kdu-bundle-renderer": "^1.0.0",
-    "kdu-loader": "^17.0.0",
-    "lodash-es": "^4.17.21",
-    "magic-string": "^0.26.7",
-    "memfs": "^3.4.11",
-    "mini-css-extract-plugin": "^2.6.1",
-    "mlly": "^1.0.0",
-    "ohash": "^1.0.0",
-    "pathe": "^1.0.0",
-    "pify": "^6.1.0",
-    "postcss": "^8.4.19",
-    "postcss-import": "^15.0.0",
-    "postcss-loader": "^7.0.1",
-    "postcss-url": "^10.1.3",
-    "style-resources-loader": "^1.5.0",
-    "time-fix-plugin": "^2.0.7",
-    "ufo": "^1.0.0",
-    "url-loader": "^4.1.1",
-    "webpack": "^5.75.0",
-    "webpack-bundle-analyzer": "^4.7.0",
-    "webpack-dev-middleware": "^5.3.3",
-    "webpack-hot-middleware": "^2.25.3",
-    "webpack-virtual-modules": "^0.4.6",
-    "webpackbar": "^5.0.2"
+    "@babel/core": "7.20.12",
+    "@d2js/friendly-errors-webpack-plugin": "2.5.2",
+    "@dtwo/kit": "3.1.0-0",
+    "@dtwo/unplugin": "1.0.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",
+    "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-loader": "17.0.0",
+    "lodash-es": "4.17.21",
+    "magic-string": "0.27.0",
+    "memfs": "3.4.13",
+    "mini-css-extract-plugin": "2.7.2",
+    "mlly": "1.1.0",
+    "ohash": "1.0.0",
+    "pathe": "1.0.0",
+    "pify": "6.1.0",
+    "postcss": "8.4.21",
+    "postcss-import": "15.1.0",
+    "postcss-loader": "7.0.2",
+    "postcss-url": "10.1.3",
+    "style-resources-loader": "1.5.0",
+    "time-fix-plugin": "2.0.7",
+    "ufo": "1.0.1",
+    "url-loader": "4.1.1",
+    "webpack": "5.75.0",
+    "webpack-bundle-analyzer": "4.7.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.0.0-rc.14",
-    "@types/lodash-es": "^4.17.6",
-    "@types/pify": "^5.0.1",
-    "@types/webpack-bundle-analyzer": "^4.6.0",
-    "@types/webpack-dev-middleware": "^5.0.2",
-    "@types/webpack-hot-middleware": "^2.25.6",
-    "@types/webpack-virtual-modules": "^0",
+    "@dtwo/schema": "3.1.0-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",
-    "unbuild": "latest"
+    "unbuild": "1.1.1"
   },
   "peerDependencies": {
     "kdu": "^3.2.45"