Merge branch 'main' into mk-bundling-no-npmrc

scripts/get-release-version.js

@@ -424,7 +424,13 @@ export function getVersion(options = {}) {
       }
       break;
     case 'promote-nightly':
-      versionData = promoteNightlyVersion();
+      versionData = promoteNightlyVersion({ args });
+      // A promoted nightly version is still a nightly, so we should check for conflicts.
+      if (doesVersionExist({ args, version: versionData.releaseVersion })) {
+        throw new Error(
+          `Version conflict! Promoted nightly version ${versionData.releaseVersion} already exists.`,
+        );
+      }
       break;
     case 'stable':
       versionData = getStableVersion(args);

scripts/lint.js

@@ -142,7 +142,7 @@ export function setupLinters() {
 
 export function runESLint() {
   console.log('\nRunning ESLint...');
-  if (!runCommand('npm run lint:ci')) {
+  if (!runCommand('npm run lint')) {
     process.exit(1);
   }
 }