Skip to content

Commit a843d7d

Browse files
NullVoxPopuliNullVoxPopuli
authored
Merge pull request #117 from universal-ember/updates
Update lint and some build deps
2 parents a2c5a8b + 587357d commit a843d7d

File tree

16 files changed

+1265
-1275
lines changed

16 files changed

+1265
-1275
lines changed

‎docs/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
"docs:watch": "typedoc --options ./typedoc.config.json --watch"
1010
},
1111
"devDependencies": {
12-
"typedoc": "^0.25.0",
13-
"typedoc-github-wiki-theme": "^1.0.1",
14-
"typedoc-gitlab-wiki-theme": "^1.0.0",
15-
"typedoc-plugin-markdown": "^3.14.0",
12+
"typedoc": "^0.26.7",
13+
"typedoc-github-wiki-theme": "^2.0.0",
14+
"typedoc-gitlab-wiki-theme": "^2.0.1",
15+
"typedoc-plugin-markdown": "^4.2.7",
1616
"typedoc-plugin-markdown-pages": "^0.3.0",
17-
"typedoc-plugin-mdn-links": "^3.0.3",
18-
"typescript": "^5.0.0"
17+
"typedoc-plugin-mdn-links": "^3.2.12",
18+
"typescript": "^5.6.2"
1919
},
2020
"engines": {
2121
"node": ">= 18"

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
},
1919
"devDependencies": {
2020
"@glint/core": "^1.2.1",
21-
"concurrently": "^8.2.2",
21+
"concurrently": "^9.0.1",
2222
"prettier": "^3.0.3",
2323
"prettier-plugin-ember-template-tag": "^2.0.0",
24-
"release-plan": "^0.8.0"
24+
"release-plan": "^0.9.2"
2525
},
2626
"volta": {
2727
"node": "20.11.1",

‎pnpm-lock.yaml

Lines changed: 1190 additions & 1212 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎reactiveweb/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
},
6060
"dependencies": {
6161
"@embroider/addon-shim": "^1.8.6",
62-
"@embroider/macros": "^1.13.4",
63-
"decorator-transforms": "^1.0.3",
62+
"@embroider/macros": "^1.16.6",
63+
"decorator-transforms": "^2.0.0",
6464
"ember-async-data": "^1.0.3",
6565
"ember-cached-decorator-polyfill": "^1.0.2",
6666
"ember-resources": ">= 6.4.2"
@@ -79,25 +79,25 @@
7979
"@glint/environment-ember-loose": "^1.2.1",
8080
"@glint/environment-ember-template-imports": "^1.2.1",
8181
"@glint/template": "^1.2.1",
82-
"@nullvoxpopuli/eslint-configs": "^3.2.2",
82+
"@nullvoxpopuli/eslint-configs": "^4.2.0",
8383
"@rollup/plugin-babel": "^6.0.4",
8484
"@tsconfig/ember": "^3.0.1",
85-
"@typescript-eslint/eslint-plugin": "^7.0.0",
86-
"@typescript-eslint/parser": "^7.0.0",
87-
"babel-plugin-ember-template-compilation": "^2.2.0",
88-
"concurrently": "^8.2.2",
85+
"@typescript-eslint/eslint-plugin": "^8.6.0",
86+
"@typescript-eslint/parser": "^8.6.0",
87+
"babel-plugin-ember-template-compilation": "^2.3.0",
88+
"concurrently": "^9.0.1",
8989
"ember-source": "~5.5.0",
9090
"ember-template-lint": "^6.0.0",
9191
"eslint": "^8.52.0",
9292
"eslint-config-prettier": "^9.0.0",
9393
"eslint-plugin-ember": "^12.0.0",
94-
"eslint-plugin-n": "^16.2.0",
94+
"eslint-plugin-n": "^17.10.2",
9595
"eslint-plugin-prettier": "^5.0.1",
9696
"prettier": "^3.0.3",
9797
"prettier-plugin-ember-template-tag": "^2.0.0",
98-
"rollup": "^4.9.5",
98+
"rollup": "^4.21.3",
9999
"rollup-plugin-copy": "^3.5.0",
100-
"typescript": "^5.0.4"
100+
"typescript": "^5.6.2"
101101
},
102102
"publishConfig": {
103103
"registry": "https://registry.npmjs.org"

‎reactiveweb/rollup.config.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { Addon } from "@embroider/addon-dev/rollup";
2+
13
import { babel } from "@rollup/plugin-babel";
24
import copy from "rollup-plugin-copy";
3-
import { Addon } from "@embroider/addon-dev/rollup";
45

56
const addon = new Addon({
67
srcDir: "src",

‎reactiveweb/src/-private/types.ts

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,26 @@ export interface Class<Instance> {
1414
new (...args: unknown[]): Instance;
1515
}
1616

17-
// This is a bit of a lie, because we don't have an easy way to
18-
// represent an object with no properties.
19-
export type EmptyObject = {};
17+
// --- Type utilities for component signatures --- //
18+
// Type-only "symbol" to use with `EmptyObject` below, so that it is *not*
19+
// equivalent to an empty interface.
20+
declare const Empty: unique symbol;
21+
22+
/**
23+
* This provides us a way to have a "fallback" which represents an empty object,
24+
* without the downsides of how TS treats `{}`. Specifically: this will
25+
* correctly leverage "excess property checking" so that, given a component
26+
* which has no named args, if someone invokes it with any named args, they will
27+
* get a type error.
28+
*
29+
* @internal This is exported so declaration emit works (if it were not emitted,
30+
* declarations which fall back to it would not work). It is *not* intended for
31+
* public usage, and the specific mechanics it uses may change at any time.
32+
* The location of this export *is* part of the public API, because moving it
33+
* will break existing declarations, but is not legal for end users to import
34+
* themselves, so ***DO NOT RELY ON IT***.
35+
*/
36+
export type EmptyObject = { [Empty]?: true };
2037

2138
export type GetOrElse<Obj, K, Fallback> = K extends keyof Obj ? Obj[K] : Fallback;
2239

‎reactiveweb/src/ember-concurrency.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* eslint-disable @typescript-eslint/no-explicit-any */
2-
/* eslint-disable @typescript-eslint/ban-types */
32
/* eslint-disable ember/no-get */
43
import { assert } from '@ember/debug';
54
import { associateDestroyableChild, registerDestructor } from '@ember/destroyable';

‎reactiveweb/src/link.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ function linkDecoratorFactory(child: Class<unknown>) {
126126

127127
function linkDecorator(
128128
_prototype: object,
129-
key: string | Symbol,
129+
key: string | symbol,
130130
descriptor: Stage1DecoratorDescriptor | undefined,
131131
explicitChild?: Class<unknown>
132132
): void {

‎reactiveweb/src/resource/modifier/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ export function modifier<S extends { Element?: Element; Args?: object }>(
200200
export function modifier(fn: (element: Element, ...args: unknown[]) => void): ModifierLike<{
201201
Element: Element;
202202
Args: {
203+
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
203204
Named: {};
204205
Positional: [];
205206
};
@@ -211,6 +212,7 @@ export function modifier(fn: (element: Element, ...args: unknown[]) => void): Mo
211212
return fn as unknown as ModifierLike<{
212213
Element: Element;
213214
Args: {
215+
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
214216
Named: {};
215217
Positional: [];
216218
};

‎reactiveweb/src/utils.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable @typescript-eslint/ban-types */
21
import type { ArgsWrapper, Thunk } from 'ember-resources';
32

43
export const DEFAULT_THUNK = () => [];

‎reactiveweb/unpublished-development-types/index.d.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,3 @@
44
import 'ember-source/types';
55
import 'ember-source/types/preview';
66
import '@glint/environment-ember-loose';
7-
8-
declare module '@glint/environment-ember-loose/registry' {
9-
// Remove this once entries have been added! 👇
10-
// eslint-disable-next-line @typescript-eslint/no-empty-interface
11-
export default interface Registry {
12-
// Add any registry entries from other addons here that your addon itself uses (in non-strict mode templates)
13-
// See https://typed-ember.gitbook.io/glint/using-glint/ember/using-addons
14-
}
15-
}

‎tests/min-supported/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,22 @@
3737
"@ember/optional-features": "^2.0.0",
3838
"@ember/string": "^3.1.1",
3939
"@ember/test-helpers": "^3.2.1",
40-
"@embroider/compat": "^3.2.3",
41-
"@embroider/core": "^3.3.0",
42-
"@embroider/webpack": "^4.0.4",
40+
"@embroider/compat": "^3.6.1",
41+
"@embroider/core": "^3.4.15",
42+
"@embroider/webpack": "^4.0.5",
4343
"@glimmer/component": "^1.1.2",
4444
"@glimmer/tracking": "^1.1.2",
4545
"@glint/environment-ember-loose": "^1.2.1",
4646
"@glint/template": "^1.2.1",
4747
"@tsconfig/ember": "^3.0.1",
4848
"@types/qunit": "^2.19.7",
4949
"@types/rsvp": "^4.0.6",
50-
"@typescript-eslint/eslint-plugin": "^6.9.0",
51-
"@typescript-eslint/parser": "^6.9.0",
50+
"@typescript-eslint/eslint-plugin": "^8.6.0",
51+
"@typescript-eslint/parser": "^8.6.0",
5252
"broccoli-asset-rev": "^3.0.0",
53-
"concurrently": "^8.2.2",
53+
"concurrently": "^9.0.1",
5454
"ember-async-data": "0.7.1",
55-
"ember-auto-import": "^2.6.3",
55+
"ember-auto-import": "^2.8.0",
5656
"ember-cli": "~4.12.1",
5757
"ember-cli-app-version": "^6.0.1",
5858
"ember-cli-babel": "^8.2.0",
@@ -73,7 +73,7 @@
7373
"eslint": "^8.52.0",
7474
"eslint-config-prettier": "^9.0.0",
7575
"eslint-plugin-ember": "^12.0.0",
76-
"eslint-plugin-n": "^16.2.0",
76+
"eslint-plugin-n": "^17.10.2",
7777
"eslint-plugin-prettier": "^5.0.1",
7878
"eslint-plugin-qunit": "^8.0.1",
7979
"graphql": "^16.9.0",
@@ -83,11 +83,11 @@
8383
"qunit": "^2.20.0",
8484
"qunit-dom": "^3.0.0",
8585
"reactiveweb": "workspace:*",
86-
"stylelint": "^15.11.0",
87-
"stylelint-config-standard": "^34.0.0",
88-
"stylelint-prettier": "^4.0.2",
86+
"stylelint": "^16.9.0",
87+
"stylelint-config-standard": "^36.0.1",
88+
"stylelint-prettier": "^5.0.2",
8989
"tracked-built-ins": "^3.3.0",
90-
"typescript": "^5.2.2",
90+
"typescript": "^5.6.2",
9191
"webpack": "^5.89.0"
9292
},
9393
"engines": {
@@ -98,12 +98,12 @@
9898
},
9999
"dependencies": {
100100
"@ember/test-waiters": "^3.1.0",
101-
"@nullvoxpopuli/eslint-configs": "^3.2.2",
101+
"@nullvoxpopuli/eslint-configs": "^4.2.0",
102102
"ember-cached-decorator-polyfill": "^1.0.2",
103103
"ember-concurrency": "^3.1.1",
104104
"ember-modify-based-class-resource": "^1.1.0",
105105
"ember-resources": "^6.5.1",
106-
"msw": "^2.4.1"
106+
"msw": "^2.4.7"
107107
},
108108
"msw": {
109109
"workerDirectory": "public"

‎tests/test-app/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
"@ember/optional-features": "^2.0.0",
3939
"@ember/string": "^3.1.1",
4040
"@ember/test-helpers": "^4.0.2",
41-
"@embroider/compat": "^3.4.3",
42-
"@embroider/core": "^3.4.3",
43-
"@embroider/webpack": "^4.0.4",
41+
"@embroider/compat": "^3.6.1",
42+
"@embroider/core": "^3.4.15",
43+
"@embroider/webpack": "^4.0.5",
4444
"@glimmer/component": "^1.1.2",
4545
"@glimmer/tracking": "^1.1.2",
4646
"@glint/core": "^1.2.1",
@@ -50,11 +50,11 @@
5050
"@tsconfig/ember": "^3.0.1",
5151
"@types/qunit": "^2.19.7",
5252
"@types/rsvp": "^4.0.6",
53-
"@typescript-eslint/eslint-plugin": "^6.9.0",
54-
"@typescript-eslint/parser": "^6.9.0",
53+
"@typescript-eslint/eslint-plugin": "^8.6.0",
54+
"@typescript-eslint/parser": "^8.6.0",
5555
"broccoli-asset-rev": "^3.0.0",
56-
"concurrently": "^8.2.2",
57-
"ember-auto-import": "^2.7.2",
56+
"concurrently": "^9.0.1",
57+
"ember-auto-import": "^2.8.0",
5858
"ember-cli": "~5.4.0",
5959
"ember-cli-app-version": "^6.0.1",
6060
"ember-cli-babel": "^8.2.0",
@@ -74,7 +74,7 @@
7474
"eslint": "^8.52.0",
7575
"eslint-config-prettier": "^9.0.0",
7676
"eslint-plugin-ember": "^12.0.0",
77-
"eslint-plugin-n": "^16.2.0",
77+
"eslint-plugin-n": "^17.10.2",
7878
"eslint-plugin-prettier": "^5.0.1",
7979
"eslint-plugin-qunit": "^8.0.1",
8080
"graphql": "^16.9.0",
@@ -84,11 +84,11 @@
8484
"qunit": "^2.20.0",
8585
"qunit-dom": "^3.0.0",
8686
"reactiveweb": "workspace:*",
87-
"stylelint": "^15.11.0",
88-
"stylelint-config-standard": "^34.0.0",
89-
"stylelint-prettier": "^4.0.2",
87+
"stylelint": "^16.9.0",
88+
"stylelint-config-standard": "^36.0.1",
89+
"stylelint-prettier": "^5.0.2",
9090
"tracked-built-ins": "^3.3.0",
91-
"typescript": "^5.2.2",
91+
"typescript": "^5.6.2",
9292
"webpack": "^5.89.0"
9393
},
9494
"engines": {
@@ -99,12 +99,12 @@
9999
},
100100
"dependencies": {
101101
"@ember/test-waiters": "^3.1.0",
102-
"@embroider/macros": "^1.13.4",
103-
"@nullvoxpopuli/eslint-configs": "^3.2.2",
102+
"@embroider/macros": "^1.16.6",
103+
"@nullvoxpopuli/eslint-configs": "^4.2.0",
104104
"ember-concurrency": "^3.1.1",
105105
"ember-modify-based-class-resource": "^1.1.0",
106106
"ember-resources": "^6.5.1",
107-
"msw": "^2.4.1"
107+
"msw": "^2.4.7"
108108
},
109109
"msw": {
110110
"workerDirectory": "public"

‎tests/test-app/tests/utils/ember-concurrency/js-test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/no-unused-expressions */
12
/* eslint-disable @typescript-eslint/no-explicit-any */
23
import { tracked } from '@glimmer/tracking';
34
import { settled } from '@ember/test-helpers';

‎tests/test-app/tests/utils/function/js-test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/no-unused-expressions */
12
import { tracked } from '@glimmer/tracking';
23
import { destroy, isDestroyed, isDestroying } from '@ember/destroyable';
34
import { settled } from '@ember/test-helpers';

‎tests/test-app/types/global.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import '@glint/environment-ember-loose';
33
import type PageTitle from 'ember-page-title/template-registry';
44

55
declare module '@glint/environment-ember-loose/registry' {
6+
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
67
export default interface Registry extends PageTitle {
78
/* your local loose-mode entries here */
89
}

0 commit comments

Comments
 (0)