@next-core/build-next-bricks 1.19.1 → 1.20.1

package/bin/post-build-next-bricks.js

@@ -7,6 +7,7 @@ const bricksDir = path.join(process.cwd(), "bricks");
 
 try {
   const dirents = await readdir(bricksDir, { withFileTypes: true });
+  let count = 0;
 
   await Promise.all(
     dirents.map(async (item) => {
@@ -24,8 +25,12 @@ try {
       // Resume backed-up package.json.
       await copyFile(packageJsonBakPath, packageJsonPath);
       await rm(packageJsonBakPath);
+
+      count++;
     })
   );
+
+  console.log("Resumed peerDependencies for %d brick packages", count);
 } catch (e) {
   console.error(e);
   process.exitCode = 1;

package/bin/pre-build-next-bricks.js

@@ -8,8 +8,11 @@ const bricksDir = path.join(process.cwd(), "bricks");
 
 const matchBrickPackages = (key) => /^@(?:next-)?bricks\//.test(key);
 
+// Before build bricks, remove peerDependencies from brick packages.
+// `build:main` doesn't depend on peerDependencies, while `build:types` does.
 try {
   const dirents = await readdir(bricksDir, { withFileTypes: true });
+  let count = 0;
 
   await Promise.all(
     dirents.map(async (item) => {
@@ -27,29 +30,6 @@ try {
 
       const dependencies = packageJson.dependencies || {};
       const devDependencies = packageJson.devDependencies || {};
-      const peerDependencies = packageJson.peerDependencies || {};
-
-      // If error was thrown when building, thus pre-build was performed but post-build wasn't,
-      // so we handle this situation: remove deps that is copied when pre-building.
-      let changed = false;
-      for (const [dep, version] of Object.entries(peerDependencies)) {
-        if (dependencies[dep] === version) {
-          delete dependencies[dep];
-          changed = true;
-        }
-        if (devDependencies[dep] === version) {
-          delete devDependencies[dep];
-          changed = true;
-        }
-      }
-      if (changed) {
-        await writeFile(
-          packageJsonPath,
-          await prettier.format(JSON.stringify(packageJson, null, 2), {
-            filepath: packageJsonPath,
-          })
-        );
-      }
 
       // If there were still "@next-bricks/*" in dependencies or devDependencies,
       // throw an error. Should put them into peerDependencies.
@@ -89,11 +69,8 @@ try {
       // Make a copy as backup file.
       await copyFile(packageJsonPath, packageJsonBakPath);
 
-      // Copy "@next-bricks/*" from peerDependencies to devDependencies.
-      const devDependencies = (packageJson.devDependencies ??= {});
-      for (const dep of bricksPeerDependencies) {
-        devDependencies[dep] = peerDependencies[dep];
-      }
+      // Remove peerDependencies.
+      delete packageJson.peerDependencies;
 
       await writeFile(
         packageJsonPath,
@@ -101,8 +78,11 @@ try {
           filepath: packageJsonPath,
         })
       );
+      count++;
     })
   );
+
+  console.log("Removed peerDependencies from %d brick packages", count);
 } catch (e) {
   console.error(e);
   process.exitCode = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/build-next-bricks",
-  "version": "1.19.1",
+  "version": "1.20.1",
   "description": "Build next bricks",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/build-next-bricks",
   "license": "GPL-3.0",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@babel/parser": "^7.23.6",
-    "@babel/traverse": "^7.23.6",
+    "@babel/traverse": "^7.23.7",
     "@svgr/webpack": "^8.1.0",
     "babel-loader": "^9.1.3",
     "css-loader": "^6.8.1",
@@ -42,11 +42,11 @@
     "cssnano-preset-lite": "^3.0.1",
     "doctrine": "^3.0.0",
     "less": "^4.2.0",
-    "less-loader": "^11.1.3",
+    "less-loader": "^11.1.4",
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.32",
-    "postcss-loader": "^7.3.3",
+    "postcss-loader": "^7.3.4",
     "postcss-preset-env": "^9.3.0",
     "prettier": "^3.1.1",
     "style-loader": "^3.3.3",
@@ -56,5 +56,5 @@
   "devDependencies": {
     "@next-core/brick-manifest": "^0.7.0"
   },
-  "gitHead": "3afa7646518446a100c13c41a9c9100f62df66ff"
+  "gitHead": "96d0d0c04b0b2298b96508e12e9cb69396268b76"
 }