fixes

Author: runspired

release/core/promote/index.ts

@@ -1,32 +1,19 @@
 import { promote_flags_config } from '../../utils/flags-config';
 import { parseRawFlags } from '../../utils/parse-args';
-<<<<<<< Updated upstream
-import { getGitState } from '../../utils/git';
-import { printHelpDocs } from '../../help/docs';
-=======
 import { GIT_TAG, getAllPackagesForGitTag, getGitState } from '../../utils/git';
 import { printHelpDocs } from '../../help/docs';
 import { Package } from '../../utils/package';
 import { SEMVER_VERSION } from '../../utils/channel';
->>>>>>> Stashed changes
 
 export async function promoteToLTS(args: string[]) {
   // get user supplied config
   const config = await parseRawFlags(args.slice(1), promote_flags_config);
-<<<<<<< Updated upstream
-=======
   const gitTag: GIT_TAG = `v${config.full.get('version') as SEMVER_VERSION}`;
->>>>>>> Stashed changes
 
   if (config.full.get('help')) {
     return printHelpDocs(args);
   }
 
-<<<<<<< Updated upstream
-  const dryRun = config.full.get('dry_run') as boolean;
-
-  console.log(config.full);
-=======
   const packages = await getAllPackagesForGitTag(gitTag);
   const versionsToPromote = getPublicPackageVersions(packages);
   const dryRun = config.full.get('dry_run') as boolean;
@@ -44,5 +31,4 @@ export async function getPublicPackageVersions(packages: Map<string, Package>):
     }
   });
   return publicPackages;
->>>>>>> Stashed changes
 }

release/core/publish/index.ts

@@ -5,16 +5,10 @@ import { printHelpDocs } from '../../help/docs';
 import { bumpAllPackages, restorePackagesForDryRun } from './steps/bump-versions';
 import { generatePackageTarballs } from './steps/generate-tarballs';
 import { printStrategy } from './steps/print-strategy';
-<<<<<<< Updated upstream
-import { applyStrategy, gatherPackages, loadStrategy } from './steps/generate-strategy';
-import { confirmStrategy } from './steps/confirm-strategy';
-import { publishPackages } from './steps/publish-packages';
-=======
 import { applyStrategy } from './steps/generate-strategy';
 import { confirmStrategy } from './steps/confirm-strategy';
 import { publishPackages } from './steps/publish-packages';
 import { gatherPackages, loadStrategy } from '../../utils/package';
