Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dep upgrades from https://github.com/glimmerjs/glimmer-vm/pull/1690/ #1714

Merged
merged 2 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .meta-updater/catalog/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"devDependencies": {
"rollup": "^4.34.8"
}
}
12 changes: 10 additions & 2 deletions .meta-updater/main.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { createUpdateOptions } from '@pnpm/meta-updater';
import repo, { getPackageInfo, WORKSPACE_ROOT } from '@glimmer-workspace/repo-metadata';
import { json, packageJson } from './formats/json.mjs';
import { code } from './formats/code.mjs';
import catalog from './catalog/package.json' with { type: 'json' };

/**
* @import { PackageInfo } from '@glimmer-workspace/repo-metadata';
Expand Down Expand Up @@ -67,11 +68,17 @@ export default () =>

update(scripts, 'test:publint', 'publint');

const devDependencies = /** @type { JsonObject } */ (actual.devDependencies ??= {});

for (const [name, version] of Object.entries(catalog.devDependencies)) {
if (name in devDependencies) {
update(devDependencies, name, version);
}
}

// Packages are built if they're published and have at least one `.ts` entry point that is
// not a `.d.ts` file **or** if they are explicitly marked as built via `repo-meta.built`.
if (pkg['repo-meta']?.built) {
const devDependencies = /** @type { JsonObject } */ (actual.devDependencies ??= {});

update(devDependencies, '@glimmer-workspace/env', 'workspace:*');

update(scripts, 'prepack', 'rollup -c rollup.config.mjs');
Expand Down Expand Up @@ -124,6 +131,7 @@ export default () =>
}

cleanup(actual, 'publishConfig');
cleanup(actual, 'devDependencies');
return actual;
},

