@next-core/build-next-bricks 1.23.8 → 1.23.9

package/bin/build-next-bricks.js

@@ -83,6 +83,7 @@ try {
           console.error("Failed to build bricks:");
           console.error(err || stats.toString());
         } else {
+          console.log(stats.toString());
           console.log("Build bricks done in watch mode");
         }
       });
@@ -93,6 +94,7 @@ try {
             console.error("Failed to build bricks:");
             reject(err || stats.toString());
           } else {
+            console.log(stats.toString());
             resolve();
           }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/build-next-bricks",
-  "version": "1.23.8",
+  "version": "1.23.9",
   "description": "Build next bricks",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/build-next-bricks",
   "license": "GPL-3.0",
@@ -34,9 +34,9 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@babel/parser": "^7.25.6",
-    "@babel/traverse": "^7.25.6",
-    "@next-core/babel-preset-next": "^1.0.23",
+    "@babel/parser": "^7.26.5",
+    "@babel/traverse": "^7.26.5",
+    "@next-core/babel-preset-next": "^1.0.24",
     "@svgr/webpack": "^8.1.0",
     "babel-loader": "^9.2.1",
     "css-loader": "^7.1.2",
@@ -46,17 +46,20 @@
     "less": "^4.2.0",
     "less-loader": "^12.2.0",
     "lodash": "^4.17.21",
-    "mini-css-extract-plugin": "^2.9.1",
-    "postcss": "^8.4.47",
+    "mini-css-extract-plugin": "^2.9.2",
+    "postcss": "^8.4.49",
     "postcss-loader": "^8.1.1",
-    "postcss-preset-env": "^10.0.5",
-    "prettier": "^3.3.3",
+    "postcss-preset-env": "^10.1.3",
+    "prettier": "^3.4.2",
     "style-loader": "^4.0.0",
-    "typescript": "^5.6.2",
-    "webpack": "^5.94.0"
+    "typescript": "^5.7.3",
+    "webpack": "^5.97.1"
   },
   "devDependencies": {
     "@next-core/brick-manifest": "^0.7.1"
   },
-  "gitHead": "74a5372d7b667fa7d36c9a0c00db523f858e4dd0"
+  "peerDependencies": {
+    "@next-shared/common-bricks": "*"
+  },
+  "gitHead": "4ccb83083fe769561c5411d385628164c9519099"
 }

package/src/build.js

@@ -1,5 +1,4 @@
 import path from "node:path";
-import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import webpack from "webpack";
@@ -8,6 +7,8 @@ import postcssPresetEnv from "postcss-preset-env";
 import cssnano from "cssnano";
 import cssnanoPresetLite from "cssnano-preset-lite";
 import _ from "lodash";
+import commonBricksJson from "@next-shared/common-bricks/common-bricks.json" assert { type: "json" };
+import deprecatedBricksJson from "@next-shared/common-bricks/deprecated-bricks.json" assert { type: "json" };
 import EmitBricksJsonPlugin from "./EmitBricksJsonPlugin.js";
 import getCamelPackageName from "./getCamelPackageName.js";
 import getSvgrLoaders from "./getSvgrLoaders.js";
@@ -74,25 +75,8 @@ async function getWebpackConfig(config) {
 
   /** @type {string[]} */
   let commonBricks;
-  const commonBricksJsonFile = path.join(
-    packageDir,
-    "../../shared/common-bricks/common-bricks.json"
-  );
-
-  const deprecatedBricksJsonFile = path.join(
-    packageDir,
-    "../../shared/common-bricks/deprecated-bricks.json"
-  );
-
-  const deprecatedBricksJson = existsSync(deprecatedBricksJsonFile)
-    ? JSON.parse(await readFile(deprecatedBricksJsonFile, "utf-8"))
-    : {};
-
-  if (existsSync(commonBricksJsonFile)) {
-    const commonBricksJson = JSON.parse(
-      await readFile(commonBricksJsonFile, "utf-8")
-    );
 
+  if (commonBricksJson) {
     /** @type {Map<string, string | string[]>} */
     const commonBricksMap = new Map();
     for (const [pkg, bricks] of Object.entries(commonBricksJson)) {
@@ -213,18 +197,21 @@ async function getWebpackConfig(config) {
                   packageJson.peerDependencies?.[dep] ??
                   packageJson.devDependencies?.[dep] ??
                   packageJson.dependencies?.[dep];
+                const singleton = sharedSingletonPackages.includes(dep);
 
                 return [
                   dep,
                   {
-                    singleton: sharedSingletonPackages.includes(dep),
+                    singleton,
                     version: depPackageJson.version,
                     requiredVersion:
                       getRequiredVersion(depPkgName) ??
                       // Use react required version for react-dom if it is not specified
                       (depPkgName === "react-dom"
                         ? getRequiredVersion("react")
-                        : undefined),
+                        : singleton
+                          ? "*"
+                          : undefined),
                     ...customized,
                   },
                 ];
@@ -265,7 +252,7 @@ async function getWebpackConfig(config) {
   const invalidElements = _.difference(elements, commonBricks);
   if (invalidElements.length > 0) {
     throw new Error(
-      `Find common bricks in \`${packageName}\` which are not in common-bricks.json: ${invalidElements.join(
+      `Find common bricks in \`${packageName}\` which are not in @next-shared/common-bricks/common-bricks.json: ${invalidElements.join(
         ", "
       )}`
     );