chore(deps): update dependencies

.ember-cli

@@ -8,8 +8,8 @@
   "disableAnalytics": false,
 
   /**
-  Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
-  rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+    Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
+    rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
   */
   "isTypeScriptProject": false
 }

.eslintrc.js

@@ -1,6 +1,6 @@
 "use strict";
 module.exports = {
-  extends: ["@adfinis-sygroup/eslint-config/ember-addon"],
+  extends: ["@adfinis/eslint-config/ember-addon"],
   settings: {
     "import/internal-regex": "^ember-simple-auth-oidc/",
   },

.github/dependabot.yml

@@ -16,8 +16,3 @@ updates:
       timezone: "Europe/Zurich"
     open-pull-requests-limit: 10
     versioning-strategy: increase
-    ignore:
-      # https://github.com/ember-cli/ember-cli/issues/9307
-      - dependency-name: eslint
-        versions:
-          - ">= 8"

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
           cache: "yarn"
 
       - name: Install dependencies

.github/workflows/test.yml

@@ -9,7 +9,7 @@ on:
       - main
 
 env:
-  NODE_VERSION: 14
+  NODE_VERSION: 18
 
 concurrency:
   group: test-${{ github.ref }}
@@ -23,7 +23,7 @@ jobs:
 
     strategy:
       matrix:
-        target: [js, hbs]
+        target: [js, hbs, css]
 
     steps:
       - uses: actions/checkout@v3
@@ -90,14 +90,14 @@ jobs:
     timeout-minutes: 10
 
     strategy:
+      fail-fast: false
       matrix:
         scenario:
+          - ember-lts-4.8
           - ember-lts-4.4
-          - ember-lts-3.28
           - ember-release
           - ember-beta
           - ember-canary
-          - ember-classic
           - embroider-safe
           - embroider-optimized
 

.npmignore

@@ -18,11 +18,12 @@
 /.gitignore
 /.prettierignore
 /.prettierrc.js
+/.stylelintignore
+/.stylelintrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
 /bower.json
-/config/ember-try.js
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js

.prettierrc.js

@@ -0,0 +1,12 @@
+"use strict";
+
+module.exports = {
+  overrides: [
+    {
+      files: "*.{js,ts}",
+      options: {
+        singleQuote: false,
+      },
+    },
+  ],
+};

.stylelintignore

@@ -0,0 +1,8 @@
+# unconventional files
+/blueprints/*/files/
+
+# compiled output
+/dist/
+
+# addons
+/.node_modules.ember-try/

.stylelintrc.js

@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = {
+  extends: ["stylelint-config-standard", "stylelint-prettier/recommended"],
+};

addon/adapters/oidc-json-api-adapter.js

@@ -1,5 +1,5 @@
-import JSONAPIAdapter from "@ember-data/adapter/json-api";
 import { inject as service } from "@ember/service";
+import JSONAPIAdapter from "@ember-data/adapter/json-api";
 import { handleUnauthorized } from "ember-simple-auth-oidc";
 
 export default class OIDCJSONAPIAdapter extends JSONAPIAdapter {

addon/adapters/oidc-rest-adapter.js

@@ -1,5 +1,5 @@
-import RESTAdapter from "@ember-data/adapter/rest";
 import { inject as service } from "@ember/service";
+import RESTAdapter from "@ember-data/adapter/rest";
 import { handleUnauthorized } from "ember-simple-auth-oidc";
 
 export default class OIDCRESTAdapter extends RESTAdapter {

ember-cli-build.js

@@ -5,9 +5,6 @@ const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
 module.exports = function (defaults) {
   const app = new EmberAddon(defaults, {
     // Add options here
-    "ember-simple-auth": {
-      useSessionSetupMethod: true,
-    },
   });
 
   /*
@@ -24,5 +21,22 @@ module.exports = function (defaults) {
         package: "qunit",
       },
     ],
+    // https://github.com/embroider-build/embroider/issues/1322#issuecomment-1386857904
+    packageRules: [
+      {
+        package: "@ember-data/store",
+        addonModules: {
+          "-private.js": {
+            dependsOnModules: [],
+          },
+          "-private/system/core-store.js": {
+            dependsOnModules: [],
+          },
+          "-private/system/model/internal-model.js": {
+            dependsOnModules: [],
+          },
+        },
+      },
+    ],
   });
 };

package.json

@@ -14,74 +14,84 @@
   "repository": "https://github.com/adfinis/ember-simple-auth-oidc",
   "scripts": {
     "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
-    "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
+    "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
+    "lint:css": "stylelint \"**/*.css\"",
+    "lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
+    "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "npm-run-all lint test:*",
+    "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@apollo/client": "^3.7.10",
-    "@embroider/macros": "^1.9.0",
+    "@apollo/client": "^3.7.13",
+    "@embroider/macros": "^1.10.0",
     "base64-js": "^1.5.1",
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.6.3",
     "ember-cli-babel": "^7.26.11",
     "ember-concurrency": "^2.3.7",
     "ember-fetch": "^8.1.2",
-    "ember-simple-auth": "^4.2.2",
+    "ember-simple-auth": "^5.0.0",
     "js-sha256": "^0.9.0",
     "tracked-built-ins": "^3.1.1",
     "uuid": "^9.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/eslint-parser": "7.21.3",
+    "@babel/plugin-proposal-decorators": "7.21.0",
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "2.8.1",
-    "@embroider/test-setup": "1.8.3",
+    "@ember/string": "3.0.1",
+    "@ember/test-helpers": "2.9.3",
+    "@embroider/test-setup": "2.1.1",
     "@glimmer/tracking": "1.1.2",
-    "babel-eslint": "10.1.0",
     "broccoli-asset-rev": "3.0.0",
+    "concurrently": "8.0.1",
     "ember-apollo-client": "4.1.0",
-    "ember-cli": "4.7.0",
+    "ember-cli": "4.12.1",
     "ember-cli-dependency-checker": "3.3.1",
-    "ember-cli-htmlbars": "6.1.1",
+    "ember-cli-htmlbars": "6.2.0",
     "ember-cli-inject-live-reload": "2.1.0",
-    "ember-cli-mirage": "2.4.0",
+    "ember-cli-mirage": "3.0.0-alpha.3",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
-    "ember-data": "4.7.3",
-    "ember-disable-prototype-extensions": "1.1.3",
+    "ember-data": "4.12.0",
     "ember-load-initializers": "2.1.2",
-    "ember-qunit": "6.0.0",
-    "ember-resolver": "8.0.3",
-    "ember-source": "4.8.0",
+    "ember-qunit": "6.2.0",
+    "ember-resolver": "10.0.0",
+    "ember-source": "4.12.0",
     "ember-source-channel-url": "3.0.0",
-    "ember-template-lint": "4.16.1",
+    "ember-template-lint": "5.7.3",
     "ember-try": "2.0.0",
-    "eslint": "7.32.0",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-ember": "11.1.0",
-    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-node": "11.1.0",
+    "eslint": "8.39.0",
+    "eslint-config-prettier": "8.8.0",
+    "eslint-plugin-ember": "11.5.2",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-n": "15.7.0",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-qunit": "7.3.4",
     "graphql": "16.6.0",
     "graphql-tag": "2.12.6",
     "loader.js": "4.7.0",
-    "npm-run-all": "4.1.5",
-    "prettier": "2.7.1",
+    "miragejs": "0.1.47",
+    "prettier": "2.8.8",
     "qunit": "2.19.4",
     "qunit-dom": "2.0.0",
-    "webpack": "5.74.0"
+    "stylelint": "15.6.0",
+    "stylelint-config-standard": "33.0.0",
+    "stylelint-prettier": "3.0.0",
+    "webpack": "5.81.0"
+  },
+  "peerDependencies": {
+    "ember-source": "^4.0.0"
   },
   "engines": {
-    "node": "14.* || >= 16"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"
@@ -91,7 +101,7 @@
     "after": "ember-simple-auth"
   },
   "release": {
-    "extends": "@adfinis-sygroup/semantic-release-config"
+    "extends": "@adfinis/semantic-release-config"
   },
   "commitlint": {
     "extends": [

tests/dummy/app/styles/app.css

@@ -0,0 +1 @@
+/* Ember supports plain CSS out of the box. More info: https://cli.emberjs.com/release/advanced-use/stylesheets/ */

tests/dummy/config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "4.7.0",
+      "version": "4.12.1",
       "blueprints": [
         {
           "name": "addon",

config/ember-try.js → tests/dummy/config/ember-try.js

@@ -8,18 +8,18 @@ module.exports = async function () {
     useYarn: true,
     scenarios: [
       {
-        name: "ember-lts-3.28",
+        name: "ember-lts-4.4",
         npm: {
           devDependencies: {
-            "ember-source": "~3.28.0",
+            "ember-source": "~4.4.0",
           },
         },
       },
       {
-        name: "ember-lts-4.4",
+        name: "ember-lts-4.8",
         npm: {
           devDependencies: {
-            "ember-source": "~4.4.0",
+            "ember-source": "~4.8.0",
           },
         },
       },
@@ -47,24 +47,6 @@ module.exports = async function () {
           },
         },
       },
-      {
-        name: "ember-classic",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "application-template-wrapper": true,
-            "default-async-observers": false,
-            "template-only-glimmer-components": false,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-          ember: {
-            edition: "classic",
-          },
-        },
-      },
       embroiderSafe(),
       embroiderOptimized(),
     ],

tests/dummy/config/environment.js

@@ -23,6 +23,7 @@ module.exports = function (environment) {
     },
 
     EmberENV: {
+      EXTEND_PROTOTYPES: false,
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
         // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true