Skip to content

Commit

Permalink
refactor: bump to Ember 4.12
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredgalanis committed Jul 2, 2024
1 parent 63bc0ae commit 88e7a1c
Show file tree
Hide file tree
Showing 8 changed files with 1,382 additions and 711 deletions.
10 changes: 6 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ module.exports = {
root: true,
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2020,
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
requireConfigFile: false,
babelOptions: {
plugins: [['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }]],
},
},
plugins: ['ember'],
Expand Down Expand Up @@ -73,6 +74,7 @@ module.exports = {
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./testem.js',
Expand All @@ -92,13 +94,13 @@ module.exports = {
// ember tests
{
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
rules: {
'prefer-arrow-callback': 'off',
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off',
},
extends: ['plugin:n/recommended'],
},
],
};
6 changes: 6 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,11 @@ module.exports = {
singleQuote: false,
},
},
{
files: '*.{js,ts}',
options: {
singleQuote: true,
},
},
],
};
8 changes: 8 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# unconventional files
/blueprints/*/files/

# compiled output
/dist/

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

module.exports = {
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
};
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": "4.8.0",
"version": "4.12.3",
"blueprints": [
{
"name": "app",
Expand Down
1 change: 1 addition & 0 deletions config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ module.exports = function (environment) {

locationType: 'history',
EmberENV: {
EXTEND_PROTOTYPES: false,
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
Expand Down
37 changes: 22 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@
"build:docker": "docker build --no-cache -t ghcr.io/eclipse-pass/pass-ui:$npm_package_version .",
"build:latest": "docker build --no-cache -t ghcr.io/eclipse-pass/pass-ui:latest .",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\"",
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js:fix": "eslint . --fix",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember server",
"test": "concurrently \"npm:lint\" \"npm:test:no-serve\" --names \"lint,test:\"",
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test:no-serve": "ember test",
"test:serve": "ember test -s",
"prepare": "husky install"
Expand All @@ -35,7 +37,8 @@
"@coreui/ajax": "1.0.10",
"@ember/optional-features": "^2.0.0",
"@ember/render-modifiers": "^2.0.5",
"@ember/test-helpers": "^2.8.1",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@faker-js/faker": "^8.1.0",
"@fortawesome/ember-fontawesome": "^0.4.3",
"@fortawesome/fontawesome-svg-core": "^6.5.2",
Expand All @@ -44,23 +47,22 @@
"@glimmer/tracking": "^1.1.2",
"ajv": "^6.10.0",
"alpaca": "1.5.27",
"babel-eslint": "^10.1.0",
"babel-plugin-dynamic-import-node": "^2.3.3",
"broccoli-asset-rev": "^3.0.0",
"clean-css": ">=4.1.11",
"concurrently": "^7.6.0",
"concurrently": "^8.0.1",
"coveralls": "^3.0.2",
"ember-ajax": "^5.0.0",
"ember-auto-import": "^2.6.3",
"ember-cli": "~4.8.0",
"ember-cli": "~4.12.3",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^7.26.11",
"ember-cli-content-security-policy": "^2.0.3",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-dependency-lint": "^2.0.1",
"ember-cli-deprecation-workflow": "github:ember-cli/ember-cli-deprecation-workflow#main",
"ember-cli-flash": "^4.0.0",
"ember-cli-htmlbars": "^6.1.1",
"ember-cli-htmlbars": "^6.2.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-inline-content": "^0.4.1",
"ember-cli-mirage": "^3.0.3",
Expand All @@ -70,31 +72,32 @@
"ember-concurrency": "^2.3.4",
"ember-concurrency-decorators": "^1.0.0",
"ember-css-modules": "^2.0.1",
"ember-data": "~4.8.8",
"ember-data": "~4.12.8",
"ember-fetch": "^8.1.2",
"ember-file-upload": "^7.3.0",
"ember-load-initializers": "^2.1.2",
"ember-lodash": "^4.19.4",
"ember-modal-dialog": "^4.1.2",
"ember-models-table": "^5.4.1",
"ember-modifier": "^4.1.0",
"ember-page-title": "^7.0.0",
"ember-power-select": "^7.0.0",
"ember-qunit": "^6.2.0",
"ember-radio-buttons": "^5.0.0",
"ember-resolver": "^10.0.0",
"ember-simple-auth": "^6.0.0",
"ember-sinon-qunit": "^7.1.4",
"ember-source": "~4.8.0",
"ember-template-lint": "^4.16.1",
"ember-source": "~4.12.0",
"ember-template-lint": "^5.7.2",
"ember-template-lint-plugin-prettier": "^4.0.0",
"ember-test-selectors": "^6.0.0",
"ember-truth-helpers": "^3.1.0",
"eslint": "^8.46.0",
"eslint-config-prettier": "^8.9.0",
"eslint-plugin-ember": "^11.10.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"eslint-plugin-qunit": "^7.3.4",
"husky": "^8.0.0",
"jquery": "^3.6.4",
"lint-staged": "^13.2.3",
Expand All @@ -106,12 +109,16 @@
"miragejs": "^0.1.48",
"popper.js": "^1.14.5",
"prettier": "^2.8.7",
"qunit": "^2.19.2",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"sinon": "^15.0.2",
"string-hash": "^1.1.3",
"stylelint": "^15.4.0",
"stylelint-config-standard": "^32.0.0",
"stylelint-prettier": "^3.0.0",
"sweetalert2": "^7.29.0",
"webpack": "^5.76.3"
"tracked-built-ins": "^3.1.1",
"webpack": "^5.78.0"
},
"husky": {
"hooks": {
Expand Down
Loading

0 comments on commit 88e7a1c

Please sign in to comment.