Skip to content

Commit 2c8ce6f

Browse files
authored
Merge pull request #1271 from gitKrystan/ember-4.9
Upgrade ember v3.27.0...v4.9.2 (in development)
2 parents 0d97073 + 5cbfe03 commit 2c8ce6f

19 files changed

Lines changed: 753 additions & 941 deletions

.ember-cli

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": true
915
}

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try
2326

2427
addon-test-support/**/*.js
2528
addon-test-support/**/*.d.ts

.github/workflows/ci-build.yml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,24 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v2
2020
- uses: volta-cli/action@v1
21-
with:
22-
node-version: 10.x
2321
- run: yarn install --frozen-lockfile --ignore-engines
2422
- run: yarn lint
2523
- run: yarn test
2624

2725
floating-dependencies:
2826
timeout-minutes: 10
29-
name: "Floating Dependencies"
27+
name: 'Floating Dependencies'
3028
runs-on: ubuntu-latest
3129

3230
steps:
3331
- uses: actions/checkout@v2
3432
- uses: volta-cli/action@v1
35-
with:
36-
node-version: 12.x
3733
- run: yarn install --no-lockfile
3834
- run: yarn test
3935

4036
try-scenarios:
4137
timeout-minutes: 10
42-
name: "Try: ${{ matrix.ember-try-scenario }}"
38+
name: 'Try: ${{ matrix.ember-try-scenario }}'
4339

4440
runs-on: ubuntu-latest
4541

@@ -49,32 +45,29 @@ jobs:
4945
fail-fast: false
5046
matrix:
5147
ember-try-scenario:
52-
- ember-lts-3.8
53-
- ember-lts-3.12
54-
- ember-lts-3.16
55-
- ember-lts-3.20
56-
- ember-lts-3.24
5748
- ember-lts-3.28
49+
- ember-lts-4.4
50+
- ember-lts-4.8
5851
- ember-release
5952
- ember-beta
6053
- ember-canary
6154
- ember-classic
62-
- ember-default-with-jquery
55+
- ember-default
56+
- with-jquery
6357
- embroider-safe
58+
# - embroider-optimized # see comments in ember-try.js
6459

6560
steps:
6661
- uses: actions/checkout@v2
6762
- uses: volta-cli/action@v1
68-
with:
69-
node-version: 12.x
7063
- name: install dependencies
7164
run: yarn install --frozen-lockfile
7265
- name: test
7366
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
7467

7568
types:
7669
runs-on: ubuntu-latest
77-
70+
7871
needs: test
7972

8073
strategy:
@@ -87,8 +80,6 @@ jobs:
8780
steps:
8881
- uses: actions/checkout@v2
8982
- uses: volta-cli/action@v1
90-
with:
91-
node-version: 12.x
9283
- name: install dependencies
9384
run: yarn install --frozen-lockfile
9485
- name: install TS version

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@
2323
# ember-try
2424
/.node_modules.ember-try/
2525
/bower.json.ember-try
26+
/npm-shrinkwrap.json.ember-try
2627
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try
30+
31+
# broccoli-debug
32+
/DEBUG/
2733

2834
# tyescript related output files
2935
addon-test-support/**/*.js

.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
/.eslintignore
1515
/.eslintrc.js
1616
/.git/
17+
/.github/
1718
/.gitignore
1819
/.prettierignore
1920
/.prettierrc.js
@@ -33,7 +34,10 @@
3334
# ember-try
3435
/.node_modules.ember-try/
3536
/bower.json.ember-try
37+
/npm-shrinkwrap.json.ember-try
3638
/package.json.ember-try
39+
/package-lock.json.ember-try
40+
/yarn.lock.ember-try
3741

3842
# other
3943

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
# ember-try
1919
/.node_modules.ember-try/
2020
/bower.json.ember-try
21+
/npm-shrinkwrap.json.ember-try
2122
/package.json.ember-try
23+
/package-lock.json.ember-try
24+
/yarn.lock.ember-try
2225

2326
addon-test-support/**/*.js
2427
addon-test-support/**/*.d.ts

.travis.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Installation
44

55
* `git clone <repository-url>`
6-
* `cd @ember/test-helpers`
6+
* `cd ember-test-helpers`
77
* `yarn install`
88

99
## Linting
@@ -26,4 +26,4 @@ When updating the API, you will need to update the type tests (in `tests/api.ts`
2626
* `ember serve`
2727
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2828

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

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ A test-framework-agnostic set of helpers for testing Ember.js applications
66
Compatibility
77
------------------------------------------------------------------------------
88

9-
- Ember 3.8 or above
10-
- Ember CLI 3.8 or above
11-
- Node.js 10 or above
9+
- Ember.js v3.28 or above
10+
- Ember CLI v3.28 or above
11+
- Node.js v14 or above
1212
- TypeScript 4.7
1313
- SemVer policy: [simple majors](https://www.semver-ts.org/#simple-majors)
1414
- the public API is defined by [API.md](./API.md).

config/environment.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)