Skip to content

Commit d41a78c

Browse files
committed
Ember 4.8 Upgrade
Drop Ember 3.24 support Upgrade CI config Yarn 3 upgrade
1 parent 4bde4d0 commit d41a78c

File tree

10 files changed

+19227
-14789
lines changed

10 files changed

+19227
-14789
lines changed

Diff for: .github/workflows/auto-merge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
auto-merge:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v3
1111
- uses: ahmadnassri/action-dependabot-auto-merge@v2
1212
with:
1313
target: major

Diff for: .github/workflows/ci.yml

+10-7
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ jobs:
1515
test:
1616
name: "Tests"
1717
runs-on: ubuntu-latest
18+
timeout-minutes: 10
1819

1920
steps:
20-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2122
- name: Install Node
22-
uses: actions/setup-node@v2
23+
uses: actions/setup-node@v3
2324
with:
2425
node-version: 14.x
2526
cache: yarn
@@ -33,10 +34,11 @@ jobs:
3334
floating:
3435
name: "Floating Dependencies"
3536
runs-on: ubuntu-latest
37+
timeout-minutes: 10
3638

3739
steps:
38-
- uses: actions/checkout@v2
39-
- uses: actions/setup-node@v2
40+
- uses: actions/checkout@v3
41+
- uses: actions/setup-node@v3
4042
with:
4143
node-version: 14.x
4244
cache: yarn
@@ -49,13 +51,14 @@ jobs:
4951
name: ${{ matrix.try-scenario }}
5052
runs-on: ubuntu-latest
5153
needs: "test"
54+
timeout-minutes: 10
5255

5356
strategy:
5457
fail-fast: false
5558
matrix:
5659
try-scenario:
57-
- ember-lts-3.24
5860
- ember-lts-3.28
61+
- ember-lts-4.4
5962
- ember-release
6063
- ember-classic
6164
- embroider-safe
@@ -69,9 +72,9 @@ jobs:
6972
experimental: true
7073

7174
steps:
72-
- uses: actions/checkout@v2
75+
- uses: actions/checkout@v3
7376
- name: Install Node
74-
uses: actions/setup-node@v2
77+
uses: actions/setup-node@v3
7578
with:
7679
node-version: 14.x
7780
cache: yarn

Diff for: .yarnrc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

Diff for: README.md

+8-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
ember-scroll-modifiers
2-
==============================================================================
1+
# ember-scroll-modifiers
32

