Skip to content

Commit eed8a0d

Browse files
NullVoxPopuliNullVoxPopuli
authored
Merge pull request #273 from NullVoxPopuli/update-dev-dependencies
Upgrade dev dependencies
2 parents 4a29d60 + 4d821dd commit eed8a0d

16 files changed

Lines changed: 2647 additions & 2610 deletions

File tree

‎addon/.eslintrc.js‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,24 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
6-
parserOptions: {
7-
ecmaVersion: 2018,
8-
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
11-
},
12-
},
13-
plugins: ['ember'],
14-
extends: [
15-
'eslint:recommended',
16-
'plugin:ember/recommended',
17-
'plugin:prettier/recommended',
18-
],
19-
env: {
20-
browser: true,
21-
},
22-
rules: {},
5+
236
overrides: [
24-
// node files
257
{
26-
files: [
27-
'./.eslintrc.js',
28-
'./.prettierrc.js',
29-
'./.template-lintrc.js',
30-
'./addon-main.js',
31-
'./blueprints/*/index.js',
32-
'./config/**/*.js',
8+
files: ['src/**/*.{js,ts}'],
9+
parser: '@typescript-eslint/parser',
10+
plugins: ['ember'],
11+
extends: [
12+
'eslint:recommended',
13+
'plugin:ember/recommended',
14+
'plugin:prettier/recommended',
3315
],
16+
env: {
17+
browser: true,
18+
},
19+
},
20+
// node files
21+
{
22+
files: ['./*.cjs', './addon-main.js'],
3423
parserOptions: {
3524
sourceType: 'script',
3625
},

‎addon/package.json‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,29 @@
3434
"prepublishOnly": "rollup --config"
3535
},
3636
"dependencies": {
37-
"@embroider/addon-shim": "^1.8.6"
37+
"@embroider/addon-shim": "^1.8.7"
3838
},
3939
"peerDependencies": {
4040
"ember-source": ">= 3.28.0"
4141
},
4242
"devDependencies": {
43-
"@babel/core": "^7.16.12",
44-
"@babel/plugin-proposal-class-properties": "^7.16.7",
45-
"@babel/plugin-proposal-decorators": "^7.16.7",
46-
"@embroider/addon-dev": "^4.1.1",
47-
"@rollup/plugin-babel": "^5.3.0",
48-
"babel-eslint": "^10.1.0",
49-
"ember-template-lint": "^3.6.0",
50-
"eslint": "^7.32.0",
51-
"eslint-config-prettier": "^8.3.0",
52-
"eslint-plugin-ember": "^10.5.4",
43+
"@babel/core": "^7.23.6",
44+
"@babel/eslint-parser": "^7.23.3",
45+
"@babel/plugin-proposal-class-properties": "^7.18.6",
46+
"@babel/plugin-proposal-decorators": "^7.23.6",
47+
"@embroider/addon-dev": "^4.1.3",
48+
"@rollup/plugin-babel": "^6.0.4",
49+
"@typescript-eslint/eslint-plugin": "^6.15.0",
50+
"@typescript-eslint/parser": "^6.15.0",
51+
"ember-template-lint": "^5.13.0",
52+
"eslint": "^8.56.0",
53+
"eslint-config-prettier": "^9.1.0",
54+
"eslint-plugin-ember": "^11.12.0",
5355
"eslint-plugin-node": "^11.1.0",
54-
"eslint-plugin-prettier": "^3.4.1",
56+
"eslint-plugin-prettier": "^5.1.2",
5557
"npm-run-all": "^4.1.5",
56-
"prettier": "^2.3.2",
57-
"rollup": "^2.67.0"
58+
"prettier": "^3.1.1",
59+
"rollup": "^4.9.1"
5860
},
5961
"engines": {
6062
"node": "16.* || >= 18"

addon/rollup.config.js renamed to addon/rollup.config.mjs

File renamed without changes.

‎addon/src/services/page-title.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ export default class PageTitleService extends Service {
5656
let defaultPrepend = this._defaultConfig.prepend;
5757
let defaultReplace = this._defaultConfig.replace;
5858

59+
token.previous ??= null;
60+
token.next ??= null;
61+
5962
if (token.separator == null) {
6063
token.separator = defaultSeparator;
6164
}
@@ -100,7 +103,7 @@ export default class PageTitleService extends Service {
100103

101104
let previous = this.tokens.slice(-1)[0];
102105
if (previous) {
103-
token.previous = previous;
106+
token.previous = previous ?? null;
104107
previous.next = token;
105108
this.inheritFromPrevious(token);
106109
}
@@ -234,7 +237,7 @@ export default class PageTitleService extends Service {
234237
}
235238
assert(
236239
'[ember-page-title]: Multiple title elements found. Check for other addons like ember-cli-head updating <title> as well.',
237-
document.head.querySelectorAll('title').length <= 1
240+
document.head.querySelectorAll('title').length <= 1,
238241
);
239242
}
240243

‎docs/.eslintrc.js‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,26 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
6-
parserOptions: {
7-
ecmaVersion: 2018,
8-
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
11-
},
12-
},
13-
plugins: ['ember'],
14-
extends: [
15-
'eslint:recommended',
16-
'plugin:ember/recommended',
17-
'plugin:prettier/recommended',
18-
],
19-
env: {
20-
browser: true,
21-
},
22-
rules: {},
235
overrides: [
6+
{
7+
files: ['{app,tests}/**/*.{js,ts}'],
8+
parser: '@typescript-eslint/parser',
9+
plugins: ['ember'],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended',
13+
'plugin:prettier/recommended',
14+
],
15+
env: {
16+
browser: true,
17+
},
18+
},
2419
// node files
2520
{
2621
files: [
27-
'./.eslintrc.js',
28-
'./.prettierrc.js',
29-
'./.template-lintrc.js',
30-
'./ember-cli-build.js',
31-
'./index.js',
32-
'./testem.js',
22+
'./*.{cjs,js}',
3323
'./blueprints/*/index.js',
34-
'./config/**/*.js',
24+
'./config/**/*.{cjs,js}',
3525
],
3626
parserOptions: {
3727
sourceType: 'script',

‎docs/app/helpers/highlight.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ export default helper(function (params) {
1616
})
1717
.replace(/[a-z]+\.[a-z]+/g, function (title) {
1818
return '<span class="literal">' + title + '</span>';
19-
})
19+
}),
2020
);
2121
});

