Skip to content

Commit 3ab843a

Browse files
committed
Ember Blueprint Updates
Partially apply blueprint without bumping ember-source or a few other packages that may be causing an issue. Landing the rest of the changes separately to isolate the problem.
1 parent 6a96d87 commit 3ab843a

File tree

12 files changed

+495
-184
lines changed

12 files changed

+495
-184
lines changed

.ember-cli

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
{
2-
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
7-
*/
8-
"disableAnalytics": false,
9-
102
/**
113
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
124
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/blueprints/*/files/
33

44
# compiled output
5+
/declarations/
56
/dist/
67

78
# misc

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
timeout-minutes: 10
1919

2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- name: Install Node
2323
uses: volta-cli/action@v4
2424
- name: Install Dependencies
@@ -34,7 +34,7 @@ jobs:
3434
timeout-minutes: 10
3535

3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838
- name: Install Node
3939
uses: volta-cli/action@v4
4040
- name: Install Dependencies
@@ -55,6 +55,7 @@ jobs:
5555
- ember-lts-4.4
5656
- ember-lts-4.8
5757
- ember-lts-4.12
58+
- ember-lts-5.4
5859
- ember-release
5960
- embroider-safe
6061
- embroider-optimized
@@ -66,7 +67,7 @@ jobs:
6667
experimental: true
6768

6869
steps:
69-
- uses: actions/checkout@v3
70+
- uses: actions/checkout@v4
7071
- name: Install Node
7172
uses: volta-cli/action@v4
7273
- name: Install Dependencies

.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
/ember-cli-build.js
2424
/testem.js
2525
/tests/
26+
/tsconfig.declarations.json
27+
/tsconfig.json
2628
/yarn-error.log
2729
/yarn.lock
2830
/.yarn

CONTRIBUTING.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
## Installation
44

5-
* `git clone <repository-url>`
6-
* `cd ember-resize-modifier`
7-
* `yarn install`
5+
- `git clone <repository-url>`
6+
- `cd ember-resize-modifier`
7+
- `yarn install`
88

99
## Linting
1010

11-
* `yarn lint`
12-
* `yarn lint:fix`
11+
- `yarn lint`
12+
- `yarn lint:fix`
1313

1414
## Running tests
1515

16-
* `ember test` – Runs the test suite on the current Ember version
17-
* `ember test --server` – Runs the test suite in "watch mode"
18-
* `ember try:each` – Runs the test suite against multiple Ember versions
16+
- `yarn test` – Runs the test suite on the current Ember version
17+
- `yarn test:ember --server` – Runs the test suite in "watch mode"
18+
- `yarn test:ember-compatibility` – Runs the test suite against multiple Ember versions
1919

2020
## Running the dummy application
2121

22-
* `ember serve`
23-
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
22+
- `yarn start`
23+
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

2525
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ Check out the [documentation](https://ember-resize-modifier.jhawk.co/)!
99

1010
We adhere to the [Ember Community Guidelines](https://emberjs.com/guidelines/) for our Code of Conduct.
1111

12-
1312
## Compatibility
1413

15-
* Ember.js v3.28 or above
16-
* Ember CLI v3.28 or above
17-
* Node.js v16 or above
14+
* Ember.js v4.4 or above
15+
* Ember CLI v4.4 or above
16+
* Node.js v18 or above
1817
* [All N-1 browsers](https://caniuse.com/#search=resizeobserver)
1918

2019

@@ -24,17 +23,14 @@ We adhere to the [Ember Community Guidelines](https://emberjs.com/guidelines/) f
2423
ember install ember-resize-modifier
2524
```
2625

27-
2826
## Usage
2927

3028
[Longer description of how to use the addon in apps.]
3129

32-
3330
## Contributing
3431

3532
See the [Contributing](CONTRIBUTING.md) guide for details.
3633

37-
3834
## License
3935

4036
This project is licensed under the [MIT License](LICENSE.md).

package.json

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,28 @@
1717
},
1818
"scripts": {
1919
"build": "ember build --environment=production",
20-
"lint": "concurrently \"npm:lint:*(!fix|css|hbs)\" --names \"lint:\"",
20+
"lint": "concurrently \"yarn:lint:*(!fix|css|hbs)\" --names \"lint:\"",
2121
"lint:css": "stylelint \"**/*.scss\"",
22-
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
23-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
22+
"lint:css:fix": "concurrently \"yarn:lint:css -- --fix\"",
23+
"lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"",
2424
"lint:hbs": "ember-template-lint .",
2525
"lint:hbs:fix": "ember-template-lint . --fix",
2626
"lint:js": "eslint . --cache",
2727
"lint:js:fix": "eslint . --fix",
2828
"start": "ember serve",
29-
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
29+
"test": "concurrently \"yarn:lint\" \"yarn:test:*\" --names \"lint,test:\"",
3030
"test:ember": "ember test",
3131
"test:ember-compatibility": "ember try:each"
3232
},
3333
"dependencies": {
34-
"ember-auto-import": "^2.7.2",
34+
"ember-auto-import": "^2.7.4",
3535
"ember-cli-babel": "^7.26.11 || ^8.0.0",
3636
"ember-cli-htmlbars": "^6.3.0",
3737
"ember-modifier": "^4.1.0"
3838
},
3939
"devDependencies": {
40-
"@babel/eslint-parser": "^7.24.1",
41-
"@babel/plugin-proposal-decorators": "^7.24.1",
40+
"@babel/eslint-parser": "^7.24.7",
41+
"@babel/plugin-proposal-decorators": "^7.24.7",
4242
"@ember/optional-features": "^2.1.0",
4343
"@ember/string": "^3.1.1",
4444
"@ember/test-helpers": "^3.3.0",
@@ -59,9 +59,9 @@
5959
"ember-fetch": "^8.1.2",
6060
"ember-load-initializers": "^2.1.2",
6161
"ember-page-title": "^8.2.3",
62-
"ember-qunit": "^8.0.2",
62+
"ember-qunit": "^8.1.0",
6363
"ember-resolver": "^11.0.1",
64-
"ember-sinon-qunit": "^6.0.0",
64+
"ember-sinon-qunit": "^7.5.0",
6565
"ember-source": "~5.7.0",
6666
"ember-source-channel-url": "^3.0.0",
6767
"ember-template-lint": "^5.13.0",
@@ -76,22 +76,23 @@
7676
"field-guide-default-template": "^3.0.0",
7777
"loader.js": "^4.7.0",
7878
"prember": "^2.0.0",
79-
"prettier": "^3.2.5",
80-
"qunit": "^2.20.1",
79+
"prettier": "^3.3.2",
80+
"qunit": "^2.21.0",
8181
"qunit-dom": "^3.1.1",
8282
"release-it": "^15.11.0",
8383
"release-it-lerna-changelog": "^5.0.0",
8484
"sass": "^1.75.0",
85+
"sinon": "^18.0.0",
8586
"stylelint": "^15.11.0",
8687
"stylelint-config-standard": "^34.0.0",
8788
"stylelint-prettier": "^4.1.0",
88-
"webpack": "^5.91.0"
89+
"webpack": "^5.92.1"
8990
},
9091
"peerDependencies": {
9192
"ember-source": "^4.0.0 || >=5.0.0"
9293
},
9394
"engines": {
94-
"node": "16.* || >= 18"
95+
"node": ">= 18"
9596
},
9697
"volta": {
9798
"node": "18.12.0",

tests/dummy/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "5.3.0",
6+
"version": "5.10.0",
77
"blueprints": [
88
{
99
"name": "addon",

tests/dummy/config/ember-try.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ module.exports = async function () {
1212
npm: {
1313
devDependencies: {
1414
'ember-source': '~4.4.0',
15+
'ember-resolver': '^11.0.0',
1516
},
1617
},
1718
},
@@ -20,6 +21,7 @@ module.exports = async function () {
2021
npm: {
2122
devDependencies: {
2223
'ember-source': '~4.8.0',
24+
'ember-resolver': '^11.0.0',
2325
},
2426
},
2527
},
@@ -31,6 +33,14 @@ module.exports = async function () {
3133
},
3234
},
3335
},
36+
{
37+
name: 'ember-lts-5.4',
38+
npm: {
39+
devDependencies: {
40+
'ember-source': '~5.4.0',
41+
},
42+
},
43+
},
3444
{
3545
name: 'ember-release',
3646
npm: {

tests/helpers/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function setupApplicationTest(hooks, options) {
2323
// This is also a good place to call test setup functions coming
2424
// from other addons:
2525
//
26-
// setupIntl(hooks); // ember-intl
26+
// setupIntl(hooks, 'en-us'); // ember-intl
2727
// setupMirage(hooks); // ember-cli-mirage
2828
}
2929

0 commit comments

Comments
 (0)