Skip to content

Commit

Permalink
Bump to latest stable v3.26 via ember-cli-update
Browse files Browse the repository at this point in the history
  • Loading branch information
fabmiz committed May 7, 2021
1 parent 6a1aca9 commit b09f604
Show file tree
Hide file tree
Showing 10 changed files with 709 additions and 660 deletions.
33 changes: 23 additions & 10 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
!.eslintrc.js
!.template-lintrc.js
/coverage/**
/dist/**
/docs/**
/tmp/**
/vendor/**
/blueprints/*/files/**
/blueprints/*/engine-files/**
# unconventional js
/blueprints/*/files/
/vendor/
/config/local.js
/handbook-docs/**
/handbook-docs/
/docs/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

# misc
/.sass-cache
/.eslintcache
/connect.lock
/coverage/*
/libpeerconnection.log
Expand Down
21 changes: 21 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
5 changes: 5 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
singleQuote: true,
};
4 changes: 2 additions & 2 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'use strict';

module.exports = {
extends: 'recommended',
extends: 'octane',

rules: {
'block-indentation': 4,
Expand All @@ -14,6 +14,6 @@ module.exports = {
},

ignore: [
'**/lib/handbook/**/*',
'handbook-docs/**/*',
],
};
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ Make use of the many generators for code, try `ember help generate` for more det
* `ember test`
* `ember test --server`

### Linting

* `yarn lint`
* `yarn lint:fix`

### Building