Expand Down
16 changes: 8 additions & 8 deletions .meta-updater/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@
],
"scripts": {},
"dependencies": {
"@pnpm/find-workspace-dir": "^1000.0.1",
"@pnpm/find-workspace-dir": "^1000.0.2",
"@pnpm/meta-updater": "^2.0.3",
"@pnpm/read-package-json": "^1000.0.2",
"globby": "^14.0.2",
"@pnpm/read-package-json": "^1000.0.3",
"globby": "^14.1.0",
"load-json-file": "^7.0.1",
"minimatch": "^10.0.1",
"ramda": "^0.30.1",
"write-json-file": "^6.0.0",
"zx": "^8.3.0"
"zx": "^8.3.2"
},
"devDependencies": {
"@glimmer-workspace/env": "workspace:*",
"@glimmer-workspace/repo-metadata": "workspace:*",
"@pnpm/types": "^1000.0.0",
"@pnpm/workspace.find-packages": "^1000.0.1",
"@types/node": "catalog:",
"@pnpm/types": "^1000.1.1",
"@pnpm/workspace.find-packages": "^1000.0.10",
"@types/node": "^22.13.4",
"@types/ramda": "^0.30.2",
"type-fest": "^4.32.0"
"type-fest": "^4.35.0"
}
}
2 changes: 1 addition & 1 deletion .prototools
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
node = "22"
node = "lts"
pnpm = "latest-10"
20 changes: 10 additions & 10 deletions bin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
"scripts": {},
"dependencies": {
"@glimmer-workspace/repo-metadata": "workspace:*",
"@pnpm/workspace.find-packages": "^1000.0.5",
"@pnpm/workspace.find-packages": "^1000.0.10",
"@types/glob": "^8.1.0",
"@types/js-yaml": "^4.0.9",
"@types/node": "^20.9.4",
"@types/node": "^22.13.4",
"@types/puppeteer-chromium-resolver": "workspace:*",
"@types/tar": "^6.1.10",
"chalk": "^5.2.0",
"@types/tar": "^6.1.13",
"chalk": "^5.4.1",
"execa": "^7.1.1",
"fs-extra": "^11.2.0",
"fs-extra": "^11.3.0",
"glob": "^10.2.3",
"globby": "^14.0.2",
"globby": "^14.1.0",
"js-yaml": "^4.1.0",
"mkdirp": "^3.0.1",
"p-map": "^7.0.3",
Expand All @@ -36,14 +36,14 @@
"spex": "^3.4.0",
"tar": "^6.2.0",
"which": "^5.0.0",
"zx": "^8.3.0"
"zx": "^8.3.2"
},
"devDependencies": {
"@pnpm/types": "^1000.1.0",
"@pnpm/types": "^1000.1.1",
"@types/fs-extra": "^11.0.4",
"eslint": "^9.18.0",
"eslint": "^9.20.1",
"esno": "^0.16.3",
"type-fest": "^4.32.0"
"type-fest": "^4.35.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
54 changes: 27 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@
"devDependencies": {
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-modules-commonjs": "^7.26.3",
"@babel/plugin-transform-runtime": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"@babel/plugin-transform-runtime": "^7.26.9",
"@babel/preset-env": "^7.26.9",
"@babel/preset-typescript": "^7.26.0",
"@babel/runtime": "^7.26.0",
"@babel/traverse": "^7.26.4",
"@babel/types": "^7.26.3",
"@babel/runtime": "^7.26.9",
"@babel/traverse": "^7.26.9",
"@babel/types": "^7.26.9",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.1",
"@eslint/config-inspector": "^0.7.1",
"@eslint/js": "9.17.0",
"@eslint/config-inspector": "^1.0.0",
"@eslint/js": "9.20.0",
"@glimmer-workspace/benchmark-env": "workspace:*",
"@glimmer-workspace/build-support": "workspace:*",
"@glimmer-workspace/eslint-plugin": "workspace:*",
Expand All @@ -63,7 +63,7 @@
"@glimmer-workspace/repo-metadata": "workspace:*",
"@glimmer/env": "0.1.7",
"@pnpm/meta-updater": "^2.0.3",
"@pnpm/workspace.find-packages": "^1000.0.3",
"@pnpm/workspace.find-packages": "^1000.0.10",
"@rollup/plugin-sucrase": "^5.0.2",
"@rollup/plugin-terser": "^0.4.4",
"@tsconfig/strictest": "^2.0.5",
Expand All @@ -74,11 +74,11 @@
"@types/eslint-community__eslint-plugin-eslint-comments": "workspace:*",
"@types/eslint-plugin-qunit": "workspace:*",
"@types/eslint__eslintrc": "^2.1.2",
"@types/node": "^20.17.10",
"@types/node": "^22.13.4",
"@types/preval.macro": "^3.0.2",
"@types/qunit": "^2.19.12",
"@typescript-eslint/parser": "^8.20.0",
"@typescript-eslint/utils": "^8.20.0",
"@typescript-eslint/parser": "^8.24.1",
"@typescript-eslint/utils": "^8.24.1",
"amd-name-resolver": "^1.3.1",
"auto-dist-tag": "^2.1.1",
"babel-plugin-macros": "^3.1.0",
Expand All @@ -89,48 +89,48 @@
"ember-cli": "~4.12.3",
"ember-cli-browserstack": "^2.1.0",
"ensure-posix-path": "^1.1.1",
"eslint": "^9.18.0",
"eslint": "^9.20.1",
"eslint-config-flat-gitignore": "^1.0.0",
"eslint-config-prettier": "10.0.1",
"eslint-import-resolver-typescript": "^3.7.0",
"eslint-import-resolver-typescript": "^3.8.2",
"eslint-interactive": "^11.1.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-import-x": "^4.6.1",
"eslint-plugin-jsonc": "^2.18.2",
"eslint-plugin-jsonc": "^2.19.1",
"eslint-plugin-n": "17.15.1",
"eslint-plugin-qunit": "^8.1.2",
"eslint-plugin-regexp": "^2.7.0",
"eslint-plugin-simple-import-sort": "12.1.1",
"eslint-plugin-unused-imports": "4.1.4",
"esyes": "^1.0.3",
"execa": "^7.2.0",
"fast-glob": "^3.3.2",
"fast-glob": "^3.3.3",
"glob": "^10.4.5",
"globals": "^15.14.0",
"globals": "^15.15.0",
"js-yaml": "^4.1.0",
"knip": "^5.41.1",
"knip": "^5.44.4",
"loader.js": "^4.7.0",
"mkdirp": "^3.0.1",
"npm-run-all": "^4.1.5",
"prettier": "^3.4.2",
"prettier": "^3.5.1",
"preval.macro": "^5.0.0",
"puppeteer": "23.11.1",
"puppeteer-chromium-resolver": "^23.0.0",
"qunit": "^2.23.1",
"qunit": "^2.24.1",
"release-plan": "0.11.0",
"rimraf": "^5.0.10",
"rollup": "^4.31.0-0",
"semver": "^7.6.3",
"rollup": "^4.34.8",
"semver": "^7.7.1",
"testem-failure-only-reporter": "^1.0.0",
"toml": "^3.0.0",
"tracerbench": "^8.0.1",
"ts-node": "^10.9.2",
"turbo": "^2.3.3",
"turbo": "^2.4.2",
"typescript": "^5.7.3",
"typescript-eslint": "^8.19.0",
"vite": "^6.0.10",
"vitest": "^3.0.4",
"zx": "^8.3.0"
"typescript-eslint": "^8.24.1",
"vite": "^6.1.1",
"vitest": "^3.0.6",
"zx": "^8.3.2"
},
"changelog": {
"repo": "glimmerjs/glimmer-vm",
Expand All @@ -148,7 +148,7 @@
"packageManager": "[email protected]",
"pnpm": {
"notes": {
"override:@glimemr/syntax": "when we run prettier, we want to use our local copy of prettier, not the one it declared in its package.json. This ensures that we don't accidentally break prettier as we make changes to @glimmer/syntax"
"override:@glimmer/syntax": "when we run prettier, we want to use our local copy of prettier, not the one it declared in its package.json. This ensures that we don't accidentally break prettier as we make changes to @glimmer/syntax"
},
"overrides": {
"@glimmer/syntax": "workspace:*",
Expand Down
6 changes: 3 additions & 3 deletions packages/@glimmer-workspace/benchmark-env/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"@glimmer-workspace/env": "workspace:*",
"@glimmer/debug-util": "workspace:*",
"@glimmer/interfaces": "workspace:*",
"eslint": "^9.18.0",
"eslint": "^9.20.1",
"publint": "^0.3.2",
"rollup": "^4.31.0-0",
"typescript": "*"
"rollup": "^4.34.8",
"typescript": "^5.7.3"
},
"engines": {
"node": ">=20.9.0"
Expand Down
24 changes: 12 additions & 12 deletions packages/@glimmer-workspace/build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,28 @@
"scripts": {},
"dependencies": {
"@glimmer/local-debug-babel-plugin": "workspace:*",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-replace": "^5.0.5",
"@rollup/plugin-commonjs": "^28.0.2",
"@rollup/plugin-node-resolve": "^16.0.0",
"@rollup/plugin-replace": "^6.0.2",
"@rollup/plugin-swc": "^0.4.0",
"@rollup/plugin-terser": "^0.4.4",
"@rollup/plugin-typescript": "^12.1.1",
"@rollup/plugin-typescript": "^12.1.2",
"magic-string": "^0.30.0",
"postcss": "^8.4.31",
"rollup": "^4.31.0-0",
"postcss": "^8.5.3",
"rollup": "^4.34.8",
"rollup-plugin-dts": "^6.1.1",
"rollup-plugin-insert": "^1.3.2",
"rollup-plugin-polyfill-node": "^0.13.0",
"rollup-plugin-postcss": "^4.0.2",
"tslib": "^2.8.1",
"unplugin-fonts": "^1.0.3",
"vite": "^5.4.10",
"zx": "^8.2.2"
"unplugin-fonts": "^1.3.1",
"vite": "^6.1.1",
"zx": "^8.3.2"
},
"devDependencies": {
"@types/node": "^20.9.4",
"eslint": "^9.18.0",
"typescript": "*"
"@types/node": "^22.13.4",
"eslint": "^9.20.1",
"typescript": "^5.7.3"
},
"engines": {
"node": ">=20.9.0"
Expand Down
14 changes: 7 additions & 7 deletions packages/@glimmer-workspace/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,28 @@
"scripts": {},
"dependencies": {
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.18.0",
"@eslint/js": "^9.20.0",
"@glimmer-workspace/repo-metadata": "workspace:*",
"@pnpm/workspace.find-packages": "^1000.0.5",
"@typescript-eslint/parser": "^8.20.0",
"@pnpm/workspace.find-packages": "^1000.0.10",
"@typescript-eslint/parser": "^8.24.1",
"eslint-config-prettier": "10.0.1",
"eslint-plugin-import-x": "^4.6.1",
"eslint-plugin-jsonc": "^2.18.2",
"eslint-plugin-jsonc": "^2.19.1",
"eslint-plugin-n": "^17.15.1",
"eslint-plugin-qunit": "^8.1.2",
"eslint-plugin-regexp": "^2.7.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-unused-imports": "^4.1.4",
"eslint-utils": "^3.0.0",
"typescript-eslint": "^8.20.0"
"typescript-eslint": "^8.24.1"
},
"peerDependencies": {
"eslint": ">=9.18.0"
},
"devDependencies": {
"@types/eslint": "9.6.1",
"@types/eslint-utils": "^3.0.5",
"@types/node": "22.10.2",
"eslint": "^9.18.0"
"@types/node": "^22.13.4",
"eslint": "^9.20.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"dependencies": {
"@glimmer/syntax": "workspace:*",
"execa": "^9.5.2",
"prettier": "^3.4.2"
"prettier": "^3.5.1"
},
"devDependencies": {
"@glimmer-workspace/repo-metadata": "workspace:*",
"vitest": "^3.0.4"
"vitest": "^3.0.6"
}
}
4 changes: 2 additions & 2 deletions packages/@glimmer-workspace/integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
"@simple-dom/serializer": "^1.4.0",
"@simple-dom/void-map": "^1.4.0",
"js-reporters": "^2.1.0",
"qunit": "^2.19.4",
"qunit": "^2.24.1",
"simple-html-tokenizer": "^0.5.11"
},
"devDependencies": {
"@glimmer/constants": "workspace:*",
"@glimmer/debug-util": "workspace:*",
"@glimmer/local-debug-flags": "workspace:*",
"@types/js-reporters": "workspace:*",
"@types/qunit": "^2.19.9",
"@types/qunit": "^2.19.12",
"dom-types": "^1.1.2"
}
}
2 changes: 1 addition & 1 deletion packages/@glimmer-workspace/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
},
"devDependencies": {
"@glimmer/debug-util": "workspace:*",
"eslint": "^9.18.0"
"eslint": "^9.20.1"
}
}
3 changes: 2 additions & 1 deletion packages/@glimmer/compiler/lib/compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ interface Crypto {
export const defaultId: TemplateIdFn = (() => {
const req = (
typeof module === 'object' && typeof module.require === 'function'
? module.require
? // eslint-disable-next-line @typescript-eslint/unbound-method
module.require
: globalThis.require
) as typeof require | undefined;

Expand Down
8 changes: 4 additions & 4 deletions packages/@glimmer/compiler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
"@glimmer/debug": "workspace:*",
"@glimmer/debug-util": "workspace:*",
"@glimmer/local-debug-flags": "workspace:*",
"@types/node": "^20.9.4",
"eslint": "^9.18.0",
"@types/node": "^22.13.4",
"eslint": "^9.20.1",
"publint": "^0.3.2",
"rollup": "^4.31.0-0",
"typescript": "*"
"rollup": "^4.34.8",
"typescript": "^5.7.3"
},
"engines": {
"node": ">= 18.0.0"
Expand Down
Loading
Loading