Skip to content

Commit

Permalink
Apply patch for changeset to fix release flow (#2412)
Browse files Browse the repository at this point in the history
  • Loading branch information
dotansimha committed Mar 22, 2023
1 parent 4d9f687 commit 5b27545
Show file tree
Hide file tree
Showing 4 changed files with 138 additions and 2 deletions.
27 changes: 27 additions & 0 deletions .changeset/calm-rats-boil.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
'@graphql-inspector/action': patch
'@graphql-inspector/ci': patch
'@graphql-inspector/cli': patch
'@graphql-inspector/audit-command': patch
'@graphql-inspector/commands': patch
'@graphql-inspector/coverage-command': patch
'@graphql-inspector/diff-command': patch
'@graphql-inspector/docs-command': patch
'@graphql-inspector/introspect-command': patch
'@graphql-inspector/serve-command': patch
'@graphql-inspector/similar-command': patch
'@graphql-inspector/validate-command': patch
'@graphql-inspector/config': patch
'@graphql-inspector/core': patch
'@graphql-inspector/github': patch
'@graphql-inspector/code-loader': patch
'@graphql-inspector/git-loader': patch
'@graphql-inspector/github-loader': patch
'@graphql-inspector/graphql-loader': patch
'@graphql-inspector/json-loader': patch
'@graphql-inspector/loaders': patch
'@graphql-inspector/url-loader': patch
'@graphql-inspector/logger': patch
---

Bump all packages to fix issues with previous release
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@
"pnpm": {
"overrides": {
"@octokit/types": "5.4.1"
},
"patchedDependencies": {
"@changesets/cli@2.26.0": "patches/@changesets__cli@2.26.0.patch"
}
}
}
100 changes: 100 additions & 0 deletions patches/@changesets__cli@2.26.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
diff --git a/dist/cli.cjs.dev.js b/dist/cli.cjs.dev.js
index b1582198d3d2631569ff59f27170354a932d3ad0..73ab02a861b1f5a8e1bf10984340a0a6b1518b15 100644
--- a/dist/cli.cjs.dev.js
+++ b/dist/cli.cjs.dev.js
@@ -842,7 +842,10 @@ async function internalPublish(pkgName, opts, twoFactorState) {
code,
stdout,
stderr
- } = await spawn__default['default'](publishTool.name, ["publish", opts.cwd, "--json", ...publishFlags], {
+ } = publishTool.name === "pnpm" ? await spawn__default['default']("pnpm", ["publish", "--json", ...publishFlags], {
+ env: Object.assign({}, process.env, envOverride),
+ cwd: opts.cwd
+ }) : await spawn__default['default'](publishTool.name, ["publish", opts.publishDir, "--json", ...publishFlags], {
env: Object.assign({}, process.env, envOverride)
});

@@ -959,12 +962,11 @@ async function publishAPackage(pkg, access, twoFactorState, tag) {
version,
publishConfig
} = pkg.packageJson;
- const localAccess = publishConfig === null || publishConfig === void 0 ? void 0 : publishConfig.access;
logger.info(`Publishing ${chalk__default['default'].cyan(`"${name}"`)} at ${chalk__default['default'].green(`"${version}"`)}`);
- const publishDir = publishConfig !== null && publishConfig !== void 0 && publishConfig.directory ? path.join(pkg.dir, publishConfig.directory) : pkg.dir;
const publishConfirmation = await publish(name, {
- cwd: publishDir,
- access: localAccess || access,
+ cwd: pkg.dir,
+ publishDir: publishConfig !== null && publishConfig !== void 0 && publishConfig.directory ? path.join(pkg.dir, publishConfig.directory) : pkg.dir,
+ access: (publishConfig === null || publishConfig === void 0 ? void 0 : publishConfig.access) || access,
tag
}, twoFactorState);
return {
diff --git a/dist/cli.cjs.prod.js b/dist/cli.cjs.prod.js
index 5b1b7dd6439be4f0b721a17e683b1435c254f5b8..df283d36e08afdaf8ccbcb5ba07703d61d5ee922 100644
--- a/dist/cli.cjs.prod.js
+++ b/dist/cli.cjs.prod.js
@@ -476,7 +476,10 @@ async function internalPublish(pkgName, opts, twoFactorState) {
const envOverride = {
npm_config_registry: getCorrectRegistry()
};
- let {code: code, stdout: stdout, stderr: stderr} = await spawn__default.default(publishTool.name, [ "publish", opts.cwd, "--json", ...publishFlags ], {
+ let {code: code, stdout: stdout, stderr: stderr} = "pnpm" === publishTool.name ? await spawn__default.default("pnpm", [ "publish", "--json", ...publishFlags ], {
+ env: Object.assign({}, process.env, envOverride),
+ cwd: opts.cwd
+ }) : await spawn__default.default(publishTool.name, [ "publish", opts.publishDir, "--json", ...publishFlags ], {
env: Object.assign({}, process.env, envOverride)
});
if (0 !== code) {
@@ -528,15 +531,15 @@ async function publishPackages({packages: packages, access: access, otp: otp, pr
}

async function publishAPackage(pkg, access, twoFactorState, tag) {
- const {name: name, version: version, publishConfig: publishConfig} = pkg.packageJson, localAccess = null == publishConfig ? void 0 : publishConfig.access;
+ const {name: name, version: version, publishConfig: publishConfig} = pkg.packageJson;
logger.info(`Publishing ${chalk__default.default.cyan(`"${name}"`)} at ${chalk__default.default.green(`"${version}"`)}`);
- const publishDir = null != publishConfig && publishConfig.directory ? path.join(pkg.dir, publishConfig.directory) : pkg.dir;
return {
name: name,
newVersion: version,
published: (await publish(name, {
- cwd: publishDir,
- access: localAccess || access,
+ cwd: pkg.dir,
+ publishDir: null != publishConfig && publishConfig.directory ? path.join(pkg.dir, publishConfig.directory) : pkg.dir,
+ access: (null == publishConfig ? void 0 : publishConfig.access) || access,
tag: tag
}, twoFactorState)).published
};
diff --git a/dist/cli.esm.js b/dist/cli.esm.js
index ced46d2520d4bff71b94e4023b1841373a55712b..86ab79a83f931608078afc5410cb7025c83fd921 100644
--- a/dist/cli.esm.js
+++ b/dist/cli.esm.js
@@ -819,7 +819,10 @@ async function internalPublish(pkgName, opts, twoFactorState) {
code,
stdout,
stderr
- } = await spawn$1(publishTool.name, ["publish", opts.cwd, "--json", ...publishFlags], {
+ } = publishTool.name === "pnpm" ? await spawn$1("pnpm", ["publish", "--json", ...publishFlags], {
+ env: Object.assign({}, process.env, envOverride),
+ cwd: opts.cwd
+ }) : await spawn$1(publishTool.name, ["publish", opts.publishDir, "--json", ...publishFlags], {
env: Object.assign({}, process.env, envOverride)
});

@@ -936,12 +939,11 @@ async function publishAPackage(pkg, access, twoFactorState, tag) {
version,
publishConfig
} = pkg.packageJson;
- const localAccess = publishConfig === null || publishConfig === void 0 ? void 0 : publishConfig.access;
info(`Publishing ${chalk.cyan(`"${name}"`)} at ${chalk.green(`"${version}"`)}`);
- const publishDir = publishConfig !== null && publishConfig !== void 0 && publishConfig.directory ? join(pkg.dir, publishConfig.directory) : pkg.dir;
const publishConfirmation = await publish(name, {
- cwd: publishDir,
- access: localAccess || access,
+ cwd: pkg.dir,
+ publishDir: publishConfig !== null && publishConfig !== void 0 && publishConfig.directory ? join(pkg.dir, publishConfig.directory) : pkg.dir,
+ access: (publishConfig === null || publishConfig === void 0 ? void 0 : publishConfig.access) || access,
tag
}, twoFactorState);
return {
10 changes: 8 additions & 2 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5b27545

Please sign in to comment.