Merge pull request #1500 from NullVoxPopuli/repo-relative-release-pla…

…n-paths

Make the package-json path repo-relative

test-packages/release/src/interdep.ts

@@ -1,5 +1,5 @@
 import glob from 'globby';
-import { resolve } from 'path';
+import { resolve, join } from 'path';
 import { readFileSync, readJSONSync } from 'fs-extra';
 import yaml from 'js-yaml';
 
@@ -21,15 +21,15 @@ export function publishedInterPackageDeps(): Map<string, PkgEntry> {
   for (let pattern of (yaml.load(readFileSync(resolve(__dirname, '../../../pnpm-workspace.yaml'), 'utf8')) as any)
     .packages) {
     for (let dir of glob.sync(pattern, { cwd: rootDir, expandDirectories: false, onlyDirectories: true })) {
-      let pkgJSONPath = resolve(rootDir, dir, 'package.json');
-      let pkg = readJSONSync(pkgJSONPath);
+      let absolutePkgJSONPath = resolve(rootDir, dir, 'package.json');
+      let pkg = readJSONSync(absolutePkgJSONPath);
       if (pkg.private) {
         continue;
       }
       pkgJSONS.set(pkg.name, pkg);
       packages.set(pkg.name, {
         version: pkg.version,
-        pkgJSONPath,
+        pkgJSONPath: join(dir, 'package.json'),
         isDependencyOf: new Map(),
         isPeerDependencyOf: new Map(),
       });

test-packages/release/src/prepare.ts

@@ -3,6 +3,7 @@ import { readFileSync, writeFileSync } from 'fs';
 import { resolve } from 'path';
 import { planVersionBumps, saveSolution, Solution } from './plan';
 import { readJSONSync, writeJSONSync } from 'fs-extra';
+import { relativeToAbsolute } from './utils';
 
 const changelogPreamble = `# Embroider Changelog
 `;
@@ -36,9 +37,9 @@ function versionSummary(solution: Solution): string {
 function updateVersions(solution: Solution) {
   for (let entry of solution.values()) {
     if (entry.impact) {
-      let pkg = readJSONSync(entry.pkgJSONPath);
+      let pkg = readJSONSync(relativeToAbsolute(entry.pkgJSONPath));
       pkg.version = entry.newVersion;
-      writeJSONSync(entry.pkgJSONPath, pkg, { spaces: 2 });
+      writeJSONSync(relativeToAbsolute(entry.pkgJSONPath), pkg, { spaces: 2 });
     }
   }
 }

test-packages/release/src/publish.ts

@@ -1,7 +1,7 @@
 import execa from 'execa';
 import { loadSolution, Solution } from './plan';
-import { dirname } from 'path';
 import { Octokit } from '@octokit/rest';
+import { absoluteDirname } from './utils';
 
 async function hasCleanRepo(): Promise<boolean> {
   let result = await execa('git', ['status', '--porcelain=v1'], { cwd: __dirname });
@@ -27,7 +27,7 @@ async function makeTags(solution: Solution, reporter: IssueReporter): Promise<vo
     }
     try {
       await execa('git', ['tag', tagFor(pkgName, entry)], {
-        cwd: dirname(entry.pkgJSONPath),
+        cwd: absoluteDirname(entry.pkgJSONPath),
         stderr: 'inherit',
         stdout: 'inherit',
       });
@@ -81,7 +81,7 @@ async function pnpmPublish(solution: Solution, reporter: IssueReporter): Promise
     }
     try {
       await execa('pnpm', ['publish', '--access=public'], {
-        cwd: dirname(entry.pkgJSONPath),
+        cwd: absoluteDirname(entry.pkgJSONPath),
         stderr: 'inherit',
         stdout: 'inherit',
       });

test-packages/release/src/utils.ts

@@ -0,0 +1,11 @@
+import { dirname, join, resolve } from 'path';
+
+export const root = resolve(__dirname, '../../../');
+
+export function relativeToAbsolute(repoRelative: string) {
+  return join(root, repoRelative);
+}
+
+export function absoluteDirname(repoRelative: string) {
+  return dirname(relativeToAbsolute(repoRelative));
+}