diff --git a/addons/auth/.ember-cli b/addons/auth/.ember-cli index 4ccb4bf43..8c1812cff 100644 --- a/addons/auth/.ember-cli +++ b/addons/auth/.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 } diff --git a/addons/auth/.eslintrc.js b/addons/auth/.eslintrc.js index 3db4ad9b5..6da8dfce7 100644 --- a/addons/auth/.eslintrc.js +++ b/addons/auth/.eslintrc.js @@ -9,12 +9,14 @@ module.exports = { root: true, parser: '@babel/eslint-parser', parserOptions: { - ecmaVersion: 2018, + ecmaVersion: 'latest', sourceType: 'module', // This is specific babel-config. If grows consider creating a babel config file requireConfigFile: false, babelOptions: { - plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]], + plugins: [ + ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], + ], }, // end of babel-config }, @@ -51,8 +53,7 @@ module.exports = { browser: false, node: true, }, - plugins: ['node'], - extends: ['plugin:node/recommended'], + extends: ['plugin:n/recommended'], }, { // Test files: diff --git a/addons/auth/.npmignore b/addons/auth/.npmignore index 3aac2443f..38a2b0863 100644 --- a/addons/auth/.npmignore +++ b/addons/auth/.npmignore @@ -22,7 +22,6 @@ /.travis.yml /.watchmanconfig /bower.json -/config/ember-try.js /CONTRIBUTING.md /ember-cli-build.js /testem.js diff --git a/addons/auth/ember-cli-build.js b/addons/auth/ember-cli-build.js index c3295d86d..96c422999 100644 --- a/addons/auth/ember-cli-build.js +++ b/addons/auth/ember-cli-build.js @@ -9,7 +9,7 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); const { maybeEmbroider } = require('@embroider/test-setup'); module.exports = function (defaults) { - let app = new EmberAddon(defaults, { + const app = new EmberAddon(defaults, { 'ember-simple-auth': { // https://github.com/mainmatter/ember-simple-auth/blob/master/guides/upgrade-to-v4.md#call-sessionsetup-method-in-your-applicationroute useSessionSetupMethod: true, diff --git a/addons/auth/package.json b/addons/auth/package.json index 67bedfaca..809021808 100644 --- a/addons/auth/package.json +++ b/addons/auth/package.json @@ -8,8 +8,8 @@ "ember-addon" ], "scripts": { - "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:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", "lint:js": "eslint .", "lint:js:fix": "eslint . --fix", "format": "yarn run format:js", @@ -22,22 +22,24 @@ }, "dependencies": { "ember-cli-babel": "^7.26.11", - "ember-cli-htmlbars": "^6.1.0", + "ember-cli-htmlbars": "^6.2.0", "ember-fetch": "^8.1.1", "ember-simple-auth": "^4.2.2" }, "devDependencies": { - "@babel/eslint-parser": "^7.18.2", - "@babel/plugin-proposal-decorators": "^7.18.6", + "@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", + "@ember/string": "^3.0.1", + "@ember/test-helpers": "^2.9.3", "@embroider/test-setup": "^2.1.1", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", + "concurrently": "^8.0.1", "doctoc": "^2.2.0", - "ember-auto-import": "^2.4.3", - "ember-cli": "^4.4.1", + "ember-auto-import": "^2.6.3", + "ember-cli": "^4.12.2", "ember-cli-dependency-checker": "^3.3.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", @@ -47,23 +49,22 @@ "ember-export-application-global": "^2.0.1", "ember-load-initializers": "^2.1.2", "ember-page-title": "^7.0.0", - "ember-qunit": "^6.0.0", - "ember-resolver": "^8.0.3", - "ember-source": "~4.4.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.14.0", - "eslint": "^8.18.0", - "eslint-config-prettier": "^8.5.0", - "eslint-plugin-ember": "^10.6.1", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-qunit": "^7.3.0", + "ember-template-lint": "^5.7.2", + "eslint": "^8.37.0", + "eslint-config-prettier": "^8.8.0", + "eslint-plugin-ember": "^11.5.0", + "eslint-plugin-n": "^15.7.0", + "eslint-plugin-qunit": "^7.3.4", "loader.js": "^4.7.0", - "npm-run-all": "^4.1.5", "pretender": "^3.4.3", - "prettier": "^2.6.2", - "qunit": "^2.19.1", + "prettier": "^2.8.7", + "qunit": "^2.19.4", "qunit-dom": "^2.0.0", - "webpack": "^5.76.0" + "webpack": "^5.78.0" }, "engines": { "node": "16.* || 18.*" diff --git a/addons/auth/tests/dummy/config/ember-cli-update.json b/addons/auth/tests/dummy/config/ember-cli-update.json index 6edef2fd2..0cd2d798c 100644 --- a/addons/auth/tests/dummy/config/ember-cli-update.json +++ b/addons/auth/tests/dummy/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "4.4.1", + "version": "4.12.2", "blueprints": [ { "name": "addon", diff --git a/addons/auth/config/ember-try.js b/addons/auth/tests/dummy/config/ember-try.js similarity index 94% rename from addons/auth/config/ember-try.js rename to addons/auth/tests/dummy/config/ember-try.js index 369ac9b0d..70285361c 100644 --- a/addons/auth/config/ember-try.js +++ b/addons/auth/tests/dummy/config/ember-try.js @@ -11,14 +11,6 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup'); module.exports = async function () { return { scenarios: [ - { - name: 'ember-lts-3.28', - npm: { - devDependencies: { - 'ember-source': '~3.28.0', - }, - }, - }, { name: 'ember-lts-4.4', npm: { @@ -27,6 +19,14 @@ module.exports = async function () { }, }, }, + { + name: 'ember-lts-4.8', + npm: { + devDependencies: { + 'ember-source': '~4.8.0', + }, + }, + }, { name: 'ember-release', npm: { diff --git a/addons/auth/tests/dummy/config/environment.js b/addons/auth/tests/dummy/config/environment.js index b08b418a3..94d153ed3 100644 --- a/addons/auth/tests/dummy/config/environment.js +++ b/addons/auth/tests/dummy/config/environment.js @@ -6,20 +6,17 @@ 'use strict'; module.exports = function (environment) { - let ENV = { + const ENV = { modulePrefix: 'dummy', environment, rootURL: '/', locationType: 'history', EmberENV: { + EXTEND_PROTOTYPES: false, FEATURES: { // Here you can enable experimental features on an ember canary build // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true }, - EXTEND_PROTOTYPES: { - // Prevent Ember Data from overriding Date.parse. - Date: false, - }, }, APP: { diff --git a/addons/auth/vendor/.gitkeep b/addons/auth/vendor/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/yarn.lock b/yarn.lock index ca310660f..ee1d9a323 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9665,7 +9665,7 @@ ember-auto-import@^1.11.2, ember-auto-import@^1.12.0: walk-sync "^0.3.3" webpack "^4.43.0" -ember-auto-import@^2.2.3, ember-auto-import@^2.4.0, ember-auto-import@^2.4.1, ember-auto-import@^2.4.2, ember-auto-import@^2.4.3, ember-auto-import@^2.5.0, ember-auto-import@^2.6.0, ember-auto-import@^2.6.1, ember-auto-import@^2.6.3: +ember-auto-import@^2.2.3, ember-auto-import@^2.4.0, ember-auto-import@^2.4.1, ember-auto-import@^2.4.2, ember-auto-import@^2.5.0, ember-auto-import@^2.6.0, ember-auto-import@^2.6.1, ember-auto-import@^2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.3.tgz#f18d1b93dd10b08ba5496518436f9d56dd4e000a" integrity sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ== @@ -10352,6 +10352,105 @@ ember-cli@^4.12.1: workerpool "^6.4.0" yam "^1.0.0" +ember-cli@^4.12.2: + version "4.12.2" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.12.2.tgz#a9d2dd191093fcf18122732fae8999c9ca873447" + integrity sha512-990UglceEsB3nd/pTI08wL+hbApICrd6P4BO88486rSf9r3XjZ7LBcD318N8I1AGe5IUDkbccMrOQxoHge6zNg== + dependencies: + "@babel/core" "^7.21.0" + "@babel/plugin-transform-modules-amd" "^7.20.11" + amd-name-resolver "^1.3.1" + babel-plugin-module-resolver "^4.1.0" + bower-config "^1.4.3" + bower-endpoint-parser "0.2.2" + broccoli "^3.5.2" + broccoli-amd-funnel "^2.0.1" + broccoli-babel-transpiler "^7.8.1" + broccoli-builder "^0.18.14" + broccoli-concat "^4.2.5" + broccoli-config-loader "^1.0.1" + broccoli-config-replace "^1.1.2" + broccoli-debug "^0.6.5" + broccoli-funnel "^3.0.8" + broccoli-funnel-reducer "^1.0.0" + broccoli-merge-trees "^4.2.0" + broccoli-middleware "^2.1.1" + broccoli-slow-trees "^3.1.0" + broccoli-source "^3.0.1" + broccoli-stew "^3.0.0" + calculate-cache-key-for-tree "^2.0.0" + capture-exit "^2.0.0" + chalk "^4.1.2" + ci-info "^3.7.0" + clean-base-url "^1.0.0" + compression "^1.7.4" + configstore "^5.0.1" + console-ui "^3.1.2" + core-object "^3.1.5" + dag-map "^2.0.2" + diff "^5.1.0" + ember-cli-is-package-missing "^1.0.0" + ember-cli-lodash-subset "^2.0.1" + ember-cli-normalize-entity-name "^1.0.0" + ember-cli-preprocess-registry "^3.3.0" + ember-cli-string-utils "^1.1.0" + ensure-posix-path "^1.1.1" + execa "^5.1.1" + exit "^0.1.2" + express "^4.18.1" + filesize "^10.0.5" + find-up "^5.0.0" + find-yarn-workspace-root "^2.0.0" + fixturify-project "^2.1.1" + fs-extra "^11.1.0" + fs-tree-diff "^2.0.1" + get-caller-file "^2.0.5" + git-repo-info "^2.1.1" + glob "^8.1.0" + heimdalljs "^0.2.6" + heimdalljs-fs-monitor "^1.1.1" + heimdalljs-graph "^1.0.0" + heimdalljs-logger "^0.1.10" + http-proxy "^1.18.1" + inflection "^2.0.1" + inquirer "^8.2.1" + is-git-url "^1.0.0" + is-language-code "^3.1.0" + isbinaryfile "^5.0.0" + js-yaml "^4.1.0" + leek "0.0.24" + lodash.template "^4.5.0" + markdown-it "^13.0.1" + markdown-it-terminal "^0.4.0" + minimatch "^7.4.1" + morgan "^1.10.0" + nopt "^3.0.6" + npm-package-arg "^10.1.0" + os-locale "^5.0.0" + p-defer "^3.0.0" + portfinder "^1.0.32" + promise-map-series "^0.3.0" + promise.hash.helper "^1.0.8" + quick-temp "^0.1.8" + remove-types "^1.0.0" + resolve "^1.22.1" + resolve-package-path "^4.0.3" + safe-stable-stringify "^2.4.2" + sane "^5.0.1" + semver "^7.3.5" + silent-error "^1.1.1" + sort-package-json "^1.57.0" + symlink-or-copy "^1.3.1" + temp "0.9.4" + testem "^3.10.1" + tiny-lr "^2.0.0" + tree-sync "^2.1.0" + uuid "^9.0.0" + walk-sync "^3.0.0" + watch-detector "^1.0.2" + workerpool "^6.4.0" + yam "^1.0.0" + ember-cli@^4.4.1: version "4.8.0" resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.8.0.tgz#71988bdad50661b904f7121a566799027c07ba72" @@ -18074,7 +18173,7 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.5.1, prettier@^2.6.2, prettier@^2.7.1: +prettier@^2.5.1, prettier@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==