Skip to content

Commit

Permalink
Merge pull request #1832 from NullVoxPopuli/upgrade-stragglers
Browse files Browse the repository at this point in the history
Stragglers
  • Loading branch information
NullVoxPopuli authored Oct 6, 2024
2 parents 71f4ebe + 69ba4c2 commit 25aee19
Show file tree
Hide file tree
Showing 19 changed files with 327 additions and 284 deletions.
8 changes: 4 additions & 4 deletions apps/repl/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"build-time-reporter-webpack-plugin": "^1.4.3",
"chalk": "^5.3.0",
"common-tags": "^1.8.2",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"ember-async-data": "1.0.3",
"ember-cli": "~5.12.0",
"ember-cli-babel": "^8.2.0",
Expand All @@ -99,7 +99,7 @@
"eslint-plugin-ember": "^12.2.1",
"execa": "^8.0.1",
"file-loader": "^6.2.0",
"fractal-page-object": "^0.5.0",
"fractal-page-object": "^1.0.0",
"loader.js": "^4.7.0",
"onp": "^2.0.4",
"prettier": "^3.3.3",
Expand All @@ -110,7 +110,7 @@
"qunit-dom": "3.2.1",
"rollup": "^4.24.0",
"testem-failure-only-reporter": "^1.0.0",
"type-fest": "4.20.1",
"type-fest": "4.26.1",
"typescript": "^5.4.5",
"vfile": "^6.0.1",
"webpack": ">= 5.92.0",
Expand Down Expand Up @@ -151,7 +151,7 @@
"ember-resources": "^7.0.1",
"ember-statechart-component": "6.1.2",
"highlight.js": "^11.9.0",
"highlightjs-glimmer": "^2.2.1",
"highlightjs-glimmer": "^2.2.2",
"html-to-image": "^1.11.11",
"kolay": "^1.2.2",
"limber-ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion apps/tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"@typescript-eslint/parser": "^8.8.0",
"broccoli-asset-rev": "^3.0.0",
"broccoli-funnel": "^3.0.8",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"ember-auto-import": "^2.7.2",
"ember-cached-decorator-polyfill": "^1.0.2",
"ember-cli": "~5.12.0",
Expand Down
2 changes: 1 addition & 1 deletion dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"devDependencies": {
"@babel/core": "^7.25.7",
"@nullvoxpopuli/eslint-configs": "^4.0.0",
"@types/node": "^20.12.12",
"@types/node": "^22.7.4",
"@types/yargs": "^17.0.32",
"eslint": "^8.55.0",
"prettier": "^3.3.3",
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"devDependencies": {
"@babel/core": "^7.25.7",
"@nullvoxpopuli/eslint-configs": "^4.0.0",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"dev-tools": "workspace:*",
"eslint": "^8.55.0",
"prettier": "^3.3.3",
Expand Down Expand Up @@ -59,6 +59,9 @@
"rollup",
"rsvp"
]
},
"patchedDependencies": {
"browserslist-generator": "patches/browserslist-generator.patch"
}
}
}
4 changes: 2 additions & 2 deletions packages/app-support/codemirror/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"@nullvoxpopuli/eslint-configs": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"concurrently": "^8.2.2",
"esbuild": "0.22.0",
"concurrently": "^9.0.1",
"esbuild": "0.24.0",
"esbuild-plugin-alias": "^0.2.1",
"eslint": "^8.55.0",
"prettier": "^3.3.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-support/limber-ui/addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"babel-plugin-ember-template-compilation": "^2.3.0",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"ember-async-data": "1.0.3",
"ember-cli-htmlbars": "^6.3.0",
"ember-modifier": "^4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-support/limber-ui/test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@nullvoxpopuli/eslint-configs": "^4.0.0",
"@typescript-eslint/parser": "^8.8.0",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"ember-auto-import": "^2.7.2",
"ember-cli": "~5.12.0",
"ember-cli-babel": "^8.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-support/styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@babel/core": "^7.25.7",
"@nullvoxpopuli/eslint-configs": "^4.0.0",
"autoprefixer": "^10.4.17",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"eslint": "^8.55.0",
"postcss": "^8.4.32",
"prettier": "^3.3.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-support/transpilation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@typescript-eslint/parser": "^8.8.0",
"babel-loader": "^9.2.1",
"ember-source": ">= 5.10.2",
"esbuild": "0.22.0",
"esbuild": "0.24.0",
"eslint": "^8.55.0",
"prettier": "^3.3.3",
"prettier-plugin-ember-template-tag": "2.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/consts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@nullvoxpopuli/eslint-configs": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"eslint": "^8.55.0",
"prettier": "^3.3.3",
"prettier-plugin-ember-template-tag": "2.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/ember-repl/addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"@nullvoxpopuli/eslint-configs": "^4.0.0",
"@nullvoxpopuli/limber-untyped": "workspace:*",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-commonjs": "^28.0.0",
"@tsconfig/ember": "^3.0.7",
"@types/babel__core": "^7.20.5",
"@types/babel__standalone": "^7.1.7",
Expand All @@ -133,7 +133,7 @@
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"ember-resources": "^7.0.0",
"ember-source": ">= 5.10.2",
"ember-template-imports": "^4.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-repl/test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@types/rsvp": "^4.0.9",
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"ember-auto-import": "^2.7.2",
"ember-cli": "~5.12.0",
"ember-cli-app-version": "^7.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/horizon-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@nullvoxpopuli/eslint-configs": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"eslint": "^8.55.0",
"prettier": "^3.3.3",
"prettier-plugin-ember-template-tag": "2.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/syntax/glimdown/codemirror/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"codemirror": "^6.0.1",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"eslint": "^8.55.0",
"prettier": "^3.3.3",
"rollup": "^4.24.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/syntax/glimmer-js/codemirror/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"codemirror": "^6.0.1",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"eslint": "^8.55.0",
"prettier": "^3.3.3",
"rollup": "^4.24.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/syntax/glimmer/codemirror/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"codemirror": "^6.0.1",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"eslint": "^8.55.0",
"prettier": "^3.3.3",
"rollup": "^4.24.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/syntax/glimmer/lezer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"codemirror": "^6.0.1",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"eslint": "^8.55.0",
"prettier": "^3.3.3",
"rollup": "^4.24.0",
Expand Down
12 changes: 12 additions & 0 deletions patches/browserslist-generator.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/dist/esm/index.js b/dist/esm/index.js
index 851e5036b68e3f2c55a982c4fc47ff5e4dafe6a0..a1422ca8e23011718ba892d0ca9ec55f346340dd 100644
--- a/dist/esm/index.js
+++ b/dist/esm/index.js
@@ -1,6 +1,6 @@
import Browserslist from 'browserslist';
import { feature, features } from 'caniuse-lite';
-import * as compatData from '@mdn/browser-compat-data' assert { type: 'json' };
+import * as compatData from '@mdn/browser-compat-data' with { type: 'json' };
import objectPath from 'object-path';
import { coerce, lt, gt, gte, lte } from 'semver';
import { UAParser } from 'ua-parser-js';
Loading

0 comments on commit 25aee19

Please sign in to comment.