diff --git a/package.json b/package.json index aa7e83e116..4c67eb1945 100644 --- a/package.json +++ b/package.json @@ -2,13 +2,16 @@ "name": "glimmer-engine", "version": "0.92.0", "private": true, + "license": "MIT", "description": "Glimmer compiles Handlebars templates into document fragments rather than string buffers", "repository": { "type": "git", "url": "https://github.com/glimmerjs/glimmer-vm.git" }, - "license": "MIT", "author": "Tilde, Inc.", + "publishConfig": { + "registry": "https://registry.npmjs.org" + }, "scripts": { "benchmark:setup": "zx ./bin/setup-bench.mjs", "browserstack:connect": "ember browserstack:connect", @@ -105,6 +108,16 @@ "xo": "^0.54.2", "zx": "^7.2.3" }, + "changelog": { + "repo": "glimmerjs/glimmer-vm", + "labels": { + "breaking": ":boom: Breaking Change", + "enhancement": ":rocket: Enhancement", + "bug": ":bug: Bug Fix", + "documentation": ":memo: Documentation", + "internal": ":house: Internal" + } + }, "engines": { "node": ">=16.0.0" }, @@ -112,10 +125,12 @@ "node": "20.9.0", "pnpm": "8.5.0" }, - "publishConfig": { - "registry": "https://registry.npmjs.org" - }, "pnpm": { + "overrides": { + "@rollup/pluginutils": "^5.0.2", + "@types/node": "$@types/node", + "typescript": "$typescript" + }, "peerDependencyRules": { "allowAny": [ "vite-plugin-babel", @@ -126,51 +141,6 @@ "rollup": "3", "typescript": "5" } - }, - "overrides": { - "@rollup/pluginutils": "^5.0.2", - "@types/node": "$@types/node", - "typescript": "$typescript" - }, - "patchedDependencies": { - "@release-it-plugins/workspaces@4.0.0": "patches/@release-it-plugins__workspaces@4.0.0.patch" - } - }, - "changelog": { - "repo": "glimmerjs/glimmer-vm", - "labels": { - "breaking": ":boom: Breaking Change", - "enhancement": ":rocket: Enhancement", - "bug": ":bug: Bug Fix", - "documentation": ":memo: Documentation", - "internal": ":house: Internal" } - }, - "release-it": { - "plugins": { - "@release-it-plugins/workspaces": { - "publish": false, - "workspaces": [ - "packages/@glimmer/*" - ], - "additionalManifests": { - "dependencyUpdates": [] - } - }, - "@release-it-plugins/lerna-changelog": { - "infile": "CHANGELOG.md", - "launchEditor": true - } - }, - "git": { - "commitMessage": "v${version}", - "tagName": "v${version}" - }, - "github": { - "release": true, - "releaseName": "v${version}", - "tokenRef": "GITHUB_AUTH" - }, - "npm": false } } diff --git a/patches/@release-it-plugins__workspaces@4.0.0.patch b/patches/@release-it-plugins__workspaces@4.0.0.patch deleted file mode 100644 index 3ef5b6383f..0000000000 --- a/patches/@release-it-plugins__workspaces@4.0.0.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/index.js b/index.js -index e6bbba3081bc7327a1017425f41830dcc0342fa3..6b84982c9c675ed0a54ff34b4ac148216160d48b 100644 ---- a/index.js -+++ b/index.js -@@ -331,6 +331,15 @@ export default class WorkspacesPlugin extends Plugin { - for (let dependency in dependencies) { - if (workspaces.find((w) => w.name === dependency)) { - const existingVersion = dependencies[dependency]; -+ -+ /** -+ * If pnpm is being used, the Workspace protocol may also be used -+ * https://pnpm.io/workspaces#workspace-protocol-workspace -+ * if it is, these version references are handled on publish -+ * by `pnpm publish`. -+ */ -+ if (existingVersion.startsWith('workspace:')) continue; -+ - const replacementVersion = this._buildReplacementDepencencyVersion( - existingVersion, - newVersion \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 92fab7573f..93a57ddb4c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,14 +1,9 @@ lockfileVersion: '6.0' overrides: - typescript: ^5.0.4 '@rollup/pluginutils': ^5.0.2 '@types/node': ^20.9.4 - -patchedDependencies: - '@release-it-plugins/workspaces@4.0.0': - hash: lhefrznz336tkf55irfqm4hld4 - path: patches/@release-it-plugins__workspaces@4.0.0.patch + typescript: ^5.0.4 importers: @@ -55,7 +50,7 @@ importers: version: 6.0.0(release-it@16.2.1) '@release-it-plugins/workspaces': specifier: ^4.0.0 - version: 4.0.0(patch_hash=lhefrznz336tkf55irfqm4hld4)(release-it@16.2.1) + version: 4.0.0(release-it@16.2.1) '@rollup/plugin-terser': specifier: ^0.4.4 version: 0.4.4(rollup@4.5.1) @@ -3707,7 +3702,7 @@ packages: - supports-color dev: true - /@release-it-plugins/workspaces@4.0.0(patch_hash=lhefrznz336tkf55irfqm4hld4)(release-it@16.2.1): + /@release-it-plugins/workspaces@4.0.0(release-it@16.2.1): resolution: {integrity: sha512-79qsR770mvuQeTSMnOjrEJuJHQ4x1KyUkZjqCOQ/UxjK+igNYYDsLK26LpKTweeTjpbpmLYaOg6bl+28M5CO0A==} engines: {node: '>= 16'} peerDependencies: @@ -3722,7 +3717,6 @@ packages: walk-sync: 2.2.0 yaml: 2.3.2 dev: true - patched: true /@rollup/plugin-commonjs@25.0.7(rollup@4.5.1): resolution: {integrity: sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==} @@ -16955,7 +16949,7 @@ packages: is-yarn-global: 0.4.1 latest-version: 7.0.0 pupa: 3.1.0 - semver: 7.5.2 + semver: 7.5.4 semver-diff: 4.0.0 xdg-basedir: 5.1.0 dev: true