@next-core/dev-dependencies 1.16.98 → 1.17.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="388" lines-covered="380" line-rate="0.9793000000000001" branches-valid="141" branches-covered="132" branch-rate="0.9361" timestamp="1684986930643" complexity="0" version="0.1">
+<coverage lines-valid="396" lines-covered="388" line-rate="0.9797" branches-valid="145" branches-covered="136" branch-rate="0.9379000000000001" timestamp="1685413336735" 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.9793000000000001" branch-rate="0.9361">
+    <package name="main" line-rate="0.9797" branch-rate="0.9379000000000001">
       <classes>
         <class name="addMocksForBrickIcons.js" filename="patches/addMocksForBrickIcons.js" line-rate="1" branch-rate="1">
           <methods>
@@ -812,6 +812,25 @@
             <line number="26" hits="1" branch="false"/>
           </lines>
         </class>
+        <class name="updateRenovateForV2.js" filename="patches/updateRenovateForV2.js" line-rate="1" branch-rate="1">
+          <methods>
+            <method name="updateRenovateForV2" 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="7" hits="2" branch="false"/>
+            <line number="9" hits="2" branch="false"/>
+            <line number="46" hits="2" branch="false"/>
+            <line number="49" hits="1" branch="false"/>
+          </lines>
+        </class>
         <class name="updateResolutions.js" filename="patches/updateResolutions.js" line-rate="1" branch-rate="1">
           <methods>
             <method name="updateResolutions" hits="4" signature="()V">

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.17.0](https://github.com/easyops-cn/next-core/compare/@next-core/dev-dependencies@1.16.99...@next-core/dev-dependencies@1.17.0) (2023-05-30)
+
+
+### Features
+
+* update renovate for v2: only enable @next-core/* and @next-libs/* ([062d719](https://github.com/easyops-cn/next-core/commit/062d719d2622a7652b80929f6453fc21da8a65ec))
+
+
+
+
+
+## [1.16.99](https://github.com/easyops-cn/next-core/compare/@next-core/dev-dependencies@1.16.98...@next-core/dev-dependencies@1.16.99) (2023-05-29)
+
+**Note:** Version bump only for package @next-core/dev-dependencies
+
+
+
+
+
 ## [1.16.98](https://github.com/easyops-cn/next-core/compare/@next-core/dev-dependencies@1.16.97...@next-core/dev-dependencies@1.16.98) (2023-05-25)
 
 **Note:** Version bump only for package @next-core/dev-dependencies

package/extract.js

@@ -131,22 +131,5 @@ module.exports = function extract() {
 
   writeJsonFile(rootPackageJsonPath, rootPackageJson);
 
-  // 同时更新 Renovate 配置，DLL 的依赖由 DLL 带动更新，不需要自动更新
-  const renovateJsonPath = path.resolve("renovate.json");
-  const renovateJson = readJson(renovateJsonPath);
-  if (renovateJson.enabled !== false) {
-    const disabledRule = renovateJson.packageRules.find(
-      (item) => item.enabled === false
-    );
-    const disabledPackageNames = new Set(disabledRule.matchPackageNames);
-
-    for (const pkg of toBeExtracted.keys()) {
-      disabledPackageNames.add(pkg);
-    }
-    disabledRule.matchPackageNames = Array.from(disabledPackageNames).sort();
-
-    writeJsonFile(renovateJsonPath, renovateJson);
-  }
-
   return patch();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/dev-dependencies",
-  "version": "1.16.98",
+  "version": "1.17.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,22 +21,22 @@
     "@babel/core": "^7.20.5",
     "@next-core/babel-preset-next": "^0.9.16",
     "@next-core/babel-preset-prismjs": "^1.0.19",
-    "@next-core/brick-container": "^2.86.20",
-    "@next-core/brick-dll": "^2.43.12",
+    "@next-core/brick-container": "^2.86.21",
+    "@next-core/brick-dll": "^2.43.13",
     "@next-core/brick-scripts": "^3.0.8",
     "@next-core/browserslist-config-next": "^0.1.4",
-    "@next-core/build-config-factory": "^2.25.15",
+    "@next-core/build-config-factory": "^2.25.16",
     "@next-core/build-next-libs": "^0.2.16",
     "@next-core/custom-antd-styles": "^1.25.22",
     "@next-core/eslint-config-next": "^1.0.40",
     "@next-core/jest-config-factory": "^0.4.13",
     "@next-core/rollup-config-factory": "^2.7.0",
     "@next-core/webpack-config-factory": "^2.22.0",
-    "@next-dll/ace": "^2.0.634",
+    "@next-dll/ace": "^2.0.635",
     "@next-dll/d3": "^2.0.79",
     "@next-dll/echarts": "^2.0.80",
-    "@next-dll/editor-bricks-helper": "^0.35.12",
-    "@next-dll/react-dnd": "^0.1.572",
+    "@next-dll/editor-bricks-helper": "^0.35.13",
+    "@next-dll/react-dnd": "^0.1.573",
     "@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": "ab2cf608e60a972dd71a136740a84d4687eb160e"
+  "gitHead": "c0926a724a764fceb55996e22d4f94cc1fdcf7bb"
 }

package/patch.js

@@ -28,6 +28,7 @@ const {
   migrateLazyBricksWithJest,
   onlyAutoMergePatchVersions,
   enableLernaWithNx,
+  updateRenovateForV2,
 } = require("./patches");
 
 function initAndGetDevDependenciesVersion() {
@@ -199,6 +200,10 @@ module.exports = async function patch() {
     enableLernaWithNx();
   }
 
+  if (semver.lt(currentRenewVersion, "1.17.0")) {
+    updateRenovateForV2();
+  }
+
   updateDevDependenciesVersion();
 };
 

package/patches/index.js

@@ -21,3 +21,4 @@ exports.removeRenovateLegacyBaseBranches = require("./removeRenovateLegacyBaseBr
 exports.migrateLazyBricksWithJest = require("./migrateLazyBricksWithJest");
 exports.onlyAutoMergePatchVersions = require("./onlyAutoMergePatchVersions");
 exports.enableLernaWithNx = require("./enableLernaWithNx");
+exports.updateRenovateForV2 = require("./updateRenovateForV2");

package/patches/updateRenovateForV2.js

@@ -0,0 +1,49 @@
+const path = require("path");
+const { readJson, writeJsonFile, readSelfJson } = require("../utils");
+
+function updateRenovateForV2() {
+  const selfJson = readSelfJson();
+  const renovateJsonPath = path.resolve("renovate.json");
+  const renovateJson = readJson(renovateJsonPath);
+
+  renovateJson.packageRules = [
+    {
+      excludePackagePatterns: ["^@next-core/", "^@next-libs/"],
+      enabled: false,
+    },
+    {
+      groupName: "next-core packages",
+      matchPackagePatterns: ["^@next-core/"],
+      matchUpdateTypes: ["minor", "patch"],
+      postUpgradeTasks:
+        selfJson.homepage && selfJson.homepage.includes("github.com")
+          ? undefined
+          : {
+              commands: [
+                "yarn renew",
+                "yarn extract",
+                "./node_modules/.bin/prettier --write package.json",
+                "yarn-deduplicate yarn.lock",
+                "yarn",
+              ],
+              fileFilters: [
+                "**/*",
+                ".gitignore",
+                ".gitlab/**/*",
+                ".huskyrc",
+                ".husky/.gitignore",
+                ".husky/**/*",
+              ],
+            },
+    },
+    {
+      groupName: "next-libs packages",
+      matchPackagePatterns: ["^@next-libs/"],
+      separateMajorMinor: false,
+    },
+  ];
+
+  writeJsonFile(renovateJsonPath, renovateJson);
+}
+
+module.exports = updateRenovateForV2;

