Skip to content

Commit

Permalink
chore(deps): update @adfinis/eslint-config and eslint (#657)
Browse files Browse the repository at this point in the history
* chore(deps): update @adfinis/eslint-config and eslint

* ci: update actions to v3

* fix(lint): resolve linting errors after upgrade

* chore: adapt required node version
  • Loading branch information
derrabauke authored May 1, 2023
1 parent 0c9d15c commit bb260d6
Show file tree
Hide file tree
Showing 13 changed files with 2,004 additions and 1,504 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
settings: {
"import/internal-regex": "^ember-emeis/",
},
extends: ["@adfinis-sygroup/eslint-config/ember-addon"],
extends: ["@adfinis/eslint-config/ember-addon"],
rules: {
"ember/no-settled-after-test-helper": "warn",
},
Expand Down
24 changes: 12 additions & 12 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
day: "monday"
time: "00:00"
timezone: "Europe/Zurich"
open-pull-requests-limit: 10
reviewers:
- velrest
versioning-strategy: increase

- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
day: "monday"
time: "00:00"
timezone: "Europe/Zurich"
open-pull-requests-limit: 10
reviewers:
- velrest
- derrabauke
versioning-strategy: increase
9 changes: 7 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@ name: Release

on: workflow_dispatch

env:
NODE_VERSION: 18

jobs:
build:
name: Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- name: Install dependencies
run: yarn install
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ on:

env:
CI: true
NODE_VERSION: 14
NODE_VERSION: 18

jobs:
lint:
name: Lint
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: node_modules
key: yarn-${{ hashFiles('yarn.lock') }}
Expand All @@ -42,12 +42,12 @@ jobs:
runs-on: [ubuntu-latest]

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: node_modules
key: yarn-${{ hashFiles('yarn.lock') }}
Expand Down Expand Up @@ -79,12 +79,12 @@ jobs:
- ember-release

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: node_modules
key: yarn-${{ hashFiles('yarn.lock') }}
Expand All @@ -95,7 +95,7 @@ jobs:
- name: Install dependencies
run: yarn install

- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: |
yarn
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use strict";

/* eslint-disable ember/avoid-leaking-state-in-ember-objects, node/no-unpublished-require */
/* eslint-disable ember/avoid-leaking-state-in-ember-objects, n/no-unpublished-require */

const EngineAddon = require("ember-engines/lib/engine-addon");

Expand Down
17 changes: 10 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,19 @@
"tracked-toolbox": "^2.0.0"
},
"devDependencies": {
"@adfinis-sygroup/eslint-config": "1.5.0",
"@adfinis-sygroup/semantic-release-config": "3.4.0",
"@adfinis/eslint-config": "2.0.0",
"@adfinis/semantic-release-config": "4.0.0",
"@babel/core": "7.21.4",
"@babel/eslint-parser": "7.21.3",
"@babel/plugin-proposal-decorators": "7.21.0",
"@commitlint/cli": "17.3.0",
"@commitlint/config-conventional": "17.3.0",
"@ember/optional-features": "2.0.0",
"@ember/test-helpers": "2.9.3",
"@embroider/test-setup": "1.8.3",
"@faker-js/faker": "6.2.0",
"babel-eslint": "10.1.0",
"broccoli-asset-rev": "3.0.0",
"ember-cli": "3.28.5",
"ember-cli": "3.28.6",
"ember-cli-dependency-checker": "3.3.1",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-mirage": "3.0.0-alpha.3",
Expand All @@ -92,10 +94,11 @@
"ember-source-channel-url": "3.0.0",
"ember-template-lint": "4.10.1",
"ember-try": "2.0.0",
"eslint": "7.32.0",
"eslint": "8.39.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-ember": "11.2.1",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-n": "15.7.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-qunit": "7.3.4",
Expand All @@ -112,7 +115,7 @@
"webpack": "5.75.0"
},
"engines": {
"node": ">= 14"
"node": ">= 18.*"
},
"ember": {
"edition": "octane"
Expand All @@ -121,7 +124,7 @@
"configPath": "tests/dummy/config"
},
"release": {
"extends": "@adfinis-sygroup/semantic-release-config"
"extends": "@adfinis/semantic-release-config"
},
"//": [
"TODO(miragejs): conflicts with ember-cli-mirage in floating dependencies test"
Expand Down
10 changes: 5 additions & 5 deletions tests/acceptance/permissions-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ module("Acceptance | permissions", function (hooks) {
assert.dom('[name="name"]').hasValue(permission.name.en);
assert.dom('[name="description"]').hasValue(permission.description.en);

const name = "Permission 1",
description = "The one and only";
const name = "Permission 1";
const description = "The one and only";

await fillIn('[name="name"]', name);
await fillIn('[name="description"]', description);
Expand Down Expand Up @@ -139,9 +139,9 @@ module("Acceptance | permissions", function (hooks) {
await click("[data-test-new]");
assert.strictEqual(currentURL(), "/permissions/new");

const name = "Permission 1",
description = "The one and only",
slug = "permission-1";
const name = "Permission 1";
const description = "The one and only";
const slug = "permission-1";

await fillIn('[name="name"]', name);
await fillIn('[name="description"]', description);
Expand Down
10 changes: 5 additions & 5 deletions tests/acceptance/roles-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ module("Acceptance | roles", function (hooks) {
assert.dom('[name="name"]').hasValue(role.name.en);
assert.dom('[name="description"]').hasValue(role.description.en);

const name = "Role 1",
description = "The one and only";
const name = "Role 1";
const description = "The one and only";

await fillIn('[name="name"]', name);
await fillIn('[name="description"]', description);
Expand All @@ -124,9 +124,9 @@ module("Acceptance | roles", function (hooks) {
await click("[data-test-new]");
assert.strictEqual(currentURL(), "/roles/new");

const name = "Role 1",
description = "The one and only",
slug = "role-1";
const name = "Role 1";
const description = "The one and only";
const slug = "role-1";

await fillIn('[name="name"]', name);
await fillIn('[name="description"]', description);
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/scopes-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ module("Acceptance | scopes", function (hooks) {
assert.dom('[name="name"]').hasValue(scope.name.en);
assert.dom('[name="description"]').hasValue(scope.description.en);

const name = "test",
description = "test desc";
const name = "test";
const description = "test desc";

await fillIn('[name="name"]', name);
await fillIn('[name="description"]', description);
Expand Down
36 changes: 18 additions & 18 deletions tests/acceptance/users-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ module("Acceptance | users", function (hooks) {
assert.dom('[name="city"]').isRequired();
assert.dom('[name="zip"]').isRequired();

const username = "newusername",
firstName = "John",
lastName = "Doe",
email = "[email protected]",
phone = "123 123 12 23",
language = "de",
address = "Somestreet 32",
city = "Sity",
zip = "2313";
const username = "newusername";
const firstName = "John";
const lastName = "Doe";
const email = "[email protected]";
const phone = "123 123 12 23";
const language = "de";
const address = "Somestreet 32";
const city = "Sity";
const zip = "2313";

await fillIn('[name="username"]', username);
await fillIn('[name="firstName"]', firstName);
Expand Down Expand Up @@ -208,15 +208,15 @@ module("Acceptance | users", function (hooks) {
await click("[data-test-new]");
assert.strictEqual(currentURL(), "/users/new");

const username = "newusername",
firstName = "John",
lastName = "Doe",
email = "[email protected]",
phone = "123 123 12 23",
language = "de",
address = "Somestreet 32",
city = "Sity",
zip = "2313";
const username = "newusername";
const firstName = "John";
const lastName = "Doe";
const email = "[email protected]";
const phone = "123 123 12 23";
const language = "de";
const address = "Somestreet 32";
const city = "Sity";
const zip = "2313";

await fillIn('[name="username"]', username);
await fillIn('[name="firstName"]', firstName);
Expand Down
4 changes: 2 additions & 2 deletions tests/dummy/mirage/serializers/pagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export default class PaginationSerializer extends JSONAPISerializer {

if (method === "GET" && Array.isArray(json.data)) {
if (page && limit) {
const parsedPage = parseInt(page),
parsedLimit = parseInt(limit);
const parsedPage = parseInt(page);
const parsedLimit = parseInt(limit);

json.meta = {
pagination: {
Expand Down
18 changes: 9 additions & 9 deletions tests/helpers/assert-request.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ export default function setupRequestAssertions(hooks) {
["GET", "POST", "DELETE", "PUT", "PATCH"].includes(method)
);

const logging = this.server.logging,
pretender = this.server.pretender,
originalHandler = getAndCacheDefaultHandler(
pretender,
method,
path,
this.defaultHandlers
),
server = this.server;
const logging = this.server.logging;
const pretender = this.server.pretender;
const originalHandler = getAndCacheDefaultHandler(
pretender,
method,
path,
this.defaultHandlers
);
const server = this.server;

pretender[method.toLowerCase()](path, async function (request) {
// Reset the get handler for this path to
Expand Down
Loading

0 comments on commit bb260d6

Please sign in to comment.