@next-core/dev-dependencies 1.17.135 → 1.18.0

package/.coverage/cobertura-coverage.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" ?>
 <!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
-<coverage lines-valid="396" lines-covered="388" line-rate="0.9797" branches-valid="145" branches-covered="136" branch-rate="0.9379000000000001" timestamp="1706515097845" complexity="0" version="0.1">
+<coverage lines-valid="404" lines-covered="396" line-rate="0.9801000000000001" branches-valid="149" branches-covered="140" branch-rate="0.9395" timestamp="1707029901595" complexity="0" version="0.1">
   <sources>
     <source>/home/runner/work/next-core/next-core/packages/dev-dependencies</source>
   </sources>
   <packages>
-    <package name="main" line-rate="0.9797" branch-rate="0.9379000000000001">
+    <package name="main" line-rate="0.9801000000000001" branch-rate="0.9395">
       <classes>
         <class name="addMocksForBrickIcons.js" filename="patches/addMocksForBrickIcons.js" line-rate="1" branch-rate="1">
           <methods>
@@ -827,8 +827,27 @@
             <line number="6" hits="2" branch="false"/>
             <line number="7" hits="2" branch="false"/>
             <line number="9" hits="2" branch="false"/>
-            <line number="51" hits="2" branch="false"/>
-            <line number="54" hits="1" branch="false"/>
+            <line number="52" hits="2" branch="false"/>
+            <line number="55" hits="1" branch="false"/>
+          </lines>
+        </class>
+        <class name="updateRenovatePostExecutionMode.js" filename="patches/updateRenovatePostExecutionMode.js" line-rate="1" branch-rate="1">
+          <methods>
+            <method name="updateRenovatePostExecutionMode" hits="2" signature="()V">
+              <lines>
+                <line number="4" hits="2"/>
+              </lines>
+            </method>
+          </methods>
+          <lines>
+            <line number="1" hits="1" branch="false"/>
+            <line number="2" hits="1" branch="false"/>
+            <line number="5" hits="2" branch="false"/>
+            <line number="6" hits="2" branch="false"/>
+            <line number="8" hits="2" branch="true" condition-coverage="100% (2/2)"/>
+            <line number="12" hits="1" branch="false"/>
+            <line number="13" hits="1" branch="false"/>
+            <line number="17" hits="1" branch="false"/>
           </lines>
         </class>
         <class name="updateResolutions.js" filename="patches/updateResolutions.js" line-rate="1" branch-rate="1">

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.18.0](https://github.com/easyops-cn/next-core/compare/@next-core/dev-dependencies@1.17.136...@next-core/dev-dependencies@1.18.0) (2024-02-04)
+
+
+### Features
+
+* patch renovate post execution mode ([8eef82c](https://github.com/easyops-cn/next-core/commit/8eef82ce69326521f87dc1ac36ba9d490c64ed33))
+
+
+
+
+
+## [1.17.136](https://github.com/easyops-cn/next-core/compare/@next-core/dev-dependencies@1.17.135...@next-core/dev-dependencies@1.17.136) (2024-01-31)
+
+
+### Bug Fixes
+
+* handle errors when running yarn info ([e98cfa1](https://github.com/easyops-cn/next-core/commit/e98cfa195ff58c35ced36088da4e0830586fa965))
+
+
+
+
+
 ## [1.17.135](https://github.com/easyops-cn/next-core/compare/@next-core/dev-dependencies@1.17.134...@next-core/dev-dependencies@1.17.135) (2024-01-29)
 
 **Note:** Version bump only for package @next-core/dev-dependencies

package/index.js

@@ -29,14 +29,23 @@ function updateSelf() {
     const currentRange = rootPackageJson.devDependencies[selfPackageName];
     if (currentRange) {
       // https://classic.yarnpkg.com/en/docs/cli/info
-      const versions = JSON.parse(
-        execa.sync("yarn", ["info", selfPackageName, "versions", "--json"])
-          .stdout
-      ).data;
-      tag = `@^${semver.maxSatisfying(
-        versions,
-        currentRange.startsWith("^0.") ? "< 1" : currentRange
-      )}`;
+      const result = execa.sync("yarn", [
+        "info",
+        selfPackageName,
+        "versions",
+        "--json",
+      ]);
+      const content = result.stdout;
+      if (content) {
+        const versions = JSON.parse(content).data;
+        tag = `@^${semver.maxSatisfying(
+          versions,
+          currentRange.startsWith("^0.") ? "< 1" : currentRange
+        )}`;
+      } else {
+        console.error("yarn info failed:", result.stderr);
+        tag = currentRange.startsWith("^0.") ? "@0.x" : "@latest";
+      }
     }
   }
   console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/dev-dependencies",
-  "version": "1.17.135",
+  "version": "1.18.0",
   "description": "Dev dependencies for brick-next related packages",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/dev-dependencies",
   "license": "GPL-3.0",
@@ -21,8 +21,8 @@
     "@babel/core": "^7.20.5",
     "@next-core/babel-preset-next": "^0.9.16",
     "@next-core/babel-preset-prismjs": "^1.0.20",
-    "@next-core/brick-container": "^2.92.22",
-    "@next-core/brick-dll": "^2.46.4",
+    "@next-core/brick-container": "^2.92.23",
+    "@next-core/brick-dll": "^2.46.5",
     "@next-core/brick-scripts": "^3.0.8",
     "@next-core/browserslist-config-next": "^0.1.4",
     "@next-core/build-config-factory": "^2.25.40",
@@ -32,11 +32,11 @@
     "@next-core/jest-config-factory": "^0.4.14",
     "@next-core/rollup-config-factory": "^2.7.0",
     "@next-core/webpack-config-factory": "^2.23.0",
-    "@next-dll/ace": "^2.0.727",
+    "@next-dll/ace": "^2.0.728",
     "@next-dll/d3": "^2.0.80",
     "@next-dll/echarts": "^2.0.81",
-    "@next-dll/editor-bricks-helper": "^0.38.72",
-    "@next-dll/react-dnd": "^0.1.665",
+    "@next-dll/editor-bricks-helper": "^0.38.73",
+    "@next-dll/react-dnd": "^0.1.666",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.1.5",
     "@typescript-eslint/eslint-plugin": "^5.46.0",
@@ -85,5 +85,5 @@
     "enzyme": "^3.11.0",
     "lolex": "^5.1.2"
   },
-  "gitHead": "c395c83985e936ef8f7062047d84c8f06159b828"
+  "gitHead": "20692d56791c30d947f72f04fc51084659f9daa4"
 }

package/patch.js

@@ -29,6 +29,7 @@ const {
   onlyAutoMergePatchVersions,
   enableLernaWithNx,
   updateRenovateForV2,
+  updateRenovatePostExecutionMode,
 } = require("./patches");
 
 function initAndGetDevDependenciesVersion() {
@@ -204,6 +205,10 @@ module.exports = async function patch() {
     updateRenovateForV2();
   }
 
+  if (semver.lt(currentRenewVersion, "1.18.0")) {
+    updateRenovatePostExecutionMode();
+  }
+
   updateDevDependenciesVersion();
 };
 

package/patches/index.js

@@ -22,3 +22,4 @@ exports.migrateLazyBricksWithJest = require("./migrateLazyBricksWithJest");
 exports.onlyAutoMergePatchVersions = require("./onlyAutoMergePatchVersions");
 exports.enableLernaWithNx = require("./enableLernaWithNx");
 exports.updateRenovateForV2 = require("./updateRenovateForV2");
+exports.updateRenovatePostExecutionMode = require("./updateRenovatePostExecutionMode");

package/patches/updateRenovateForV2.js

@@ -31,6 +31,7 @@ function updateRenovateForV2() {
                 "yarn-deduplicate yarn.lock",
                 "yarn",
               ],
+              executionMode: "branch",
               fileFilters: [
                 "**/*",
                 ".gitignore",

package/patches/updateRenovateForV2.spec.js

@@ -80,6 +80,7 @@ describe("updateRenovateForV2", () => {
                 "yarn-deduplicate yarn.lock",
                 "yarn",
               ],
+              executionMode: "branch",
               fileFilters: [
                 "**/*",
                 ".gitignore",

package/patches/updateRenovatePostExecutionMode.js

@@ -0,0 +1,17 @@
+const path = require("path");
+const { readJson, writeJsonFile } = require("../utils");
+
+function updateRenovatePostExecutionMode() {
+  const renovateJsonPath = path.resolve("renovate.json");
+  const renovateJson = readJson(renovateJsonPath);
+
+  if (
+    renovateJson.postUpgradeTasks &&
+    renovateJson.postUpgradeTasks.executionMode !== "branch"
+  ) {
+    renovateJson.postUpgradeTasks.executionMode = "branch";
+    writeJsonFile(renovateJsonPath, renovateJson);
+  }
+}
+
+module.exports = updateRenovatePostExecutionMode;

package/patches/updateRenovatePostExecutionMode.spec.js

@@ -0,0 +1,40 @@
+const updateRenovatePostExecutionMode = require("./updateRenovatePostExecutionMode");
+const { writeJsonFile, readJson } = require("../utils");
+
+jest.mock("../utils");
+
+describe("updateRenovatePostExecutionMode", () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("should ignore if no postUpgradeTasks", () => {
+    readJson.mockReturnValueOnce({
+      packageRules: [
+        {
+          groupName: "next-core packages",
+        },
+      ],
+    });
+    updateRenovatePostExecutionMode();
+    expect(writeJsonFile).not.toBeCalled();
+  });
+
+  it("should update fileFilters", () => {
+    readJson.mockReturnValueOnce({
+      postUpgradeTasks: {
+        commands: ["yarn renew"],
+      },
+    });
+    updateRenovatePostExecutionMode();
+    expect(writeJsonFile).toBeCalledWith(
+      expect.stringContaining("renovate.json"),
+      {
+        postUpgradeTasks: {
+          commands: ["yarn renew"],
+          executionMode: "branch",
+        },
+      }
+    );
+  });
+});