Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui: Ember upgrade 3.8 > 3.12 #6406

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions ui-v2/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module',
ecmaFeatures: {
experimentalObjectRestSpread: true
}
ecmaVersion: 2018,
sourceType: 'module'
},
plugins: ['ember'],
extends: ['eslint:recommended', 'plugin:ember/recommended'],
Expand All @@ -31,22 +28,20 @@ module.exports = {
'server/**/*.js'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015,
sourceType: 'script'
},
env: {
browser: false,
node: true,
node: true
},
},
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here

// test files
{
files: ['tests/**/*.js'],
excludedFiles: ['tests/dummy/**/*.js'],
env: {
embertest: true,
},
},
],
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off'
})
}
]
};
13 changes: 7 additions & 6 deletions ui-v2/app/computed/catchable.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import ComputedProperty from '@ember/object/computed';
backspace marked this conversation as resolved.
Show resolved Hide resolved
import computedFactory from 'consul-ui/utils/computed/factory';
import { computed as computedPropertyFactory } from '@ember/object';

export default class Catchable extends ComputedProperty {
catch(cb) {
export const computed = function() {
const prop = computedPropertyFactory(...arguments);
prop.catch = function(cb) {
return this.meta({
catch: cb,
});
}
}
export const computed = computedFactory(Catchable);
};
return prop;
};
18 changes: 0 additions & 18 deletions ui-v2/app/utils/computed/factory.js

This file was deleted.

3 changes: 1 addition & 2 deletions ui-v2/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ module.exports = function(environment) {
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
'ds-improved-ajax': true,
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Expand Down
13 changes: 7 additions & 6 deletions ui-v2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@
"clipboard": "^2.0.4",
"ember-auto-import": "^1.4.0",
"ember-changeset-validations": "^2.1.0",
"ember-cli": "~3.8.0",
"ember-cli": "~3.12.0",
"ember-cli-app-version": "^3.2.0",
"ember-cli-autoprefixer": "^0.8.1",
"ember-cli-babel": "^7.1.2",
"ember-cli-babel": "^7.7.3",
"ember-cli-code-coverage": "^1.0.0-beta.4",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-flash": "^1.6.3",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-htmlbars": "^3.0.1",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-page-object": "^1.15.0-beta.2",
Expand All @@ -76,7 +76,7 @@
"ember-collection": "^1.0.0-alpha.9",
"ember-composable-helpers": "^2.1.0",
"ember-computed-style": "^0.3.0",
"ember-data": "~3.8.0",
"ember-data": "~3.12.0",
"ember-exam": "^4.0.0",
"ember-export-application-global": "^2.0.0",
"ember-href-to": "^3.1.0",
Expand All @@ -89,10 +89,11 @@
"ember-qunit": "^4.5.1",
"ember-resolver": "^5.0.1",
"ember-sinon-qunit": "^3.4.0",
"ember-source": "~3.8.0",
"ember-source": "~3.12.0",
"ember-test-selectors": "^2.1.0",
"ember-truth-helpers": "^2.0.0",
"eslint-plugin-ember": "^7.0.0",
"eslint-plugin-node": "^9.0.1",
"husky": "^3.0.4",
"ivy-codemirror": "^2.1.0",
"js-yaml": "^3.13.1",
Expand All @@ -106,7 +107,7 @@
"text-encoding": "^0.7.0"
},
"engines": {
"node": "6.* || 8.* || >= 10.*"
"node": "8.* || >= 10.*"
},
"ember-addon": {
"paths": [
Expand Down
1 change: 0 additions & 1 deletion ui-v2/testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ module.exports = {
// --no-sandbox is needed when running Chrome inside a container
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
Expand Down
Loading