Skip to content

Commit

Permalink
Sync with latest addon blueprint via ember-cli-update --to=4.12 (#681)
Browse files Browse the repository at this point in the history
* Sync with latest addon blueprint via ember-cli-update --to=4.12

* bump ember-data to v4.12

* provide default adapter and serializer re-exports

* Replace action helper with fn

* comment embroider scenarios due to Ember Data incompatibility
  • Loading branch information
SergeAstapov authored Oct 16, 2024
1 parent 84b78de commit 25c89a5
Show file tree
Hide file tree
Showing 24 changed files with 21,524 additions and 21,064 deletions.
8 changes: 7 additions & 1 deletion .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
}
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@
# 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
16 changes: 9 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 14.x
cache: npm
- name: Install Dependencies
run: npm ci
Expand All @@ -40,7 +40,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 14.x
cache: npm
- name: Install Dependencies
run: npm install --no-shrinkwrap
Expand All @@ -60,20 +60,22 @@ jobs:
- ember-lts-3.20
- ember-lts-3.24
- ember-lts-3.28
- ember-lts-4.4
- ember-lts-4.8
- ember-lts-4.12
- ember-release
- ember-beta
- ember-canary
- ember-classic
- ember-default-with-jquery
- embroider-safe
- embroider-optimized
# @todo uncomment once Ember Data bumped to => 5.3
# - embroider-safe
# - embroider-optimized

steps:
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 14.x
cache: npm
- name: Install Dependencies
run: npm ci
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,10 @@
# 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

# broccoli-debug
/DEBUG/
6 changes: 5 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@
/.prettierignore
/.prettierrc.js
/.release-it.json
/.stylelintignore
/.stylelintrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/assets/
/bower.json
/config/ember-try.js
/CODE_OF_CONDUCT.md
/CONTRIBUTING.md
/ember-cli-build.js
Expand All @@ -37,4 +38,7 @@
# 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
14 changes: 13 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
# 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
24 changes: 24 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,27 @@ get accepted:

If your pull-request addresses an issue then please add the corresponding
issue's number to the description of your pull-request.

## Installation

* `git clone git@github.com:adopted-ember-addons/ember-changeset.git`
* `cd ember-changeset`
* `npm install`

## Linting

* `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

## Running the dummy application

* `ember serve`
* 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/).
30 changes: 13 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@
<a href="https://badge.fury.io/js/ember-changeset"><img alt="npm version" src="https://badge.fury.io/js/ember-changeset.svg"></a>
<a href="https://emberobserver.com/addons/ember-changeset"><img alt="Ember Observer Score" src="https://emberobserver.com/badges/ember-changeset.svg"></a>

## Compatibility

* Ember.js v3.20 or above
* Ember CLI v3.20 or above
* Node.js v12 or above


## Installation

```
ember install ember-changeset
```
Expand Down Expand Up @@ -1143,24 +1152,11 @@ We're grateful to these wonderful contributors who've contributed to `ember-chan

[//]: contributor-faces

## Installation

- `git clone` this repository
- `npm install`

## Running

- `ember serve`
- Visit your app at http://localhost:4200.

## Running Tests
## Contributing

- `npm test` (Runs `ember try:testall` to test your addon against multiple Ember versions)
- `ember test`
- `ember test --serve`
See the [Contributing](CONTRIBUTING.md) guide for details.

## Building

- `ember build`
## License

For more information on using ember-cli, visit [http://ember-cli.com/](http://ember-cli.com/).
This project is licensed under the [MIT License](LICENSE.md).
5 changes: 0 additions & 5 deletions config/environment.js

This file was deleted.

2 changes: 1 addition & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function (defaults) {
let app = new EmberAddon(defaults, {
const app = new EmberAddon(defaults, {
// Add options here
});

Expand Down
Loading

0 comments on commit 25c89a5

Please sign in to comment.