‎docs/package.json‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,44 +27,46 @@
2727
"release": "standard-version"
2828
},
2929
"devDependencies": {
30+
"@babel/eslint-parser": "^7.23.3",
3031
"@ember/optional-features": "^2.0.0",
3132
"@ember/string": "^3.1.1",
32-
"@ember/test-helpers": "^2.4.2",
33+
"@ember/test-helpers": "^3.2.1",
3334
"@glimmer/component": "^1.0.4",
3435
"@glimmer/tracking": "^1.0.4",
35-
"babel-eslint": "^10.1.0",
36+
"@typescript-eslint/eslint-plugin": "^6.15.0",
37+
"@typescript-eslint/parser": "^6.15.0",
3638
"broccoli-asset-rev": "^3.0.0",
3739
"ember-auto-import": "^2.0.0",
38-
"ember-cli": "~3.28.3",
39-
"ember-cli-babel": "^7.26.6",
40-
"ember-cli-code-coverage": "^1.0.0",
40+
"ember-cli": "~4.12.1",
41+
"ember-cli-babel": "^8.2.0",
42+
"ember-cli-code-coverage": "^2.0.3",
4143
"ember-cli-dependency-checker": "^3.2.0",
4244
"ember-cli-github-pages": "^0.2.2",
43-
"ember-cli-htmlbars": "^5.7.1",
45+
"ember-cli-htmlbars": "^6.3.0",
4446
"ember-cli-inject-live-reload": "^2.1.0",
45-
"ember-cli-sass": "^10.0.1",
47+
"ember-cli-sass": "^11.0.1",
4648
"ember-cli-terser": "^4.0.2",
47-
"ember-cli-update": "^1.0.1",
49+
"ember-cli-update": "^2.0.1",
4850
"ember-disable-prototype-extensions": "^1.1.3",
4951
"ember-inline-svg": "^1.0.0",
5052
"ember-load-initializers": "^2.1.2",
5153
"ember-maybe-import-regenerator": "^1.0.0",
5254
"ember-page-title": "8.1.0",
53-
"ember-qunit": "^5.1.5",
55+
"ember-qunit": "^8.0.2",
5456
"ember-resolver": "^11.0.1",
5557
"ember-source": "~3.28.3",
5658
"ember-source-channel-url": "^3.0.0",
57-
"ember-template-lint": "^3.6.0",
58-
"ember-truth-helpers": "^3.0.0",
59-
"eslint": "^7.32.0",
60-
"eslint-config-prettier": "^8.3.0",
61-
"eslint-plugin-ember": "^10.5.4",
59+
"ember-template-lint": "^5.13.0",
60+
"ember-truth-helpers": "^4.0.3",
61+
"eslint": "^8.56.0",
62+
"eslint-config-prettier": "^9.1.0",
63+
"eslint-plugin-ember": "^11.12.0",
6264
"eslint-plugin-node": "^11.1.0",
63-
"eslint-plugin-prettier": "^3.4.1",
64-
"eslint-plugin-qunit": "^6.2.0",
65+
"eslint-plugin-prettier": "^5.1.2",
66+
"eslint-plugin-qunit": "^8.0.1",
6567
"loader.js": "^4.7.0",
6668
"npm-run-all": "^4.1.5",
67-
"prettier": "^2.3.2",
69+
"prettier": "^3.1.1",
6870
"qunit": "^2.16.0",
6971
"sass": "^1.43.3",
7072
"standard-version": "^9.3.2",

‎docs/tests/acceptance/docs-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ module('Acceptance: title', function (hooks) {
88

99
test('docs page renders', async function (assert) {
1010
await visit('/');
11-
assert.equal(getPageTitle(), 'Ember Page Title');
11+
assert.strictEqual(getPageTitle(), 'Ember Page Title');
1212
});
1313

1414
test('user can modify title', async function (assert) {
1515
await visit('/');
1616
await fillIn('[data-test-edit-title]', 'New Title');
17-
assert.equal(getPageTitle(), 'New Title');
17+
assert.strictEqual(getPageTitle(), 'New Title');
1818
});
1919
});

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
},
77
"scripts": {
88
"lint": "pnpm --filter '*' lint",
9+
"lint:fix": "pnpm --filter '*' lint:fix",
910
"prepare": "cd addon && pnpm build"
1011
},
1112
"devDependencies": {
@@ -42,7 +43,7 @@
4243
"version": "8.1.0",
4344
"pnpm": {
4445
"patchedDependencies": {
45-
"[email protected].1": "patches/[email protected].1.patch"
46+
"[email protected].2": "patches/[email protected].2.patch"
4647
}
4748
}
4849
}

patches/[email protected] renamed to patches/[email protected]

File renamed without changes.

0 commit comments

Comments
 (0)