chore: 🤖 upgrade ui/core to ember lts 3.20

2020-10-06 09:53:58 -04:00
1 parent c6babf3aae
commit cc37ea767a
@@ -20,9 +20,7 @@ module.exports = {
  env: {
    browser: true
  },
-  rules: {
-    'ember/no-jquery': 'error'
-  },
+  rules: {},
  overrides: [
    // node files
    {
@@ -44,13 +42,12 @@ module.exports = {
        node: true
      },
      plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-
+      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'
-      })
+      }
    }
  ]
 };
@@ -1,33 +0,0 @@
---
-language: node_js
-node_js:
-  - "10"
-
-dist: trusty
-
-addons:
-  chrome: stable
-
-cache:
-  yarn: true
-
-env:
-  global:
-    # See https://git.io/vdao3 for details.
-    - JOBS=1
-
-branches:
-  only:
-    - master
-
-before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH=$HOME/.yarn/bin:$PATH
-
-install:
-  - yarn install --non-interactive
-
-script:
-  - yarn lint:hbs
-  - yarn lint:js
-  - yarn test
@@ -1,7 +1,7 @@
 import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
-import config from './config/environment';
+import config from 'core/config/environment';

 export default class App extends Application {
  modulePrefix = config.modulePrefix;
@@ -15,7 +15,7 @@ export default class FormGroupAddMembersComponent extends Component {
   * Host sets not already added to the target.
   * @type {[UserModel]}
   */
-  @computed('args.{model.members_ids.[],users.[]}')
+  @computed('args.{model.member_ids.[],users.[]}')
  get availableUsers() {
    const memberIDs = this.args.model.member_ids;
    const users = this.args.users;
@@ -16,7 +16,7 @@ export default class FormHostSetAddHostsIndexComponent extends Component {
   * @param {[HostModel]} filteredHosts
   * @type {boolean}
   */
-  @computed('filteredHosts')
+  @computed('filteredHosts.length')
  get hasAvailableHosts() {
    return this.filteredHosts.length > 0;
  }
@@ -25,7 +25,7 @@ export default class FormHostSetAddHostsIndexComponent extends Component {
   * Hosts currently not assigned to current host set.
   * @type {[HostModel]}
   */
-  @computed('args.{model,hosts}')
+  @computed('args.{model,model.host_ids,hosts}')
  get filteredHosts() {
    const currentHostIDs = this.args.model.host_ids.map((host) => host.value);
    return this.args.hosts.filter(({ id }) => !currentHostIDs.includes(id));
@@ -17,7 +17,7 @@ export default class FormRoleAddPrincipalsIndexComponent extends Component {
   * @param {[UserModel, GroupModel]} filteredPrincipals
   * @type {boolean}
   */
-  @computed('filteredPrincipals')
+  @computed('filteredPrincipals.length')
  get hasAvailablePrincipals() {
    return this.filteredPrincipals.length > 0;
  }
@@ -26,7 +26,7 @@ export default class FormRoleAddPrincipalsIndexComponent extends Component {
   * Principals not currently assigned to a role.
   * @type {[UserModel, GroupModel]}
   */
-  @computed('args.{model,users,groups}')
+  @computed('args.{model,model.principals.[],users,groups}')
  get filteredPrincipals() {
    // Retrieve principal IDs assigned to current role
    const currentPrincipalIDs = this.args.model.principals.map(
@@ -16,7 +16,7 @@ export default class FormTargetAddHostSetsComponent extends Component {
   * @param {[HostSetModel]} filteredHostSets
   * @type {boolean}
   */
-  @computed('filteredHostSets')
+  @computed('filteredHostSets.length')
  get hasAvailableHostSets() {
    return this.filteredHostSets.length > 0;
  }
@@ -16,7 +16,7 @@ export default class FormUserAddAccountsComponent extends Component {
   * @param {[AccountModel]} filteredAccounts
   * @type {boolean}
   */
-  @computed('filteredAccounts')
+  @computed('filteredAccounts.length')
  get hasAvailableAccounts() {
    return this.filteredAccounts.length > 0;
  }
@@ -1,5 +1,5 @@
 import EmberRouter from '@ember/routing/router';
-import config from './config/environment';
+import config from 'core/config/environment';

 export default class Router extends EmberRouter {
  location = config.locationType;
@@ -1,4 +1,5 @@
 import Route from '@ember/routing/route';
+/* eslint-disable-next-line ember/no-mixins */
 import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
 import Ember from 'ember';
 import { getOwner } from '@ember/application';
@@ -0,0 +1,17 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.20.2",
+      "blueprints": [
+        {
+          "name": "app",
+          "outputRepo": "https://github.com/ember-cli/ember-new-output",
+          "codemodsSource": "ember-app-codemods-manifest@1",
+          "isBaseBlueprint": true
+        }
+      ]
+    }
+  ]
+}
@@ -6,7 +6,7 @@ const browsers = [
  'last 1 Safari versions',
 ];

-const isCI = !!process.env.CI;
+const isCI = Boolean(process.env.CI);
 const isProduction = process.env.EMBER_ENV === 'production';

 if (isCI || isProduction) {
@@ -13,7 +13,7 @@
    "doc:toc": "doctoc README.md",
    "build:development": "ember build",
    "build": "ember build --environment=production",
-    "lint": "yarn lint:hbs && yarn lint:js && yarn lint:sass",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
    "lint:hbs": "ember-template-lint .",
    "lint:js": "eslint .",
    "lint:sass": "sass-lint -v -q",
@@ -23,46 +23,45 @@
    "start": "ember serve",
    "clean:coverage": "rm -rf coverage_*",
    "pretest": "yarn clean:coverage",
-    "test": "COVERAGE=true ember exam --random",
+    "test": "npm-run-all test:*",
+    "test:ember": "COVERAGE=true ember exam --random",
    "posttest": "ember coverage-merge && yarn clean:coverage"
  },
  "devDependencies": {
    "@babel/core": "^7.9.6",
    "@ember/optional-features": "^1.3.0",
    "@ember/render-modifiers": "^1.0.2",
-    "@glimmer/component": "^1.0.0",
+    "@glimmer/component": "^1.0.1",
    "@glimmer/tracking": "^1.0.0",
    "api": "*",
    "auth": "*",
-    "babel-eslint": "^10.0.3",
+    "babel-eslint": "^10.1.0",
    "babel-loader": "^8.1.0",
    "broccoli-asset-rev": "^3.0.0",
    "clipboard": "^2.0.6",
    "doctoc": "^1.4.0",
    "ember-a11y-testing": "^3.0.0",
-    "ember-auto-import": "^1.5.3",
+    "ember-auto-import": "^1.6.0",
    "ember-breadcrumbs": "^0.2.3",
-    "ember-cli": "~3.16.1",
+    "ember-cli": "~3.20.2",
    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.17.2",
+    "ember-cli-babel": "^7.21.0",
    "ember-cli-code-coverage": "^1.0.0-beta.9",
    "ember-cli-content-security-policy": "^1.1.1",
    "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars": "^4.2.2",
+    "ember-cli-htmlbars": "^5.2.0",
    "ember-cli-inject-live-reload": "^2.0.2",
    "ember-cli-mirage": "^1.1.6",
    "ember-cli-sass": "^10.0.1",
    "ember-cli-sri": "^2.1.1",
-    "ember-cli-template-lint": "^1.0.0-beta.3",
    "ember-cli-uglify": "^3.0.0",
    "ember-cli-update": "^0.54.6",
    "ember-concurrency": "^1.3.0",
-    "ember-data": "~3.16.0",
+    "ember-data": "~3.20.0",
    "ember-data-model-fragments": "5.0.0-beta.0",
    "ember-exam": "^5.0.1",
    "ember-export-application-global": "^2.0.1",
-    "ember-fetch": "^7.0.0",
+    "ember-fetch": "^8.0.1",
    "ember-inline-svg": "^1.0.0",
    "ember-intl": "^5.1.1",
    "ember-load-initializers": "^2.1.1",
@@ -72,19 +71,22 @@
    "ember-notify": "^6.0.0",
    "ember-page-title": "^5.2.1",
    "ember-qunit": "^4.6.0",
-    "ember-resolver": "^7.0.0",
+    "ember-resolver": "^8.0.0",
    "ember-route-action-helper": "^2.0.8",
    "ember-simple-auth": "^3.0.0",
-    "ember-source": "~3.16.0",
+    "ember-source": "~3.20.2",
+    "ember-template-lint": "^2.9.1",
    "ember-uuid": "^2.1.0",
    "ember-welcome-page": "^4.0.0",
    "emberx-select": "github:adopted-ember-addons/emberx-select#bc5f774",
-    "eslint-plugin-ember": "^7.7.2",
-    "eslint-plugin-node": "^11.0.0",
+    "eslint": "^7.5.0",
+    "eslint-plugin-ember": "^8.9.1",
+    "eslint-plugin-node": "^11.1.0",
    "faker": "^4.1.0",
    "loader.js": "^4.7.0",
+    "npm-run-all": "^4.1.5",
    "prettier": "^2.0.5",
-    "qunit-dom": "^1.0.0",
+    "qunit-dom": "^1.2.0",
    "rose": "*",
    "sass": "^1.26.5",
    "sass-lint": "^1.13.1",
@@ -1,5 +1,5 @@
-import Application from '../app';
-import config from '../config/environment';
+import Application from 'core/app';
+import config from 'core/config/environment';
 import { setApplication } from '@ember/test-helpers';
 //import { start } from 'ember-qunit';
 import start from 'ember-exam/test-support/start';