diff --git a/.release-plan.json b/.release-plan.json index e437359db2..b8e3196a46 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -115,5 +115,5 @@ "pkgJSONPath": "packages/@glimmer/wire-format/package.json" } }, - "description": "## Release (2024-09-13)\n\n\n\n#### :bug: Bug Fix\n* `@glimmer-workspace/bin`, `@glimmer-workspace/build-support`\n * [#1622](https://github.com/glimmerjs/glimmer-vm/pull/1622) Add CI step for verifying that unwanted code does not get published ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 1\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n" -} \ No newline at end of file + "description": "" +} diff --git a/bin/package.json b/bin/package.json index 2272aef478..6fc3db6015 100644 --- a/bin/package.json +++ b/bin/package.json @@ -13,6 +13,7 @@ "@types/tar": "^6.1.10", "chalk": "^5.2.0", "execa": "^7.1.1", + "fs-extra": "^11.2.0", "glob": "^10.2.3", "globby": "^14.0.2", "js-yaml": "^4.1.0", @@ -21,6 +22,7 @@ "tar": "^6.2.0" }, "devDependencies": { + "@types/fs-extra": "^11.0.4", "eslint": "^8.54.0", "esno": "^0.16.3" }, diff --git a/bin/patch-all.mjs b/bin/patch-all.mjs index 9390388cc2..f2d207578d 100644 --- a/bin/patch-all.mjs +++ b/bin/patch-all.mjs @@ -1,5 +1,7 @@ import { readFile, writeFile } from 'node:fs/promises'; import { existsSync } from 'node:fs'; +import fsExtra from 'fs-extra'; +const { readJSONSync, writeJSONSync } = fsExtra; let file; @@ -13,12 +15,32 @@ for (let [pkgName, existing] of Object.entries(file.solution)) { let [major, minor, patch] = existing.oldVersion.split('.'); let newVersion = `${major}.${minor}.${Number(patch) + 1}`; + let pkgJSONPath = `packages/${pkgName}/package.json`; file.solution[pkgName] = { ...existing, newVersion, impact: 'patch', - pkgJSONPath: `packages/${pkgName}/package.json`, + pkgJSONPath, }; } await writeFile('.release-plan.json', JSON.stringify(file, null, 2)); + +// copied from release-plan +// This is temporary just fix the VM release, since it's a bit pressing. +// Loneger term fix for this is happening +// https://github.com/embroider-build/release-plan/pull/79 +/** + * @param {any} solution + */ +function updateVersions(solution) { + for (const entry of Object.values(solution)) { + if (entry.impact) { + const pkg = readJSONSync(entry.pkgJSONPath); + pkg.version = entry.newVersion; + writeJSONSync(entry.pkgJSONPath, pkg, { spaces: 2 }); + } + } +} + +updateVersions(file.solution); diff --git a/packages/@glimmer/compiler/package.json b/packages/@glimmer/compiler/package.json index 760df9828b..e77e850411 100644 --- a/packages/@glimmer/compiler/package.json +++ b/packages/@glimmer/compiler/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/compiler", - "version": "0.92.3", + "version": "0.92.4", "license": "MIT", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/compiler", "type": "module", diff --git a/packages/@glimmer/debug/package.json b/packages/@glimmer/debug/package.json index 6d772a0a46..868c12f6e3 100644 --- a/packages/@glimmer/debug/package.json +++ b/packages/@glimmer/debug/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/debug", - "version": "0.92.3", + "version": "0.92.4", "license": "MIT", "description": "Utilities for helping make working in the vm easier. these should be inlined and stripped for ember usage.", "sideEffects": false, diff --git a/packages/@glimmer/destroyable/package.json b/packages/@glimmer/destroyable/package.json index a324d2f51d..ec03371f0c 100644 --- a/packages/@glimmer/destroyable/package.json +++ b/packages/@glimmer/destroyable/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/destroyable", - "version": "0.92.2", + "version": "0.92.3", "license": "MIT", "description": "Utilities for creating and managing a destroyable hierarchy of objects", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/destroyable", diff --git a/packages/@glimmer/encoder/package.json b/packages/@glimmer/encoder/package.json index 748c5569b7..36e059064a 100644 --- a/packages/@glimmer/encoder/package.json +++ b/packages/@glimmer/encoder/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/encoder", - "version": "0.92.2", + "version": "0.92.3", "license": "MIT", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/encoder", "type": "module", diff --git a/packages/@glimmer/global-context/package.json b/packages/@glimmer/global-context/package.json index 3913a50784..982374355f 100644 --- a/packages/@glimmer/global-context/package.json +++ b/packages/@glimmer/global-context/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/global-context", - "version": "0.92.2", + "version": "0.92.3", "license": "MIT", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/global-context", "type": "module", diff --git a/packages/@glimmer/interfaces/package.json b/packages/@glimmer/interfaces/package.json index bb89abe779..7e9288b895 100644 --- a/packages/@glimmer/interfaces/package.json +++ b/packages/@glimmer/interfaces/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/interfaces", - "version": "0.92.2", + "version": "0.92.3", "license": "MIT", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/interfaces", "type": "module", diff --git a/packages/@glimmer/manager/package.json b/packages/@glimmer/manager/package.json index 3e18def8a5..eaca0b2756 100644 --- a/packages/@glimmer/manager/package.json +++ b/packages/@glimmer/manager/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/manager", - "version": "0.92.3", + "version": "0.92.4", "license": "MIT", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/program", "type": "module", diff --git a/packages/@glimmer/node/package.json b/packages/@glimmer/node/package.json index 5937b76d3b..bd76171d7d 100644 --- a/packages/@glimmer/node/package.json +++ b/packages/@glimmer/node/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/node", - "version": "0.92.3", + "version": "0.92.4", "license": "MIT", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/node", "type": "module", diff --git a/packages/@glimmer/opcode-compiler/package.json b/packages/@glimmer/opcode-compiler/package.json index 4ae4a9766f..bed7cbeb9e 100644 --- a/packages/@glimmer/opcode-compiler/package.json +++ b/packages/@glimmer/opcode-compiler/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/opcode-compiler", - "version": "0.92.3", + "version": "0.92.4", "license": "MIT", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/opcode-compiler", "type": "module", diff --git a/packages/@glimmer/owner/package.json b/packages/@glimmer/owner/package.json index 0fe7025ce5..c828e6922d 100644 --- a/packages/@glimmer/owner/package.json +++ b/packages/@glimmer/owner/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/owner", - "version": "0.92.2", + "version": "0.92.3", "license": "MIT", "description": "Implementation for the owner in Glimmer apps", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/owner", diff --git a/packages/@glimmer/program/package.json b/packages/@glimmer/program/package.json index f35be4538f..04e0f3e280 100644 --- a/packages/@glimmer/program/package.json +++ b/packages/@glimmer/program/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/program", - "version": "0.92.3", + "version": "0.92.4", "license": "MIT", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/program", "type": "module", diff --git a/packages/@glimmer/reference/package.json b/packages/@glimmer/reference/package.json index a116314011..dbefda09db 100644 --- a/packages/@glimmer/reference/package.json +++ b/packages/@glimmer/reference/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/reference", - "version": "0.92.2", + "version": "0.92.3", "license": "MIT", "description": "Objects used to track values and their dirtiness in Glimmer", "repository": { diff --git a/packages/@glimmer/runtime/package.json b/packages/@glimmer/runtime/package.json index cced385941..29e1356e00 100644 --- a/packages/@glimmer/runtime/package.json +++ b/packages/@glimmer/runtime/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/runtime", - "version": "0.92.3", + "version": "0.92.4", "license": "MIT", "description": "Minimal runtime needed to render Glimmer templates", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/runtime", diff --git a/packages/@glimmer/syntax/package.json b/packages/@glimmer/syntax/package.json index 3b64932ed9..a1f2a87e20 100644 --- a/packages/@glimmer/syntax/package.json +++ b/packages/@glimmer/syntax/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/syntax", - "version": "0.92.2", + "version": "0.92.3", "license": "MIT", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/syntax", "type": "module", diff --git a/packages/@glimmer/util/package.json b/packages/@glimmer/util/package.json index 3c3def0b68..9862dd35a1 100644 --- a/packages/@glimmer/util/package.json +++ b/packages/@glimmer/util/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/util", - "version": "0.92.2", + "version": "0.92.3", "license": "MIT", "description": "Common utilities used in Glimmer", "repository": "https://github.com/tildeio/glimmer/tree/main/packages/@glimmer/util", diff --git a/packages/@glimmer/validator/package.json b/packages/@glimmer/validator/package.json index f771bc6ff8..3bac505d78 100644 --- a/packages/@glimmer/validator/package.json +++ b/packages/@glimmer/validator/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/validator", - "version": "0.92.2", + "version": "0.92.3", "license": "MIT", "description": "Objects used to track values and their dirtiness in Glimmer", "repository": { diff --git a/packages/@glimmer/vm-babel-plugins/package.json b/packages/@glimmer/vm-babel-plugins/package.json index 25af2d71e6..57cb0f7195 100644 --- a/packages/@glimmer/vm-babel-plugins/package.json +++ b/packages/@glimmer/vm-babel-plugins/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/vm-babel-plugins", - "version": "0.92.2", + "version": "0.92.3", "license": "MIT", "description": "Compiles out VM assertion and deprecation utilities and debug tooling based on environment", "repository": "https://github.com/glimmerjs/glimmer.js", diff --git a/packages/@glimmer/vm/package.json b/packages/@glimmer/vm/package.json index 36091c7c5a..f97a70df7f 100644 --- a/packages/@glimmer/vm/package.json +++ b/packages/@glimmer/vm/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/vm", - "version": "0.92.2", + "version": "0.92.3", "license": "MIT", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/vm", "type": "module", diff --git a/packages/@glimmer/wire-format/package.json b/packages/@glimmer/wire-format/package.json index 2fa9d4fa96..0551e76181 100644 --- a/packages/@glimmer/wire-format/package.json +++ b/packages/@glimmer/wire-format/package.json @@ -1,6 +1,6 @@ { "name": "@glimmer/wire-format", - "version": "0.92.2", + "version": "0.92.3", "license": "MIT", "description": "", "repository": "https://github.com/glimmerjs/glimmer-vm/tree/main/packages/@glimmer/wire-format", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e2dbc10423..a92992112f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -274,6 +274,9 @@ importers: execa: specifier: ^7.1.1 version: 7.1.1 + fs-extra: + specifier: ^11.2.0 + version: 11.2.0 glob: specifier: ^10.2.3 version: 10.2.3 @@ -293,6 +296,9 @@ importers: specifier: ^6.2.0 version: 6.2.0 devDependencies: + '@types/fs-extra': + specifier: ^11.0.4 + version: 11.0.4 eslint: specifier: ^8.54.0 version: 8.54.0 @@ -8064,7 +8070,7 @@ packages: find-up: 5.0.0 find-yarn-workspace-root: 2.0.0 fixturify-project: 2.1.1 - fs-extra: 11.1.1 + fs-extra: 11.2.0 fs-tree-diff: 2.0.1 get-caller-file: 2.0.5 git-repo-info: 2.1.1 @@ -9921,14 +9927,13 @@ packages: universalify: 2.0.0 dev: true - /fs-extra@11.1.1: - resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==} + /fs-extra@11.2.0: + resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==} engines: {node: '>=14.14'} dependencies: graceful-fs: 4.2.11 jsonfile: 6.1.0 universalify: 2.0.0 - dev: true /fs-extra@4.0.3: resolution: {integrity: sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==} @@ -11864,7 +11869,6 @@ packages: universalify: 2.0.0 optionalDependencies: graceful-fs: 4.2.11 - dev: true /jsonify@0.0.1: resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==} @@ -17573,7 +17577,6 @@ packages: /universalify@2.0.0: resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==} engines: {node: '>= 10.0.0'} - dev: true /unpipe@1.0.0: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} @@ -18391,7 +18394,7 @@ packages: '@types/ps-tree': 1.1.6 '@types/which': 3.0.3 chalk: 5.3.0 - fs-extra: 11.1.1 + fs-extra: 11.2.0 fx: 31.0.0 globby: 13.2.2 minimist: 1.2.8