Merge branch 'main' into v1

Author: GitHub Actions

.eslintrc.cjs

@@ -0,0 +1,53 @@
+module.exports = {
+  env: {
+    es2021: true,
+    node: true,
+  },
+  extends: ['eslint:recommended', 'prettier'],
+  overrides: [],
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+  },
+  rules: {
+    // overrides
+    'no-unused-vars': ['error', { ignoreRestSiblings: true }],
+
+    // important
+    'no-shadow': 'error',
+
+    // possible errors
+    eqeqeq: 'error',
+    'no-constant-binary-expression': 'error',
+    'no-duplicate-imports': 'error',
+    'no-return-assign': 'error',
+    'no-sequences': 'error',
+
+    // preference/style
+    'no-else-return': 'error',
+    'no-return-await': 'error',
+    'no-var': 'error',
+    'require-await': 'error',
+    'spaced-comment': ['error', 'always'],
+
+    // not needed with typescript checking, copied from https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/src/configs/eslint-recommended.ts
+    // (this repo currently doesn't use typescript-eslint)
+    'constructor-super': 'off', // ts(2335) & ts(2377)
+    'getter-return': 'off', // ts(2378)
+    'no-const-assign': 'off', // ts(2588)
+    'no-dupe-args': 'off', // ts(2300)
+    'no-dupe-class-members': 'off', // ts(2393) & ts(2300)
+    'no-dupe-keys': 'off', // ts(1117)
+    'no-func-assign': 'off', // ts(2539)
+    'no-import-assign': 'off', // ts(2539) & ts(2540)
+    'no-new-symbol': 'off', // ts(7009)
+    'no-obj-calls': 'off', // ts(2349)
+    'no-redeclare': 'off', // ts(2451)
+    'no-setter-return': 'off', // ts(2408)
+    'no-this-before-super': 'off', // ts(2376)
+    'no-undef': 'off', // ts(2304)
+    'no-unreachable': 'off', // ts(7027)
+    'no-unsafe-negation': 'off', // ts(2365) & ts(2360) & ts(2358)
+    'valid-typeof': 'off', // ts(2367)
+  },
+};

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @ecraig12345

.github/renovate.json5

@@ -1,10 +1,8 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "github>microsoft/m365-renovate-config:automergeTypes",
     "github>microsoft/m365-renovate-config:libraryRecommended",
-    "github>microsoft/m365-renovate-config:keepFresh",
-    "github>microsoft/m365-renovate-config:scheduleNoisy"
+    "github>microsoft/m365-renovate-config:keepFresh"
   ],
 
   "ignorePresets": [
@@ -18,16 +16,31 @@
 
   "lockFileMaintenance": {
     "automerge": true,
-    "platformAutomerge": true
+    "platformAutomerge": true,
+    "semanticCommitType": "build"
   },
 
-  "assignees": ["ecraig12345"],
+  "pin": {
+    "enabled": false
+  },
+  "rangeStrategy": "update-lockfile",
 
   "packageRules": [
     {
       // Use "build" for all dep updates because they don't actually affect the configs
       "matchPackagePatterns": ["*"],
       "semanticCommitType": "build"
+    },
+    {
+      // Group updates of all deps except Renovate.
+      "groupName": "devDependencies",
+      "matchPackagePatterns": ["*"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "excludeDepNames": ["renovate"]
+    },
+    {
+      "matchPackageNames": ["renovate"],
+      "schedule": ["before 5am on the 8th and 22nd day of the month"]
     }
   ]
 }

.github/workflows/ci.yml

@@ -9,6 +9,7 @@ on:
 
 concurrency:
   group: ${{ github.ref }}-ci
+  cancel-in-progress: true
 
 jobs:
   ci:
@@ -26,6 +27,9 @@ jobs:
 
       - run: yarn --frozen-lockfile
 
+      - name: Check formatting
+        run: yarn format:check
+
       - name: Type check scripts
         run: yarn build
 

README.md

@@ -789,9 +789,9 @@ Auto-merge minor and patch updates to `devDependencies` and lock file maintenanc
       "matchUpdateTypes": ["minor", "patch"],
       "automerge": true,
       "platformAutomerge": true,
-      "stabilityDays": 2,
       "internalChecksFilter": "strict",
-      "excludePackageNames": ["typescript"]
+      "excludePackageNames": ["typescript"],
+      "minimumReleaseAge": "2 days"
     }
   ]
 }
