Skip to content

Commit

Permalink
Run the update command - fix the result.
Browse files Browse the repository at this point in the history
  • Loading branch information
svogt0511 committed Nov 18, 2024
1 parent 9e8e47c commit 5052d4e
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 39 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
6 changes: 0 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
dist/*
/tmp/
Expand All @@ -11,11 +9,8 @@ dist/*
# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log
Expand Down Expand Up @@ -59,7 +54,6 @@ cypress/videosFolder
.DS_Store
._.DS_Store
/.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: 7 additions & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
{"ignore_dirs":["tmp","dist","corber"]}
<<<<<<< HEAD
{"ignore_dirs":["tmp","dist","corber"]}
=======
{
"ignore_dirs": ["dist"]
}
>>>>>>> b3bd33a5... v4.12.2...v5.0.0
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.12.2",
"version": "5.0.0",
"blueprints": [
{
"name": "app",
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@cypress/code-coverage": "^3.12.33",
"@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^2.9.3",
"@ember/test-helpers": "^3.0.3",
"@embroider/macros": "1.16.2",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
Expand Down Expand Up @@ -120,7 +120,7 @@
"ember-bootstrap-power-select": "^5.0.0",
"ember-can": "^4.2.0",
"ember-classic-decorator": "^3.0.1",
"ember-cli": "~4.12.2",
"ember-cli": "~5.0.0",
"ember-cli-app-version": "^6.0.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-clean-css": "^2.0.0",
Expand All @@ -143,7 +143,7 @@
"ember-composable-helpers": "^5.0.0",
"ember-concurrency": "^4.0.2",
"ember-cp-validations": "^6.0.1",
"ember-data": "~4.6.5",
"ember-data": "~5.0.0",
"ember-data-factory-guy": "^4.0.0-alpha.2",
"ember-data-model-fragments": "6.0.10",
"ember-decorators": "^6.1.1",
Expand All @@ -160,11 +160,11 @@
"ember-page-title": "^7.0.0",
"ember-power-select": "^8.2.0",
"ember-prism": "^0.13.0",
"ember-qunit": "^6.2.0",
"ember-qunit": "^7.0.0",
"ember-radio-button": "3.0.0-beta.1",
"ember-resolver": "^10.0.0",
"ember-resolver": "^10.1.0",
"ember-simple-auth": "^4.2.2",
"ember-source": "~4.12.4",
"ember-source": "~5.0.0",
"ember-template-lint": "^6.0.0",
"ember-test-selectors": "^6.0.0",
"ember-truth-helpers": "^4.0.3",
Expand Down

0 comments on commit 5052d4e

Please sign in to comment.