* `ember build` (development)
Expand Down
2 changes: 1 addition & 1 deletion config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "3.20.2",
"version": "3.26.1",
"blueprints": [
{
"name": "app",
Expand Down
46 changes: 26 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@
"scripts": {
"build": "ember build --environment=production",
"build:test": "ember build --environment=test",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
"lint:js": "eslint . --ext .js --max-warnings=0 --cache",
"lint:js:fix": "eslint . --ext .js --fix",
"start": "ember server",
"lint:ts": "eslint . --ext .ts --max-warnings=0",
"lint:js": "eslint . --ext .js --max-warnings=0",
"lint:ts": "eslint . --ext .ts --max-warnings=0 --cache",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:style": "stylelint 'app/**/*.scss' 'lib/**/*.scss'",
"lint:template": "ember-template-lint 'app/**/*.hbs' 'lib/**/*.hbs'",
"test": "npm-run-all lint:* test:*",
"test": "npm-run-all lint test:*",
"test:ember": "ember test",
"test:cover": "EMBER_ENV=test COVERAGE=true ember exam",
"test:config": "mocha node-tests/config-test.js",
Expand Down Expand Up @@ -50,16 +53,16 @@
"@ember-intl/cp-validations": "^4.0.1",
"@ember-intl/decorators": "^1.0.0",
"@ember/jquery": "^0.6.0",
"@ember/optional-features": "^1.3.0",
"@ember/optional-features": "^2.0.0",
"@ember/render-modifiers": "^1.0.0",
"@ember/test-helpers": "^2.2.5",
"@ember/test-waiters": "^2.4.3",
"@fortawesome/ember-fontawesome": "^0.2.3",
"@fortawesome/free-brands-svg-icons": "^5.15.2",
"@fortawesome/free-regular-svg-icons": "^5.15.2",
"@fortawesome/free-solid-svg-icons": "^5.15.2",
"@glimmer/component": "^1.0.1",
"@glimmer/tracking": "^1.0.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@types/ace": "^0.0.42",
"@types/dropzone": "^5.0.4",
"@types/ember": "^3.1.1",
Expand Down Expand Up @@ -109,23 +112,23 @@
"ember-ajax": "^5.0.0",
"ember-angle-bracket-invocation-polyfill": "^2.0.2",
"ember-animated": "^0.9.0",
"ember-auto-import": "^1.6.0",
"ember-auto-import": "^1.11.2",
"ember-basic-dropdown": "^3.0.16",
"ember-bootstrap": "^4.6.3",
"ember-bootstrap-datepicker": "^2.0.9",
"ember-changeset": "^3.13.2",
"ember-changeset-validations": "^3.14.2",
"ember-cli": "~3.20.2",
"ember-cli-app-version": "^3.2.0",
"ember-cli": "~3.26.1",
"ember-cli-app-version": "^5.0.0",
"ember-cli-autoprefixer": "^0.8.1",
"ember-cli-babel": "^7.21.0",
"ember-cli-babel": "^7.26.3",
"ember-cli-blueprint-test-helpers": "^0.19.2",
"ember-cli-chart": "^3.5.0",
"ember-cli-clipboard": "0.9.0",
"ember-cli-code-coverage": "^1.0.0-beta.8",
"ember-cli-dependency-checker": "^3.0.0",
"ember-cli-deprecation-workflow": "^1.0.1",
"ember-cli-htmlbars": "^5.2.0",
"ember-cli-htmlbars": "^5.7.1",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-inline-content": "0.4.1",
"ember-cli-meta-tags": "^6.1.2",
Expand All @@ -140,10 +143,10 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-string-helpers": "^5.0.0",
"ember-cli-stylelint": "^2.1.0",
"ember-cli-terser": "^4.0.1",
"ember-cli-test-loader": "^2.2.0",
"ember-cli-typescript": "^4.1.0",
"ember-cli-typescript-blueprints": "^3.0.0",
"ember-cli-uglify": "^3.0.0",
"ember-click-outside": "^1.0.4",
"ember-code-snippet": "^2.4.0",
"ember-collapsible-panel": "^3.1.1",
Expand All @@ -159,7 +162,7 @@
"ember-css-modules-reporter": "^1.2.0",
"ember-css-modules-sass": "^1.0.1",
"ember-css-modules-stylelint": "^1.2.0",
"ember-data": "~3.20.0",
"ember-data": "~3.26.0",
"ember-decorators": "^6.1.1",
"ember-diff-attrs": "^0.2.1",
"ember-element-helper": "^0.2.0",
Expand All @@ -174,7 +177,7 @@
"ember-get-config": "^0.2.4",
"ember-in-viewport": "^3.7.3",
"ember-intl": "^5.6.2",
"ember-load-initializers": "^2.0.0",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-metrics": "https://github.com/cos-forks/ember-metrics#v0.12.1+cos0",
"ember-mockdate-shim": "^0.1.0",
Expand All @@ -189,26 +192,28 @@
"ember-qrcode-shim": "^0.4.0",
"ember-qunit": "^5.1.4",
"ember-radio-button": "^2.0.0",
"ember-resolver": "^8.0.0",
"ember-resolver": "^8.0.2",
"ember-responsive": "^3.0.0",
"ember-simple-auth": "^1.6.0",
"ember-sinon": "^5.0.0",
"ember-sinon-qunit": "^5.0.0",
"ember-sortable": "2.2",
"ember-source": "~3.20.2",
"ember-source": "~3.26.1",
"ember-tag-input": "^1.2.2",
"ember-template-compiler": "^1.9.0-alpha",
"ember-template-lint": "^2.9.1",
"ember-template-lint": "^3.2.0",
"ember-toastr": "^1.7.2",
"ember-wormhole": "^0.5.4",
"eslint": "^7.24.0",
"eslint-config-airbnb-base": "14.0.0",
"eslint-plugin-ember": "^8.9.1",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-ember": "^10.3.0",
"eslint-plugin-ember-concurrency": "^0.3.1",
"eslint-plugin-es": "^4.1.0",
"eslint-plugin-eslint-comments": "^3.1.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.3.1",
"faker": "^4.1.0",
"flat": "^4.0.0",
"husky": "^2.1.0",
Expand All @@ -227,8 +232,9 @@
"mocha": "^6.1.4",
"node-sass": "^4.13.1",
"npm-run-all": "^4.1.5",
"prettier": "^2.2.1",
"qunit": "^2.14.1",
"qunit-dom": "^1.2.0",
"qunit-dom": "^1.6.0",
"sass": "^1.26.3",
"seedrandom": "^3.0.1",
"sinon": "^9.0.0",
Expand Down
30 changes: 15 additions & 15 deletions testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ module.exports = {
disable_watching: true,
reporter: new DotReporter(),
parallel: 2,
launch_in_ci: [
'Chrome',
],
launch_in_dev: [
'Chrome',
],
browser_start_timeout: 60,
launch_in_ci: ['Chrome'],
launch_in_dev: ['Chrome'],
browser_start_timeout: 120,
browser_args: {
Chrome: [
'--headless',
'--remote-debugging-port=9222',
'--no-sandbox',
],
Firefox: [
'-headless',
],
Chrome: {
ci: [
// --no-sandbox is needed when running Chrome inside a container
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
'--remote-debugging-port=9222',
'--window-size=1440,900',
].filter(Boolean),
},
},
};
Loading

0 comments on commit b09f604

Please sign in to comment.