43
[![Netlify Status](https://api.netlify.com/api/v1/badges/4592380c-39ca-493a-91f9-49e08bd4b59b/deploy-status)](https://app.netlify.com/sites/cocky-jackson-54cc4d/deploys)
54

@@ -10,36 +9,31 @@ Check out the [documentation](https://ember-scroll-modifiers.jhawk.co/)!
109
We adhere to the [Ember Community Guidelines](https://emberjs.com/guidelines/) for our Code of Conduct.
1110

1211

13-
Compatibility
14-
------------------------------------------------------------------------------
12+
## Compatibility
1513

16-
* Ember.js v3.24 or above
17-
* Ember CLI v3.24 or above
14+
* Ember.js v3.28 or above
15+
* Ember CLI v3.28 or above
1816
* Node.js v14 or above
1917
* [All N-1 Browsers](https://caniuse.com/#feat=intersectionobserver)
2018

2119

22-
Installation
23-
------------------------------------------------------------------------------
20+
## Installation
2421

2522
```
2623
ember install ember-scroll-modifiers
2724
```
2825

2926

30-
Usage
31-
------------------------------------------------------------------------------
27+
## Usage
3228

3329
[Longer description of how to use the addon in apps.]
3430

3531

36-
Contributing
37-
------------------------------------------------------------------------------
32+
## Contributing
3833

3934
See the [Contributing](CONTRIBUTING.md) guide for details.
4035

4136

42-
License
43-
------------------------------------------------------------------------------
37+
## License
4438

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

Diff for: config/ember-try.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ module.exports = async function () {
88
useYarn: true,
99
scenarios: [
1010
{
11-
name: 'ember-lts-3.24',
11+
name: 'ember-lts-3.28',
1212
npm: {
1313
devDependencies: {
14-
'ember-source': '~3.24.3',
14+
'ember-source': '~3.28.0',
1515
},
1616
},
1717
},
1818
{
19-
name: 'ember-lts-3.28',
19+
name: 'ember-lts-4.4',
2020
npm: {
2121
devDependencies: {
22-
'ember-source': '~3.28.0',
22+
'ember-source': '~4.4.0',
2323
},
2424
},
2525
},

Diff for: ember-cli-build.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

55
module.exports = function (defaults) {
6-
let app = new EmberAddon(defaults, {
6+
const app = new EmberAddon(defaults, {
77
// Add options here
88
});
99

Diff for: package.json

+8-9
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
},
1818
"scripts": {
1919
"build": "ember build --environment=production",
20-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix|hbs)\"",
21-
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
20+
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix|hbs)\"",
21+
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
2222
"lint:hbs": "ember-template-lint .",
2323
"lint:hbs:fix": "ember-template-lint . --fix",
2424
"lint:js": "eslint . --cache",
2525
"lint:js:fix": "eslint . --fix",
2626
"start": "ember serve",
27-
"test": "npm-run-all lint test:*",
27+
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
2828
"test:ember": "ember test",
2929
"test:ember-compatibility": "ember try:each"
3030
},
@@ -39,11 +39,11 @@
3939
"@ember/optional-features": "^2.0.0",
4040
"@ember/test-helpers": "^2.8.1",
4141
"@embroider/test-setup": "^2.0.2",
42-
"@glimmer/component": "^1.0.4",
43-
"@glimmer/tracking": "^1.0.4",
42+
"@glimmer/component": "^1.1.2",
43+
"@glimmer/tracking": "^1.1.2",
4444
"babel-eslint": "^10.1.0",
4545
"broccoli-asset-rev": "^3.0.0",
46-
"ember-cli": "~4.4.0",
46+
"ember-cli": "~4.8.0",
4747
"ember-cli-dependency-checker": "^3.3.1",
4848
"ember-cli-deprecation-workflow": "^2.0.0",
4949
"ember-cli-fastboot": "^3.3.2",
@@ -53,14 +53,13 @@
5353
"ember-cli-terser": "^4.0.2",
5454
"ember-data": "~4.4.0",
5555
"ember-disable-prototype-extensions": "^1.1.3",
56-
"ember-export-application-global": "^2.0.1",
5756
"ember-fetch": "^8.1.2",
5857
"ember-load-initializers": "^2.1.2",
5958
"ember-page-title": "^7.0.0",
6059
"ember-qunit": "^6.0.0",
6160
"ember-resolver": "^8.0.3",
6261
"ember-sinon-qunit": "^6.0.0",
63-
"ember-source": "~4.4.1",
62+
"ember-source": "~4.8.0",
6463
"ember-source-channel-url": "^3.0.0",
6564
"ember-template-lint": "^5.1.1",
6665
"ember-try": "^2.0.0",
@@ -84,7 +83,7 @@
8483
"webpack": "^5.75.0"
8584
},
8685
"engines": {
87-
"node": "14.* || >= 16"
86+
"node": "14.* || 16.* || >= 18"
8887
},
8988
"ember": {
9089
"edition": "octane"

Diff for: tests/dummy/config/ember-cli-update.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "4.3.0",
6+
"version": "4.8.0",
77
"blueprints": [
88
{
99
"name": "addon",

Diff for: tests/dummy/config/environment.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
module.exports = function (environment) {
4-
let ENV = {
4+
const ENV = {
55
modulePrefix: 'dummy',
66
environment,
77
rootURL: '/',
@@ -11,10 +11,6 @@ module.exports = function (environment) {
1111
// Here you can enable experimental features on an ember canary build
1212
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
1313
},
14-
EXTEND_PROTOTYPES: {
15-
// Prevent Ember Data from overriding Date.parse.
16-
Date: false,
17-
},
1814
},
1915

2016
APP: {

0 commit comments

Comments
 (0)