From a5401e6acbcf6ed0d35d5dac91d469ed4ddae172 Mon Sep 17 00:00:00 2001 From: Charles Fries Date: Sun, 15 Dec 2024 22:36:27 -0800 Subject: [PATCH] Update to ember 6 --- .eslintignore | 1 + .github/workflows/ci.yml | 2 +- .npmignore | 2 + CONTRIBUTING.md | 16 +++---- README.md | 14 +++--- package.json | 54 ++++++++++++------------ tests/dummy/config/ember-cli-update.json | 2 +- tests/dummy/config/ember-try.js | 8 ++-- tests/helpers/index.ts | 2 +- tsconfig.declarations.json | 10 ----- 10 files changed, 51 insertions(+), 60 deletions(-) delete mode 100644 tsconfig.declarations.json diff --git a/.eslintignore b/.eslintignore index 4ef2ca0..a4a2228 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,6 +2,7 @@ /blueprints/*/files/ # compiled output +/declarations/ /dist/ # misc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f8bcb1..21ce431 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,8 +57,8 @@ jobs: fail-fast: false matrix: try-scenario: - - ember-lts-4.8 - ember-lts-4.12 + - ember-lts-5.4 - ember-release - ember-beta - ember-canary diff --git a/.npmignore b/.npmignore index 69beb28..8c9fd97 100644 --- a/.npmignore +++ b/.npmignore @@ -23,6 +23,8 @@ /ember-cli-build.js /testem.js /tests/ +/tsconfig.declarations.json +/tsconfig.json /yarn-error.log /yarn.lock .gitkeep diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f6eb565..819dc4a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,23 +3,23 @@ ## Installation * `git clone ` -* `cd my-addon` +* `cd ember-cloud-firestore-adapter` * `npm install` ## Linting -* `npm run lint` -* `npm run lint:fix` +- `npm run lint` +- `npm run lint:fix` ## Running tests -* `ember test` – Runs the test suite on the current Ember version -* `ember test --server` – Runs the test suite in "watch mode" -* `ember try:each` – Runs the test suite against multiple Ember versions +- `npm run test` – Runs the test suite on the current Ember version +- `npm run test:ember -- --server` – Runs the test suite in "watch mode" +- `npm run test:ember-compatibility` – Runs the test suite against multiple Ember versions ## Running the dummy application -* `ember serve` -* Visit the dummy application at [http://localhost:4200](http://localhost:4200). +- `npm run start` +- Visit the dummy application at [http://localhost:4200](http://localhost:4200). For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/). diff --git a/README.md b/README.md index b6008c9..befad71 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,10 @@ In order to continue development with Ember and Cloud Firestore, I had to build ## Compatibility -* Ember.js v4.8 or above -* Ember CLI v4.8 or above -* Node.js v18 or above -* Firebase v9.14.x +- Ember.js v4.12 or above +- Ember CLI v4.12 or above +- Node.js v18 or above +- Firebase v9.14.x ## Installation @@ -40,16 +40,14 @@ Once you've installed it, you can now install the addon itself: ember install ember-cloud-firestore-adapter ``` -Getting Started ------------------------------------------------------------------------------- +## Usage -Checkout the docs [here](docs/getting-started.md). +[Longer description of how to use the addon in apps.] ## Contributing See the [Contributing](CONTRIBUTING.md) guide for details. - ## License This project is licensed under the [MIT License](LICENSE.md). diff --git a/package.json b/package.json index c2fb9dc..4cc4f37 100644 --- a/package.json +++ b/package.json @@ -34,21 +34,26 @@ "postpack": "ember ts:clean" }, "dependencies": { - "@babel/core": "^7.23.2", - "ember-auto-import": "2.6.3", + "@babel/core": "^7.26.0", + "ember-auto-import": "2.10.0", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", "ember-cli-typescript": "^4.2.1" }, "devDependencies": { - "@ember/optional-features": "^2.1.0", + "@ember/optional-features": "^2.2.0", "@ember/string": "^3.1.1", - "@ember/test-helpers": "^3.2.0", - "@embroider/test-setup": "^3.0.3", + "@ember/test-helpers": "^4.0.4", + "@embroider/test-setup": "^4.0.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "@tsconfig/ember": "^3.0.8", "@types/ember": "^4.0.11", + "@types/ember-data": "^4.4.16", + "@types/ember-data__adapter": "^4.0.6", + "@types/ember-data__model": "^4.0.5", + "@types/ember-data__serializer": "^4.0.6", + "@types/ember-data__store": "^4.0.7", "@types/ember__application": "^4.0.11", "@types/ember__array": "^4.0.10", "@types/ember__component": "^4.0.22", @@ -66,11 +71,6 @@ "@types/ember__template": "^4.0.7", "@types/ember__test": "^4.0.6", "@types/ember__utils": "^4.0.7", - "@types/ember-data": "^4.4.16", - "@types/ember-data__adapter": "^4.0.6", - "@types/ember-data__model": "^4.0.5", - "@types/ember-data__serializer": "^4.0.6", - "@types/ember-data__store": "^4.0.7", "@types/node": "^20.14.2", "@types/qunit": "^2.19.10", "@types/rsvp": "^4.0.9", @@ -79,7 +79,7 @@ "@typescript-eslint/parser": "^6.21.0", "broccoli-asset-rev": "^3.0.0", "concurrently": "^8.2.2", - "ember-cli": "~5.4.2", + "ember-cli": "~6.0.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.2", "ember-cli-fastboot": "^4.1.2", @@ -90,38 +90,38 @@ "ember-data": "~4.11.2", "ember-fetch": "^8.1.2", "ember-load-initializers": "^2.1.2", - "ember-page-title": "^8.0.0", - "ember-qunit": "^8.0.1", - "ember-resolver": "^11.0.1", + "ember-page-title": "^8.2.3", + "ember-qunit": "^8.1.1", + "ember-resolver": "^12.0.1", "ember-simple-auth": "^6.0.0", "ember-sinon-qunit": "^7.4.0", - "ember-source": "~5.4.0", + "ember-source": "~6.0.0", "ember-source-channel-url": "^3.0.0", - "ember-template-lint": "^5.11.2", + "ember-template-lint": "^6.0.0", "ember-try": "^3.0.0", - "eslint": "^8.52.0", + "eslint": "^8.57.1", "eslint-config-airbnb-base": "^15.0.0", - "eslint-config-prettier": "^9.0.0", - "eslint-plugin-ember": "^11.11.1", + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-ember": "^12.3.1", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-n": "^16.2.0", - "eslint-plugin-prettier": "^5.0.1", - "eslint-plugin-qunit": "^8.0.1", + "eslint-plugin-n": "^16.6.2", + "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-qunit": "^8.1.2", "firebase": "^9.14.0", "firebase-tools": "^11.2.2", "loader.js": "^4.7.0", - "prettier": "^3.0.3", - "qunit": "^2.21.0", - "qunit-dom": "^2.0.0", + "prettier": "^3.3.3", + "qunit": "^2.22.0", + "qunit-dom": "^3.3.0", "rimraf": "^5.0.7", "sinon": "^17.0.0", "stylelint": "^15.11.0", "stylelint-config-standard": "^34.0.0", - "stylelint-prettier": "^4.0.2", + "stylelint-prettier": "^4.1.0", "ts-patch": "^3.2.0", "ts-transformer-keys": "^0.4.4", "typescript": "^5.4.5", - "webpack": "^5.91.0" + "webpack": "^5.96.1" }, "peerDependencies": { "ember-auto-import": "2.x", diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json index 2267e62..fafec90 100644 --- a/tests/dummy/config/ember-cli-update.json +++ b/tests/dummy/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "5.4.2", + "version": "6.0.1", "blueprints": [ { "name": "addon", diff --git a/tests/dummy/config/ember-try.js b/tests/dummy/config/ember-try.js index 93b9f51..e3e6b94 100644 --- a/tests/dummy/config/ember-try.js +++ b/tests/dummy/config/ember-try.js @@ -7,18 +7,18 @@ module.exports = async function () { return { scenarios: [ { - name: 'ember-lts-4.8', + name: 'ember-lts-4.12', npm: { devDependencies: { - 'ember-source': '~4.8.0', + 'ember-source': '~4.12.0', }, }, }, { - name: 'ember-lts-4.12', + name: 'ember-lts-5.4', npm: { devDependencies: { - 'ember-source': '~4.12.0', + 'ember-source': '~5.4.0', }, }, }, diff --git a/tests/helpers/index.ts b/tests/helpers/index.ts index 74e32bc..e190f56 100644 --- a/tests/helpers/index.ts +++ b/tests/helpers/index.ts @@ -24,7 +24,7 @@ function setupApplicationTest(hooks: NestedHooks, options?: SetupTestOptions) { // This is also a good place to call test setup functions coming // from other addons: // - // setupIntl(hooks); // ember-intl + // setupIntl(hooks, 'en-us'); // ember-intl // setupMirage(hooks); // ember-cli-mirage } diff --git a/tsconfig.declarations.json b/tsconfig.declarations.json deleted file mode 100644 index 5a21df7..0000000 --- a/tsconfig.declarations.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "declarationDir": "declarations", - "emitDeclarationOnly": true, - "noEmit": false, - "rootDir": "." - }, - "include": ["addon", "addon-test-support"] -}