From 3be44d86a49e3df661b34ec6220e4147c145605f Mon Sep 17 00:00:00 2001 From: David Blass Date: Sat, 15 Jul 2023 11:27:59 -0400 Subject: [PATCH] ci: fix additional fromPackageRoot references in scripts --- dev/scripts/testTsVersions.ts | 4 ++-- dev/scripts/updateVersions.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/scripts/testTsVersions.ts b/dev/scripts/testTsVersions.ts index ae5d4eafff..d8cdca2c38 100644 --- a/dev/scripts/testTsVersions.ts +++ b/dev/scripts/testTsVersions.ts @@ -1,5 +1,5 @@ import { rmSync, writeFileSync } from "node:fs" -import { fromHere, fromPackageRoot, readJson } from "../attest/src/fs.js" +import { fromHere, readJson } from "../attest/src/fs.js" import { shell } from "../attest/src/shell.js" const versions: { [k: string]: string } = { @@ -11,7 +11,7 @@ const originalTsMorphVersion = rootJson["devDependencies"]["ts-morph"] // Allow us to install a different version of ts-morph for testing // without affecting our package.json -const npmrcPath = fromPackageRoot(".npmrc") +const npmrcPath = fromHere("..", "..", ".npmrc") rmSync(npmrcPath, { force: true }) writeFileSync(npmrcPath, "save=false") diff --git a/dev/scripts/updateVersions.ts b/dev/scripts/updateVersions.ts index 051fc2e13f..969992db25 100644 --- a/dev/scripts/updateVersions.ts +++ b/dev/scripts/updateVersions.ts @@ -1,10 +1,8 @@ /** Changesets doesn't understand version suffixes like -alpha by default, so we use this to preserve them */ import { readFileSync, writeFileSync } from "node:fs" import { join } from "node:path" - import { fromHere, - fromPackageRoot, readJson, readPackageJson, writeJson @@ -25,7 +23,9 @@ packageJson.version = packageJson.version.slice(0, -currentSuffix.length - 1) writeJson(packageJsonPath, packageJson) shell( - `node ${fromPackageRoot( + `node ${fromHere( + "..", + "..", "node_modules", "@changesets", "cli", @@ -42,7 +42,7 @@ const suffixedVersion = nonSuffixedVersion + `-${currentSuffix}` packageJson.version = suffixedVersion writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 4)) -const changelogPath = fromPackageRoot("CHANGELOG.md") +const changelogPath = fromHere("..", "..", "CHANGELOG.md") writeFileSync( changelogPath,