diff --git a/.eslintrc.js b/.eslintrc.js index 8a8a4ee..3d9b5b1 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -41,13 +41,7 @@ module.exports = { browser: false, node: true, }, - plugins: ['node'], - extends: ['plugin:node/recommended'], - rules: { - // this can be removed once the following is fixed - // https://github.com/mysticatea/eslint-plugin-node/issues/77 - 'node/no-unpublished-require': 'off', - }, + extends: ['plugin:n/recommended'], }, { // test files diff --git a/.prettierrc.js b/.prettierrc.js index 534e6d3..e5f7b6d 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,5 +1,12 @@ 'use strict'; module.exports = { - singleQuote: true, + overrides: [ + { + files: '*.{js,ts}', + options: { + singleQuote: true, + }, + }, + ], }; diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json index 4e0152d..072353e 100644 --- a/config/ember-cli-update.json +++ b/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "4.9.0", + "version": "4.10.0", "blueprints": [ { "name": "app", diff --git a/package-lock.json b/package-lock.json index 33ac932..2e7028a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,8 @@ "license": "Mozilla Public License 2.0", "devDependencies": { "@ember/optional-features": "^2.0.0", - "@ember/test-helpers": "^2.8.1", + "@ember/string": "^3.0.1", + "@ember/test-helpers": "^2.9.3", "@embroider/compat": "^1.6.0", "@embroider/core": "^1.6.0", "@embroider/webpack": "^1.6.0", @@ -41,11 +42,11 @@ "els-addon-typed-templates": "^4.2.4", "ember-animation": "^0.1.0", "ember-auto-import": "^2.5.0", - "ember-cli": "~4.9.0", + "ember-cli": "~4.10.0", "ember-cli-app-version": "^5.0.0", "ember-cli-babel": "^7.26.11", "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-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", @@ -56,20 +57,20 @@ "ember-load-initializers": "^2.1.2", "ember-mdi": "^2.0.0", "ember-modifier": "^4.1.0", - "ember-qunit": "^6.0.0", - "ember-resolver": "^8.0.3", + "ember-qunit": "^6.1.1", + "ember-resolver": "^10.0.0", "ember-resources": "^5.4.0", "ember-set-helper": "^2.0.1", "ember-simple-auth": "^4.2.2", "ember-sortable": "^4.0.2", - "ember-source": "~4.9.1", + "ember-source": "~4.10.0", "ember-template-imports": "^3.1.1", - "ember-template-lint": "^5.2.0", + "ember-template-lint": "^5.3.1", "ember-truth-helpers": "^3.0.0", "eslint": "^7.32.0", - "eslint-config-prettier": "^8.5.0", - "eslint-plugin-ember": "^11.2.1", - "eslint-plugin-node": "^11.1.0", + "eslint-config-prettier": "^8.6.0", + "eslint-plugin-ember": "^11.4.3", + "eslint-plugin-n": "^15.6.1", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-qunit": "^7.3.4", "file-loader": "^6.2.0", @@ -80,7 +81,7 @@ "postcss": "^8.4.16", "postcss-loader": "^7.0.1", "postcss-mixins": "^9.0.4", - "prettier": "^2.8.1", + "prettier": "^2.8.3", "qunit": "^2.19.3", "qunit-dom": "^2.0.0", "release-it": "^14.2.1", @@ -2160,6 +2161,18 @@ "ember-source": "^3.8 || ^4.0.0" } }, + "node_modules/@ember/string": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@ember/string/-/string-3.1.1.tgz", + "integrity": "sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==", + "dev": true, + "dependencies": { + "ember-cli-babel": "^7.26.6" + }, + "engines": { + "node": "12.* || 14.* || >= 16" + } + }, "node_modules/@ember/test-helpers": { "version": "2.9.3", "resolved": "https://registry.npmjs.org/@ember/test-helpers/-/test-helpers-2.9.3.tgz", @@ -11153,12 +11166,12 @@ } }, "node_modules/ember-cli": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/ember-cli/-/ember-cli-4.9.2.tgz", - "integrity": "sha512-zvZjB0uHY2ewCrfNc0k3dM9QpfcDQ4GW5h1MmNXN7+nAPfFROSwJ/o24t6DHUFcU/B9H7Dd+2GGC4W6NKz6Shw==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/ember-cli/-/ember-cli-4.10.0.tgz", + "integrity": "sha512-gex/GdqzR5NLPVHvqLml7YgJR3KDzq2MGtrB2EHSpk//bY26mWi0milYABBfiDK5Yw/onztwPitxNaZpBjjqng==", "dev": true, "dependencies": { - "@babel/core": "^7.19.3", + "@babel/core": "^7.19.6", "@babel/plugin-transform-modules-amd": "^7.18.6", "amd-name-resolver": "^1.3.1", "babel-plugin-module-resolver": "^4.1.0", @@ -11182,7 +11195,7 @@ "calculate-cache-key-for-tree": "^2.0.0", "capture-exit": "^2.0.0", "chalk": "^4.1.2", - "ci-info": "^3.4.0", + "ci-info": "^3.5.0", "clean-base-url": "^1.0.0", "compression": "^1.7.4", "configstore": "^5.0.1", @@ -11214,7 +11227,7 @@ "heimdalljs-graph": "^1.0.0", "heimdalljs-logger": "^0.1.10", "http-proxy": "^1.18.1", - "inflection": "^1.13.1", + "inflection": "^1.13.4", "inquirer": "^8.2.1", "is-git-url": "^1.0.0", "is-language-code": "^3.1.0", @@ -13952,20 +13965,24 @@ } }, "node_modules/ember-resolver": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/ember-resolver/-/ember-resolver-8.1.0.tgz", - "integrity": "sha512-MGD7X2ztZVswGqs1mLgzhZJRhG7XiF6Mg4DgC7xJFWRYQQUHyGJpGdNWY9nXyrYnRIsCrQoL1do41zpxbrB/cg==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/ember-resolver/-/ember-resolver-10.1.0.tgz", + "integrity": "sha512-Ju/ORUUbGnR83AgC3qV6fIVuM5tyi/nPRf9ggTM2+kdeGPLNTSkNZ0zSbjWEm0kerDezMjj/RoGuLvZl/L758w==", "dev": true, "dependencies": { - "babel-plugin-debug-macros": "^0.3.4", - "broccoli-funnel": "^3.0.8", - "broccoli-merge-trees": "^4.2.0", - "ember-cli-babel": "^7.26.6", - "ember-cli-version-checker": "^5.1.2", - "resolve": "^1.20.0" + "ember-cli-babel": "^7.26.11" }, "engines": { - "node": ">= 10.*" + "node": "14.* || 16.* || >= 18" + }, + "peerDependencies": { + "@ember/string": "^3.0.1", + "ember-source": "^4.8.3" + }, + "peerDependenciesMeta": { + "ember-source": { + "optional": true + } } }, "node_modules/ember-resources": { @@ -14291,9 +14308,9 @@ } }, "node_modules/ember-source": { - "version": "4.9.3", - "resolved": "https://registry.npmjs.org/ember-source/-/ember-source-4.9.3.tgz", - "integrity": "sha512-oF4rx9sMWk3rNjljOaLkCYwwFXvBn0QUnxV/Jxa/I1FWYXsdiIAoQD9+PU8l7Q5GZh57Mq/M0rjztxj+CYc/2w==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/ember-source/-/ember-source-4.10.0.tgz", + "integrity": "sha512-Y7+M+vSygMrpq4szsnpik3PxdVVA7ApuwU2L/l9Os+qpPqIKy4hT0Rw/17z4b87HNEX03jv7ueMbgcpxjUf1Kw==", "dev": true, "dependencies": { "@babel/helper-module-imports": "^7.16.7", @@ -15711,10 +15728,35 @@ "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", "dev": true }, - "node_modules/eslint-plugin-es": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", - "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", + "node_modules/eslint-plugin-n": { + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "dev": true, + "dependencies": { + "builtins": "^5.0.1", + "eslint-plugin-es": "^4.1.0", + "eslint-utils": "^3.0.0", + "ignore": "^5.1.1", + "is-core-module": "^2.11.0", + "minimatch": "^3.1.2", + "resolve": "^1.22.1", + "semver": "^7.3.8" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", + "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", "dev": true, "dependencies": { "eslint-utils": "^2.0.0", @@ -15730,27 +15772,49 @@ "eslint": ">=4.19.1" } }, - "node_modules/eslint-plugin-node": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", - "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", + "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, "dependencies": { - "eslint-plugin-es": "^3.0.0", - "eslint-utils": "^2.0.0", - "ignore": "^5.1.1", - "minimatch": "^3.0.4", - "resolve": "^1.10.1", - "semver": "^6.1.0" + "eslint-visitor-keys": "^1.1.0" }, "engines": { - "node": ">=8.10.0" + "node": ">=6" }, - "peerDependencies": { - "eslint": ">=5.16.0" + "funding": { + "url": "https://github.com/sponsors/mysticatea" } }, - "node_modules/eslint-plugin-node/node_modules/ignore": { + "node_modules/eslint-plugin-n/node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-plugin-n/node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-n/node_modules/ignore": { "version": "5.2.4", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", @@ -15759,15 +15823,6 @@ "node": ">= 4" } }, - "node_modules/eslint-plugin-node/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/eslint-plugin-prettier": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", diff --git a/package.json b/package.json index c154925..5356ae3 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,8 @@ }, "devDependencies": { "@ember/optional-features": "^2.0.0", - "@ember/test-helpers": "^2.8.1", + "@ember/string": "^3.0.1", + "@ember/test-helpers": "^2.9.3", "@embroider/compat": "^1.6.0", "@embroider/core": "^1.6.0", "@embroider/webpack": "^1.6.0", @@ -62,11 +63,11 @@ "els-addon-typed-templates": "^4.2.4", "ember-animation": "^0.1.0", "ember-auto-import": "^2.5.0", - "ember-cli": "~4.9.0", + "ember-cli": "~4.10.0", "ember-cli-app-version": "^5.0.0", "ember-cli-babel": "^7.26.11", "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-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", @@ -77,20 +78,20 @@ "ember-load-initializers": "^2.1.2", "ember-mdi": "^2.0.0", "ember-modifier": "^4.1.0", - "ember-qunit": "^6.0.0", - "ember-resolver": "^8.0.3", + "ember-qunit": "^6.1.1", + "ember-resolver": "^10.0.0", "ember-resources": "^5.4.0", "ember-set-helper": "^2.0.1", "ember-simple-auth": "^4.2.2", "ember-sortable": "^4.0.2", - "ember-source": "~4.9.1", + "ember-source": "~4.10.0", "ember-template-imports": "^3.1.1", - "ember-template-lint": "^5.2.0", + "ember-template-lint": "^5.3.1", "ember-truth-helpers": "^3.0.0", "eslint": "^7.32.0", - "eslint-config-prettier": "^8.5.0", - "eslint-plugin-ember": "^11.2.1", - "eslint-plugin-node": "^11.1.0", + "eslint-config-prettier": "^8.6.0", + "eslint-plugin-ember": "^11.4.3", + "eslint-plugin-n": "^15.6.1", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-qunit": "^7.3.4", "file-loader": "^6.2.0", @@ -101,7 +102,7 @@ "postcss": "^8.4.16", "postcss-loader": "^7.0.1", "postcss-mixins": "^9.0.4", - "prettier": "^2.8.1", + "prettier": "^2.8.3", "qunit": "^2.19.3", "qunit-dom": "^2.0.0", "release-it": "^14.2.1",