Skip to content

Commit

Permalink
Upgrade ember-cli and dev deps (#348)
Browse files Browse the repository at this point in the history
  • Loading branch information
mixonic authored Dec 9, 2021
1 parent d101d8a commit e8924e9
Show file tree
Hide file tree
Showing 9 changed files with 1,034 additions and 1,171 deletions.
1 change: 0 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

root = true


[*]
end_of_line = lf
charset = utf-8
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
Expand All @@ -24,5 +25,6 @@
/bower.json.ember-try
/package.json.ember-try

# custom
.idea/
.DS_Store
6 changes: 6 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@
/.editorconfig
/.ember-cli
/.env*
/.eslintcache
/.eslintignore
/.eslintrc.js
/.git/
/.gitignore
/.prettierignore
/.prettierrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
Expand All @@ -22,6 +26,7 @@
/ember-cli-build.js
/testem.js
/tests/
/yarn-error.log
/yarn.lock
.gitkeep

Expand All @@ -30,4 +35,5 @@
/bower.json.ember-try
/package.json.ember-try

# custom
.idea/
1 change: 0 additions & 1 deletion addon/-debug/edge-visualization/visualization.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* global document */
import { ViewportContainer } from '../../-private';

function applyVerticalStyles(element, geography) {
Expand Down
4 changes: 2 additions & 2 deletions addon/-private/data-view/elements/viewport-container.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function ViewportContainer() {
|| document.documentElement.scrollTop;
},
set(v) {
return document.body.scrollTop = document.documentElement.scrollTop = v;
document.body.scrollTop = document.documentElement.scrollTop = v;
}
});

Expand All @@ -34,7 +34,7 @@ export function ViewportContainer() {
|| document.documentElement.scrollLeft;
},
set(v) {
return window.scrollX
window.scrollX
= window.pageXOffset
= document.body.scrollLeft
= document.documentElement.scrollLeft = v;
Expand Down
4 changes: 2 additions & 2 deletions addon/-private/data-view/viewport-container.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function ViewportContainer() {
|| document.documentElement.scrollTop;
},
set(v) {
return document.body.scrollTop = document.documentElement.scrollTop = v;
document.body.scrollTop = document.documentElement.scrollTop = v;
}
});

Expand All @@ -34,7 +34,7 @@ export function ViewportContainer() {
|| document.documentElement.scrollLeft;
},
set(v) {
return window.scrollX
window.scrollX
= window.pageXOffset
= document.body.scrollLeft
= document.documentElement.scrollLeft = v;
Expand Down
35 changes: 20 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,15 @@
"test": "tests"
},
"scripts": {
"build": "ember build",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
"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:hbs": "ember-template-lint .",
"lint:js": "eslint .",
"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": "npm-run-all lint test:*",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each"
},
Expand All @@ -61,31 +64,33 @@
"ember-raf-scheduler": "0.2.0"
},
"devDependencies": {
"@ember/optional-features": "^0.7.0",
"@ember/optional-features": "^2.0.0",
"babel-eslint": "^10.1.0",
"bootstrap": "~3.3.5",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.12.0",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli": "~3.28.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-fastboot": "^2.1.3",
"ember-cli-github-pages": "^0.2.2",
"ember-cli-htmlbars-inline-precompile": "^3.0.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-cli-template-lint": "^1.0.0",
"ember-cli-uglify": "^3.0.0",
"ember-code-snippet": "^2.4.1",
"ember-data": "3.11.5",
"ember-data": "~3.12.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-native-dom-helpers": "^0.7.0",
"ember-perf-timeline": "^1.2.1",
"ember-qunit": "^4.5.1",
"ember-resolver": "^6.0.0",
"ember-resolver": "^8.0.2",
"ember-source": "~3.12.0",
"ember-source-channel-url": "^2.0.1",
"ember-try": "^1.2.1",
"ember-source-channel-url": "^3.0.0",
"ember-try": "^1.4.0",
"eslint": "^7.32.0",
"eslint-plugin-ember": "^6.7.1",
"eslint-plugin-node": "^9.1.0",
"loader.js": "^4.7.0",
Expand Down
19 changes: 9 additions & 10 deletions testem.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
'use strict';

module.exports = {
test_page: 'tests/index.html?hidepassed',
disable_watching: true,
launch_in_ci: [
'Chrome'
],
launch_in_dev: [
'Chrome'
],
launch_in_ci: ['Chrome'],
launch_in_dev: ['Chrome'],
browser_start_timeout: 120,
browser_args: {
Chrome: {
ci: [
Expand All @@ -17,8 +16,8 @@ module.exports = {
'--disable-software-rasterizer',
'--mute-audio',
'--remote-debugging-port=0',
'--window-size=1440,900'
].filter(Boolean)
}
}
'--window-size=1440,900',
].filter(Boolean),
},
},
};
Loading

0 comments on commit e8924e9

Please sign in to comment.