package/patches/updateRenovateForV2.spec.js

@@ -0,0 +1,92 @@
+const updateRenovateForV2 = require("./updateRenovateForV2");
+const { writeJsonFile, readJson, readSelfJson } = require("../utils");
+
+jest.mock("../utils");
+
+describe("updateRenovateForV2", () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("should update v2 for repo on github", () => {
+    readSelfJson.mockReturnValueOnce({
+      homepage: "https://github.com/easyops-cn/next-basics",
+    });
+    readJson.mockReturnValueOnce({
+      extends: ["config:base"],
+      packageRules: [{}],
+    });
+    updateRenovateForV2();
+    expect(writeJsonFile).toBeCalledWith(
+      expect.stringContaining("renovate.json"),
+      {
+        extends: ["config:base"],
+        packageRules: [
+          {
+            excludePackagePatterns: ["^@next-core/", "^@next-libs/"],
+            enabled: false,
+          },
+          {
+            groupName: "next-core packages",
+            matchPackagePatterns: ["^@next-core/"],
+            matchUpdateTypes: ["minor", "patch"],
+          },
+          {
+            groupName: "next-libs packages",
+            matchPackagePatterns: ["^@next-libs/"],
+            separateMajorMinor: false,
+          },
+        ],
+      }
+    );
+  });
+
+  it("should update v2 for repo on gitlab", () => {
+    readSelfJson.mockReturnValueOnce({
+      homepage: "https://git.easyops.local/easyops-cn/next-basics",
+    });
+    readJson.mockReturnValueOnce({
+      extends: ["config:base"],
+    });
+    updateRenovateForV2();
+    expect(writeJsonFile).toBeCalledWith(
+      expect.stringContaining("renovate.json"),
+      {
+        extends: ["config:base"],
+        packageRules: [
+          {
+            excludePackagePatterns: ["^@next-core/", "^@next-libs/"],
+            enabled: false,
+          },
+          {
+            groupName: "next-core packages",
+            matchPackagePatterns: ["^@next-core/"],
+            matchUpdateTypes: ["minor", "patch"],
+            postUpgradeTasks: {
+              commands: [
+                "yarn renew",
+                "yarn extract",
+                "./node_modules/.bin/prettier --write package.json",
+                "yarn-deduplicate yarn.lock",
+                "yarn",
+              ],
+              fileFilters: [
+                "**/*",
+                ".gitignore",
+                ".gitlab/**/*",
+                ".huskyrc",
+                ".husky/.gitignore",
+                ".husky/**/*",
+              ],
+            },
+          },
+          {
+            groupName: "next-libs packages",
+            matchPackagePatterns: ["^@next-libs/"],
+            separateMajorMinor: false,
+          },
+        ],
+      }
+    );
+  });
+});