->>>>>>> Stashed changes
 
 export async function executePublish(args: string[]) {
   // get user supplied config

release/core/publish/steps/generate-strategy.ts

@@ -1,74 +1,12 @@
-<<<<<<< Updated upstream
-import { getFile } from '../../../utils/json-file';
-import { GIT_STATE } from '../../../utils/git';
-import { STRATEGY_TYPE, CHANNEL, npmDistTagForChannelAndVersion, TYPE_STRATEGY } from '../../../utils/channel';
-import { Glob } from 'bun';
-import { APPLIED_STRATEGY, PACKAGEJSON, Package } from '../../../utils/package';
-=======
 import { GIT_STATE } from '../../../utils/git';
 import { CHANNEL, npmDistTagForChannelAndVersion } from '../../../utils/channel';
 
 import { APPLIED_STRATEGY, Package, STRATEGY } from '../../../utils/package';
->>>>>>> Stashed changes
 import { getNextVersion } from '../../utils/next-version';
 import path from 'path';
 
 const PROJECT_ROOT = process.cwd();
 
-<<<<<<< Updated upstream
-export interface STRATEGY {
-  config: {
-    packageRoots: string[];
-  };
-  defaults: {
-    stage: STRATEGY_TYPE;
-    types: TYPE_STRATEGY;
-  };
-  rules: Record<
-    string,
-    {
-      stage: STRATEGY_TYPE;
-      types: TYPE_STRATEGY;
-    }
-  >;
-}
-
-function buildGlob(dirPath: string) {
-  return `${dirPath}/package.json`;
-}
-
-export async function gatherPackages(config: STRATEGY['config'], cwd: string = process.cwd()) {
-  const packages: Map<string, Package> = new Map();
-
-  // add root
-  const rootFilePath = `${cwd}/package.json`;
-  const rootFile = getFile<PACKAGEJSON>(rootFilePath);
-  const rootPkgData = await rootFile.read();
-  packages.set('root', new Package(rootFilePath, rootFile, rootPkgData));
-
-  // add other packages
-  for (const dirPath of config.packageRoots) {
-    const glob = new Glob(buildGlob(dirPath));
-
-    // Scans the current working directory and each of its sub-directories recursively
-    for await (const filePath of glob.scan(cwd)) {
-      const file = getFile<PACKAGEJSON>(filePath);
-      const pkgData = await file.read();
-      packages.set(pkgData.name, new Package(filePath, file, pkgData));
-    }
-  }
-
-  return packages;
-}
-
-export async function loadStrategy() {
-  const file = getFile<STRATEGY>(`${PROJECT_ROOT}/release/strategy.json`);
-  const data = await file.read();
-  return data;
-}
-
-=======
->>>>>>> Stashed changes
 function sortByName(map: Map<string, { name: string }>) {
   const sorted = [...map.values()];
   sorted.sort((a, b) => {

release/utils/git.ts

@@ -2,11 +2,8 @@ import chalk from 'chalk';
 import { branchForChannelAndVersion, CHANNEL, channelForBranch, SEMVER_VERSION, VALID_BRANCHES } from './channel';
 import { getFile } from './json-file';
 import { exec } from './cmd';
-<<<<<<< Updated upstream
-=======
 import { gatherPackages, loadStrategy, Package } from './package';
 import path from 'path';
->>>>>>> Stashed changes
 
 export type LTS_TAG = `lts-${number}-${number}`;
 export type RELEASE_TAG = `release-${number}-${number}`;
@@ -156,19 +153,11 @@ export async function getGitState(options: Map<string, boolean | string | number
   return _GIT_STATE;
 }
 
-<<<<<<< Updated upstream
-export async function getAllPackagesForGitTag(tag: GIT_TAG): Promise<string[]> {
-  await exec(['mkdir', '-p', `./tmp/${tag}`]);
-  await exec({ cmd: ['git', 'checkout', tag], env: { ...process.env, GIT_WORK_TREE: `./tmp/${tag}` } });
-  const info = JSON.parse(gitInfo) as Record<string, unknown>;
-  return info.versions[tag] as string[];
-=======
 export async function getAllPackagesForGitTag(tag: GIT_TAG): Promise<Map<string, Package>> {
   await exec(['mkdir', '-p', `./tmp/${tag}`]);
   await exec({ cmd: ['git', 'checkout', tag], env: { ...process.env, GIT_WORK_TREE: `./tmp/${tag}` } });
 
   const tmpDir = path.join(process.cwd(), `./tmp/${tag}`);
   const strategy = await loadStrategy(tmpDir);
   return gatherPackages(strategy.config, tmpDir);
->>>>>>> Stashed changes
 }

release/utils/package.ts

@@ -1,11 +1,6 @@
-<<<<<<< Updated upstream
-import { JSONFile } from './json-file';
-import { NPM_DIST_TAG, SEMVER_VERSION, STRATEGY_TYPE, TYPE_STRATEGY } from './channel';
-=======
 import { JSONFile, getFile } from './json-file';
 import { NPM_DIST_TAG, SEMVER_VERSION, STRATEGY_TYPE, TYPE_STRATEGY } from './channel';
 import { Glob } from 'bun';
->>>>>>> Stashed changes
 
 export class Package {
   declare filePath: string;
@@ -72,8 +67,6 @@ export type APPLIED_STRATEGY = {
   distTag: NPM_DIST_TAG;
   pkgDir: string;
 };
-<<<<<<< Updated upstream
-=======
 
 export interface STRATEGY {
   config: {
@@ -125,4 +118,3 @@ export async function loadStrategy(cwd: string = process.cwd()) {
   const data = await file.read();
   return data;
 }
->>>>>>> Stashed changes