Skip to content
This repository was archived by the owner on Jan 24, 2024. It is now read-only.

Commit 990646f

Browse files
authored
Merge pull request #669 from fabscale/dependabot/npm_and_yarn/ember-cli-4.1.0
chore(deps-dev): bump ember-cli from 3.28.4 to 4.1.0
2 parents b8b5738 + 421978f commit 990646f

File tree

13 files changed

+1003
-194
lines changed

13 files changed

+1003
-194
lines changed

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
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
**/*.d.ts

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports = {
2121
...require('fabscale-eslint-config/lib/node'),
2222
},
2323
{
24-
// test files:
24+
// test files
2525
files: ['tests/**/*-test.{js,ts}'],
2626
...require('fabscale-eslint-config/lib/ember-tests'),
2727
},

.github/workflows/ci.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request: {}
8+
9+
concurrency:
10+
group: ci-${{ github.head_ref || github.ref }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
test:
15+
name: "Tests"
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
- uses: volta-cli/action@v1
21+
- uses: mydea/actions-ember-testing@v2
22+
- name: Install Dependencies
23+
run: yarn install --frozen-lockfile
24+
- name: Lint
25+
run: |
26+
yarn lint:js
27+
yarn lint:hbs
28+
yarn tsc
29+
- name: Run Tests
30+
run: yarn test
31+
32+
try-scenarios:
33+
name: ${{ matrix.try-scenario }}
34+
runs-on: ubuntu-latest
35+
needs: 'test'
36+
37+
strategy:
38+
fail-fast: false
39+
matrix:
40+
try-scenario:
41+
- ember-lts-3.24
42+
- ember-lts-3.28
43+
- ember-release
44+
- ember-beta
45+
- ember-canary
46+
- embroider-safe
47+
- embroider-optimized
48+
49+
steps:
50+
- uses: actions/checkout@v2
51+
- uses: volta-cli/action@v1
52+
- uses: mydea/actions-ember-testing@v2
53+
- name: Install Dependencies
54+
run: yarn install --frozen-lockfile
55+
- name: Setup dummy .env file
56+
run: touch .env
57+
- name: Run Tests
58+
run: yarn test:one ${{ matrix.try-scenario }}

.github/workflows/test.yml

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

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,7 @@
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

.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
/.eslintignore
1616
/.eslintrc.js
1717
/.git/
18+
/.github/
1819
/.gitignore
1920
/.prettierignore
2021
/.prettierrc.js
@@ -44,4 +45,7 @@
4445
# ember-try
4546
/.node_modules.ember-try/
4647
/bower.json.ember-try
48+
/npm-shrinkwrap.json.ember-try
4749
/package.json.ember-try
50+
/package-lock.json.ember-try
51+
/yarn.lock.ember-try

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ If all you need is a way to work with the JWT tokens priovded by Cognito, then t
77

88
## Compatibility
99

10-
* Ember.js v3.20 or above
11-
* Ember CLI v3.20 or above
10+
* Ember.js v3.24 or above
11+
* Ember CLI v3.24 or above
1212
* Node.js v12 or above
1313

1414
## Installation

config/ember-try.js

Lines changed: 4 additions & 4 deletions
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.20',
11+
name: 'ember-lts-3.24',
1212
npm: {
1313
devDependencies: {
14-
'ember-source': '~3.20.5',
14+
'ember-source': '~3.24.3',
1515
},
1616
},
1717
},
1818
{
19-
name: 'ember-lts-3.24',
19+
name: 'ember-lts-3.28',
2020
npm: {
2121
devDependencies: {
22-
'ember-source': '~3.24.3',
22+
'ember-source': '~3.28.0',
2323
},
2424
},
2525
},

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
"@glimmer/tracking": "^1.0.4",
3838
"@types/amazon-cognito-auth-js": "^1.2.2",
3939
"amazon-cognito-identity-js": "^5.0.3",
40-
"ember-auto-import": "^2.0.1",
41-
"ember-cli-babel": "^7.26.6",
42-
"ember-cli-htmlbars": "^6.0.0",
40+
"ember-auto-import": "^2.2.4",
41+
"ember-cli-babel": "^7.26.11",
42+
"ember-cli-htmlbars": "^6.0.1",
4343
"ember-cli-typescript": "^4.0.0",
4444
"ember-concurrency": "^2.0.1",
4545
"ember-concurrency-ts": "^0.3.1"
@@ -56,7 +56,7 @@
5656
"@types/rsvp": "~4.0.3",
5757
"@typescript-eslint/parser": "~5.8.1",
5858
"broccoli-asset-rev": "~3.0.0",
59-
"ember-cli": "~3.28.4",
59+
"ember-cli": "~4.1.0",
6060
"ember-cli-code-coverage": "~1.0.2",
6161
"ember-cli-dependency-checker": "~3.2.0",
6262
"ember-cli-dotenv": "~3.1.0",
@@ -66,7 +66,6 @@
6666
"ember-disable-prototype-extensions": "~1.1.3",
6767
"ember-export-application-global": "~2.0.1",
6868
"ember-load-initializers": "~2.1.2",
69-
"ember-maybe-import-regenerator": "~1.0.0",
7069
"ember-modifier": "~3.0.0",
7170
"ember-page-title": "~7.0.0",
7271
"ember-qunit": "~5.1.5",
@@ -79,7 +78,7 @@
7978
"eslint": "~8.6.0",
8079
"fabscale-eslint-config": "~1.2.0",
8180
"loader.js": "~4.7.0",
82-
"prettier": "~2.5.0",
81+
"prettier": "~2.5.1",
8382
"qrcode": "~1.5.0",
8483
"qunit": "~2.17.2",
8584
"qunit-dom": "~2.0.0",

0 commit comments

Comments
 (0)