@@ -948,10 +948,6 @@ Update "noisy" (frequently-updating) packages once every other week.
 ```json
 {
   "packageRules": [
-    {
-      "matchPackageNames": ["renovate"],
-      "schedule": ["before 5am on the 8th and 22nd day of the month"]
-    },
     {
       "matchPackagePrefixes": ["@microsoft/api-extractor"],
       "schedule": ["before 5am on the 8th and 22nd day of the month"]

automergeDevLock.json

@@ -14,9 +14,9 @@
       "matchUpdateTypes": ["minor", "patch"],
       "automerge": true,
       "platformAutomerge": true,
-      "stabilityDays": 2,
       "internalChecksFilter": "strict",
-      "excludePackageNames": ["typescript"]
+      "excludePackageNames": ["typescript"],
+      "minimumReleaseAge": "2 days"
     }
   ]
 }

package.json

@@ -8,11 +8,12 @@
     "url": "https://github.com/microsoft/m365-renovate-config.git"
   },
   "scripts": {
-    "build": "tsc -p jsconfig.json",
+    "build": "tsc",
     "check-token": "node ./scripts/checkToken.js",
     "fix-repo-refs": "node ./scripts/fixRepoRefs.js",
     "format": "prettier --write .",
-    "lint": "node ./scripts/lintPresets.js",
+    "format:check": "prettier --check .",
+    "lint": "eslint . && node ./scripts/lintPresets.js",
     "prepare": "husky install",
     "release": "HUSKY=0 semantic-release",
     "test:basic": "node ./scripts/testPresetsBasic.js",
@@ -21,20 +22,22 @@
     "update-refs": "node ./scripts/updateRefs.js"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.4.4",
-    "@semantic-release/changelog": "6.0.2",
-    "@semantic-release/exec": "6.0.3",
-    "@semantic-release/git": "10.0.1",
-    "@types/jju": "1.4.2",
-    "@types/node": "18.15.0",
-    "conventional-changelog-conventionalcommits": "5.0.0",
-    "execa": "7.0.0",
-    "husky": "8.0.3",
-    "jju": "1.4.0",
-    "prettier": "2.8.4",
-    "renovate": "34.154.1",
-    "semantic-release": "19.0.5",
-    "typescript": "4.9.5"
+    "@commitlint/cli": "^17.5.1",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/exec": "^6.0.3",
+    "@semantic-release/git": "^10.0.1",
+    "@types/jju": "^1.4.2",
+    "@types/node": "^18.15.11",
+    "conventional-changelog-conventionalcommits": "^5.0.0",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.8.0",
+    "execa": "^7.1.1",
+    "husky": "^8.0.3",
+    "jju": "^1.4.0",
+    "prettier": "^2.8.7",
+    "renovate": "35.46.0",
+    "semantic-release": "^21.0.1",
+    "typescript": "^5.0.3"
   },
   "release": {
     "branches": [

scheduleNoisy.json

@@ -4,10 +4,6 @@
   "description": "Update \"noisy\" (frequently-updating) packages once every other week.",
 
   "packageRules": [
-    {
-      "matchPackageNames": ["renovate"],
-      "schedule": ["before 5am on the 8th and 22nd day of the month"]
-    },
     {
       "matchPackagePrefixes": ["@microsoft/api-extractor"],
       "schedule": ["before 5am on the 8th and 22nd day of the month"]

scripts/lintPresets.js

@@ -8,9 +8,9 @@ const requiredAttributes = {
 
 const presets = readPresets();
 
-for (const { name, filename, json } of presets) {
+for (const { name: presetName, filename, json } of presets) {
   const logIssue = (message) => {
-    logError(`${name}: ${message}`, filename);
+    logError(`${presetName}: ${message}`, filename);
     process.exitCode = 1;
   };
 

scripts/testPresetsBasic.js

@@ -112,10 +112,10 @@ async function checkPreset(preset, hasInvalidRepoConfig) {
         filename
       );
       return 'unknown';
-    } else {
-      logError(`Unknown error validating ${filename}. See logs for details.`, filename);
-      return 'error';
     }
+
+    logError(`Unknown error validating ${filename}. See logs for details.`, filename);
+    return 'error';
   }
 
   if (migratedConfig || newConfig) {
@@ -140,26 +140,24 @@ function migrateConfig(preset, migratedConfig) {
 
   // Update the file if running locally or this is the repo config (to prevent others from failing).
   // There's no point in updating other configs in CI since they can't be committed.
-  let shouldUpdate = !isGithub || filename === repoRenovateConfigPath;
+  const isRepoConfig = filename === repoRenovateConfigPath;
   let result = /** @type {Result} */ ('ok');
 
   if (isGithub) {
     result = 'error';
     // Log errors for CI
-    let error = `❌ ${filename} requires migration.\n`;
-    if (shouldUpdate) {
-      error +=
-        'This migration will be run locally in CI so that the other presets ' +
-        'can be validated, but you must update this config ';
-    } else {
-      error += 'You must update this config ';
-    }
-    (error += 'by either running this test locally or manually copying the following content.'),
-      logError(error, filename);
+    logError(
+      `❌ ${filename} requires migration.\n` +
+        (isRepoConfig
+          ? 'This will be done locally in CI so the other presets can be validated, but you '
+          : 'You ') +
+        'must update this config by either running this test locally or manually copying the following content.',
+      filename
+    );
     console.log(migratedContent);
   }
 
-  if (shouldUpdate) {
+  if (!isGithub || isRepoConfig) {
     // Actually update and format the file
     console.log(`Migrating ${filename} (see git diff for details)`);
     fs.writeFileSync(absolutePath, migratedContent);