Skip to content

Commit

Permalink
chore(ember): wip ember v5
Browse files Browse the repository at this point in the history
  • Loading branch information
velrest committed Jul 4, 2023
1 parent 0b7acdc commit c9e1867
Show file tree
Hide file tree
Showing 11 changed files with 439 additions and 368 deletions.
12 changes: 0 additions & 12 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# 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
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
8 changes: 0 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log
*.swp

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
8 changes: 2 additions & 6 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
Expand All @@ -18,10 +14,11 @@
/.gitignore
/.prettierignore
/.prettierrc.js
/.stylelintignore
/.stylelintrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
Expand All @@ -32,7 +29,6 @@

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
14 changes: 1 addition & 13 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/
.*/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
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 .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ The frontend for the [emeis](https://github.com/projectcaluma/emeis) user manage

## Compatibility

- Ember.js v3.28 or above
- Ember CLI v3.28 or above
- Node.js v14 or above
- Ember.js v4.4 or above
- Ember CLI v4.4 or above
- Node.js v16 or above

## Installation

Expand Down
42 changes: 24 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
"scripts": {
"build": "ember build --environment=production",
"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": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
Expand Down Expand Up @@ -47,9 +49,9 @@
"@embroider/macros": "^1.11.1",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"ember-auto-import": "^2.5.0",
"ember-auto-import": "^2.6.3",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.1.1",
"ember-cli-htmlbars": "^6.2.0",
"ember-composable-helpers": "^5.0.0",
"ember-concurrency": "^2.1.2",
"ember-data": "^3.28.3",
Expand All @@ -69,20 +71,22 @@
"@adfinis/eslint-config": "2.0.0",
"@adfinis/semantic-release-config": "4.0.0",
"@babel/core": "7.21.4",
"@babel/eslint-parser": "7.21.3",
"@babel/plugin-proposal-decorators": "7.21.0",
"@babel/eslint-parser": "7.22.5",
"@babel/plugin-proposal-decorators": "7.22.5",
"@commitlint/cli": "17.3.0",
"@commitlint/config-conventional": "17.6.5",
"@ember/optional-features": "2.0.0",
"@ember/test-helpers": "2.9.3",
"@ember/string": "3.1.1",
"@ember/test-helpers": "3.0.3",
"@embroider/compat": "3.1.3",
"@embroider/core": "3.1.1",
"@embroider/test-setup": "3.0.1",
"@embroider/webpack": "3.1.1",
"@faker-js/faker": "6.2.0",
"broccoli-asset-rev": "3.0.0",
"concurrently": "7.6.0",
"ember-cli": "4.12.1",
"concurrently": "8.2.0",
"ember-cli": "5.0.0",
"ember-cli-clean-css": "2.0.0",
"ember-cli-dependency-checker": "3.3.1",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-mirage": "3.0.0-alpha.3",
Expand All @@ -92,19 +96,18 @@
"ember-engines": "0.9.0",
"ember-load-initializers": "2.1.2",
"ember-maybe-import-regenerator": "1.0.0",
"ember-qunit": "6.2.0",
"ember-resolver": "8.0.3",
"ember-source": "4.12.2",
"ember-qunit": "7.0.0",
"ember-resolver": "10.1.0",
"ember-source": "5.0.0",
"ember-source-channel-url": "3.0.0",
"ember-template-lint": "5.10.3",
"ember-template-lint-plugin-prettier": "4.1.0",
"ember-try": "3.0.0-beta.1",
"eslint": "8.39.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-ember": "11.2.1",
"eslint": "8.42.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-ember": "11.8.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-n": "15.7.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-n": "16.0.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-qunit": "7.3.4",
"husky": "8.0.3",
Expand All @@ -113,17 +116,20 @@
"miragejs": "0.1.47",
"npm-package-json-lint": "6.4.0",
"npm-run-all": "4.1.5",
"prettier": "2.8.7",
"prettier": "2.8.8",
"qunit": "2.19.4",
"qunit-dom": "2.0.0",
"sass": "1.56.1",
"stylelint": "15.7.0",
"stylelint-config-standard": "33.0.0",
"stylelint-prettier": "3.0.0",
"webpack": "5.88.1"
},
"peerDependencies": {
"ember-source": "^3.28.0 || ^4.0.0"
"ember-source": ">= 4.0.0"
},
"engines": {
"node": ">= 18.*"
"node": "16.* || >= 18"
},
"ember": {
"edition": "octane"
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/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.9.2",
"version": "5.0.0",
"blueprints": [
{
"name": "addon",
Expand Down
Loading

0 comments on commit c9e1867

Please sign in to comment.