From 5052d4ec1136128e3a837c990996dc22f836e8e2 Mon Sep 17 00:00:00 2001 From: Suzanne Vogt Date: Mon, 18 Nov 2024 16:05:21 -0500 Subject: [PATCH] Run the update command - fix the result. --- .eslintignore | 12 ------------ .gitignore | 6 ------ .prettierignore | 14 +------------- .watchmanconfig | 8 +++++++- config/ember-cli-update.json | 2 +- package.json | 12 ++++++------ 6 files changed, 15 insertions(+), 39 deletions(-) diff --git a/.eslintignore b/.eslintignore index d474a40bd..9385391f2 100644 --- a/.eslintignore +++ b/.eslintignore @@ -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 diff --git a/.gitignore b/.gitignore index 48bd6358d..93eb310ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -# See https://help.github.com/ignore-files/ for more about ignoring files. - # compiled output dist/* /tmp/ @@ -11,11 +9,8 @@ dist/* # misc /.env* /.pnp* -/.sass-cache /.eslintcache -/connect.lock /coverage/ -/libpeerconnection.log /npm-debug.log* /testem.log /yarn-error.log @@ -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 diff --git a/.prettierignore b/.prettierignore index 4178fd571..9385391f2 100644 --- a/.prettierignore +++ b/.prettierignore @@ -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 diff --git a/.watchmanconfig b/.watchmanconfig index c8859b0de..93a005919 100644 --- a/.watchmanconfig +++ b/.watchmanconfig @@ -1 +1,7 @@ -{"ignore_dirs":["tmp","dist","corber"]} \ No newline at end of file +<<<<<<< HEAD +{"ignore_dirs":["tmp","dist","corber"]} +======= +{ + "ignore_dirs": ["dist"] +} +>>>>>>> b3bd33a5... v4.12.2...v5.0.0 diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json index 6745794ca..c85dad0e7 100644 --- a/config/ember-cli-update.json +++ b/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "4.12.2", + "version": "5.0.0", "blueprints": [ { "name": "app", diff --git a/package.json b/package.json index c22219191..4f3006ba1 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", @@ -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", @@ -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",