@next-core/build-next-bricks 1.17.0 → 1.18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/build-next-bricks",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "Build next bricks",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/build-next-bricks",
   "license": "GPL-3.0",
@@ -56,5 +56,5 @@
   "devDependencies": {
     "@next-core/brick-manifest": "^0.7.0"
   },
-  "gitHead": "2c3c1d439c78a3d6d3c2daeb14ac5f6ac1749951"
+  "gitHead": "48ac4bbeff115c782d19fcfce56c3a093d565438"
 }

package/src/EmitBricksJsonPlugin.js

@@ -19,6 +19,7 @@ export default class EmitBricksJsonPlugin {
     this.manifest = options.manifest;
     this.types = options.types;
     this.examples = options.examples;
+    this.deprecatedElements = options.deprecatedElements;
   }
 
   /**
@@ -57,6 +58,7 @@ export default class EmitBricksJsonPlugin {
               processors: this.processors,
               dependencies: this.dependencies,
               filePath: jsFilePath,
+              deprecatedElements: this.deprecatedElements,
             },
             null,
             2
@@ -89,6 +91,7 @@ export default class EmitBricksJsonPlugin {
           console.log("Defined elements:", this.elements);
           console.log("Defined processors:", this.processors);
           console.log("Found dependencies:", this.dependencies);
+          console.log("Found deprecated elements:", this.deprecatedElements);
           callback();
         }
       );

package/src/build.js

@@ -83,20 +83,53 @@ async function getWebpackConfig(config) {
     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")
     );
 
-    /** @type {Set<string, string>} */
+    /** @type {Map<string, string | string[]>} */
     const commonBricksMap = new Map();
     for (const [pkg, bricks] of Object.entries(commonBricksJson)) {
       for (const brick of bricks) {
         const existedPkg = commonBricksMap.get(brick);
         if (existedPkg && existedPkg !== pkg) {
-          throw new Error(
-            `Conflicted common brick: "${brick}" in package "${existedPkg}" and "${pkg}"`
-          );
+          if (Array.isArray(existedPkg)) {
+            const pkgs = existedPkg.concat(pkg);
+
+            const othersPkgs = pkgs.filter(
+              (p) => !deprecatedBricksJson[p]?.includes(brick)
+            );
+
+            throw new Error(
+              `Conflicted common brick: "${brick}" in package "${othersPkgs[0]}" and "${othersPkgs[1]}"`
+            );
+          } else {
+            const existedPkgDeprecated = deprecatedBricksJson[existedPkg];
+            const pkgDeprecated = deprecatedBricksJson[pkg];
+
+            if (
+              (existedPkgDeprecated && existedPkgDeprecated.includes(brick)) ||
+              (pkgDeprecated && pkgDeprecated.includes(brick))
+            ) {
+              commonBricksMap.set(brick, [pkg].concat(existedPkg));
+              continue;
+            }
+
+            throw new Error(
+              `Conflicted common brick: "${brick}" in package "${existedPkg}" and "${pkg}"`
+            );
+          }
         }
         commonBricksMap.set(brick, pkg);
       }
@@ -470,6 +503,12 @@ async function getWebpackConfig(config) {
               manifest: config.manifest,
               types: config.types,
               examples: config.examples,
+              deprecatedElements: Object.prototype.hasOwnProperty.call(
+                deprecatedBricksJson,
+                packageName
+              )
+                ? deprecatedBricksJson[packageName]
+                : undefined,
             }),
           ]
         : []),