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.

Sign up for GitHub

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

Jump to bottom

Upgrade dev dependencies #273

Merged
merged 10 commits into from
Dec 26, 2023
Merged

Upgrade dev dependencies #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3155732
Upgrade dev dependencies
NullVoxPopuli Dec 24, 2023
e38d255
Use a more up to date parser
NullVoxPopuli Dec 24, 2023
d696732
Update configs
NullVoxPopuli Dec 24, 2023
dad51a0
Lintfix
NullVoxPopuli Dec 24, 2023
2b04bd1
rollup must mjs until type=module
NullVoxPopuli Dec 24, 2023
17e07d5
Deal with qunit lint changes
NullVoxPopuli Dec 24, 2023
cf4b226
Upgrade ember-qunit, because @ember/test-helpers requires it
NullVoxPopuli Dec 24, 2023
9a90ce1
Need an ember-cli version that supports ember-qunit as a v2 addon
NullVoxPopuli Dec 24, 2023
3c67a10
Fix defaults test
NullVoxPopuli Dec 24, 2023
4d821dd
Upgrade ember-cli in the docs-app
NullVoxPopuli Dec 24, 2023
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
41 changes: 15 additions & 26 deletions addon/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,24 @@

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
},
},
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true,
},
rules: {},

overrides: [
// node files
{
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.template-lintrc.js',
'./addon-main.js',
'./blueprints/*/index.js',
'./config/**/*.js',
files: ['src/**/*.{js,ts}'],
parser: '@typescript-eslint/parser',
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true,
},
},
// node files
{
files: ['./*.cjs', './addon-main.js'],
parserOptions: {
sourceType: 'script',
},
Expand Down
30 changes: 16 additions & 14 deletions addon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,29 @@
"prepublishOnly": "rollup --config"
},
"dependencies": {
"@embroider/addon-shim": "^1.8.6"
"@embroider/addon-shim": "^1.8.7"
},
"peerDependencies": {
"ember-source": ">= 3.28.0"
},
"devDependencies": {
"@babel/core": "^7.16.12",
"@babel/plugin-proposal-class-properties": "^7.16.7",
"@babel/plugin-proposal-decorators": "^7.16.7",
"@embroider/addon-dev": "^4.1.1",
"@rollup/plugin-babel": "^5.3.0",
"babel-eslint": "^10.1.0",
"ember-template-lint": "^3.6.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.4",
"@babel/core": "^7.23.6",
"@babel/eslint-parser": "^7.23.3",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.23.6",
"@embroider/addon-dev": "^4.1.3",
"@rollup/plugin-babel": "^6.0.4",
"@typescript-eslint/eslint-plugin": "^6.15.0",
"@typescript-eslint/parser": "^6.15.0",
"ember-template-lint": "^5.13.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.1",
"eslint-plugin-prettier": "^5.1.2",
"npm-run-all": "^4.1.5",
"prettier": "^2.3.2",
"rollup": "^2.67.0"
"prettier": "^3.1.1",
"rollup": "^4.9.1"
},
"engines": {
"node": "16.* || >= 18"
Expand Down
0 addon/rollup.config.js → addon/rollup.config.mjs
View file
Open in desktop
File renamed without changes.
7 changes: 5 additions & 2 deletions addon/src/services/page-title.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ export default class PageTitleService extends Service {
let defaultPrepend = this._defaultConfig.prepend;
let defaultReplace = this._defaultConfig.replace;

token.previous ??= null;
token.next ??= null;

if (token.separator == null) {
token.separator = defaultSeparator;
}
Expand Down Expand Up @@ -100,7 +103,7 @@ export default class PageTitleService extends Service {

let previous = this.tokens.slice(-1)[0];
if (previous) {
token.previous = previous;
token.previous = previous ?? null;
previous.next = token;
this.inheritFromPrevious(token);
}
Expand Down Expand Up @@ -234,7 +237,7 @@ export default class PageTitleService extends Service {
}
assert(
'[ember-page-title]: Multiple title elements found. Check for other addons like ember-cli-head updating <title> as well.',
document.head.querySelectorAll('title').length <= 1
document.head.querySelectorAll('title').length <= 1,
);
}

Expand Down
40 changes: 15 additions & 25 deletions docs/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,26 @@

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
},
},
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true,
},
rules: {},
overrides: [
{
files: ['{app,tests}/**/*.{js,ts}'],
parser: '@typescript-eslint/parser',
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true,
},
},
// node files
{
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./index.js',
'./testem.js',
'./*.{cjs,js}',
'./blueprints/*/index.js',
'./config/**/*.js',
'./config/**/*.{cjs,js}',
],
parserOptions: {
sourceType: 'script',
Expand Down
2 changes: 1 addition & 1 deletion docs/app/helpers/highlight.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ export default helper(function (params) {
})
.replace(/[a-z]+\.[a-z]+/g, function (title) {
return '<span class="literal">' + title + '</span>';
})
}),
);
});
36 changes: 19 additions & 17 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,44 +27,46 @@
"release": "standard-version"
},
"devDependencies": {
"@babel/eslint-parser": "^7.23.3",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^2.4.2",
"@ember/test-helpers": "^3.2.1",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"@typescript-eslint/eslint-plugin": "^6.15.0",
"@typescript-eslint/parser": "^6.15.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.0.0",
"ember-cli": "~3.28.3",
"ember-cli-babel": "^7.26.6",
"ember-cli-code-coverage": "^1.0.0",
"ember-cli": "~4.12.1",
"ember-cli-babel": "^8.2.0",
"ember-cli-code-coverage": "^2.0.3",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-github-pages": "^0.2.2",
"ember-cli-htmlbars": "^5.7.1",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^10.0.1",
"ember-cli-sass": "^11.0.1",
"ember-cli-terser": "^4.0.2",
"ember-cli-update": "^1.0.1",
"ember-cli-update": "^2.0.1",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-inline-svg": "^1.0.0",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-page-title": "8.1.0",
"ember-qunit": "^5.1.5",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~3.28.3",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.6.0",
"ember-truth-helpers": "^3.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.4",
"ember-template-lint": "^5.13.0",
"ember-truth-helpers": "^4.0.3",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.1",
"eslint-plugin-qunit": "^6.2.0",
"eslint-plugin-prettier": "^5.1.2",
"eslint-plugin-qunit": "^8.0.1",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.3.2",
"prettier": "^3.1.1",
"qunit": "^2.16.0",
"sass": "^1.43.3",
"standard-version": "^9.3.2",
Expand Down
4 changes: 2 additions & 2 deletions docs/tests/acceptance/docs-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ module('Acceptance: title', function (hooks) {

test('docs page renders', async function (assert) {
await visit('/');
assert.equal(getPageTitle(), 'Ember Page Title');
assert.strictEqual(getPageTitle(), 'Ember Page Title');
});

test('user can modify title', async function (assert) {
await visit('/');
await fillIn('[data-test-edit-title]', 'New Title');
assert.equal(getPageTitle(), 'New Title');
assert.strictEqual(getPageTitle(), 'New Title');
});
});
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
},
"scripts": {
"lint": "pnpm --filter '*' lint",
"lint:fix": "pnpm --filter '*' lint:fix",
"prepare": "cd addon && pnpm build"
},
"devDependencies": {
Expand Down Expand Up @@ -42,7 +43,7 @@
"version": "8.1.0",
"pnpm": {
"patchedDependencies": {
"[email protected].1": "patches/[email protected].1.patch"
"[email protected].2": "patches/[email protected].2.patch"
}
}
}
0 patches/[email protected] → patches/[email protected]
View file
Open in desktop
File renamed without changes.
Loading
Loading