Skip to content

Commit

Permalink
Update to ember 6
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesfries committed Dec 16, 2024
1 parent 3be007d commit a5401e6
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 60 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/blueprints/*/files/

# compiled output
/declarations/
/dist/

# misc
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
/ember-cli-build.js
/testem.js
/tests/
/tsconfig.declarations.json
/tsconfig.json
/yarn-error.log
/yarn.lock
.gitkeep
Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
## Installation

* `git clone <repository-url>`
* `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/).
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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).
54 changes: 27 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
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": "5.4.2",
"version": "6.0.1",
"blueprints": [
{
"name": "addon",
Expand Down
8 changes: 4 additions & 4 deletions tests/dummy/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
10 changes: 0 additions & 10 deletions tsconfig.declarations.json

This file was deleted.

0 comments on commit a5401e6

Please sign in to comment.