Skip to content

Commit 8773d99

Browse files
Ember 4.1 (#22)
* Ember 4.1 * Update yarn.lock
1 parent ce6484f commit 8773d99

17 files changed

Lines changed: 2345 additions & 2130 deletions

.eslintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
1617
.eslintcache
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

.eslintrc.js

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,16 @@ module.exports = {
2424
// node files
2525
{
2626
files: [
27-
'.eslintrc.js',
28-
'.prettierrc.js',
29-
'.template-lintrc.js',
30-
'ember-cli-build.js',
31-
'index.js',
32-
'testem.js',
33-
'blueprints/*/index.js',
34-
'config/**/*.js',
35-
'lib/**/*.js',
36-
'tests/dummy/config/**/*.js',
37-
],
38-
excludedFiles: [
39-
'addon/**',
40-
'addon-test-support/**',
41-
'app/**',
42-
'tests/dummy/app/**',
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./index.js',
32+
'./testem.js',
33+
'./blueprints/*/index.js',
34+
'./config/**/*.js',
35+
'./lib/**/*.js',
36+
'./tests/dummy/config/**/*.js',
4337
],
4438
parserOptions: {
4539
sourceType: 'script',
@@ -54,5 +48,10 @@ module.exports = {
5448
'node/no-unpublished-require': 'off',
5549
},
5650
},
51+
{
52+
// test files
53+
files: ['tests/**/*-test.{js,ts}'],
54+
extends: ['plugin:qunit/recommended'],
55+
},
5756
],
5857
};

.github/workflows/ci.yml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
pull_request: {}
9+
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
test:
16+
name: "Tests"
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
- name: Install Node
22+
uses: actions/setup-node@v2
23+
with:
24+
node-version: 12.x
25+
cache: yarn
26+
- name: Install Dependencies
27+
run: yarn install --frozen-lockfile
28+
- name: Lint
29+
run: yarn lint
30+
- name: Run Tests
31+
run: yarn test:ember
32+
33+
floating:
34+
name: "Floating Dependencies"
35+
runs-on: ubuntu-latest
36+
37+
steps:
38+
- uses: actions/checkout@v2
39+
- uses: actions/setup-node@v2
40+
with:
41+
node-version: 12.x
42+
cache: yarn
43+
- name: Install Dependencies
44+
run: yarn install --no-lockfile
45+
- name: Run Tests
46+
run: yarn test:ember
47+
48+
try-scenarios:
49+
name: ${{ matrix.try-scenario }}
50+
runs-on: ubuntu-latest
51+
needs: 'test'
52+
53+
strategy:
54+
fail-fast: false
55+
matrix:
56+
try-scenario:
57+
- ember-lts-3.24
58+
- ember-lts-3.28
59+
- ember-release
60+
- ember-beta
61+
- ember-canary
62+
- ember-classic
63+
- embroider-safe
64+
- embroider-optimized
65+
66+
steps:
67+
- uses: actions/checkout@v2
68+
- name: Install Node
69+
uses: actions/setup-node@v2
70+
with:
71+
node-version: 12.x
72+
cache: yarn
73+
- name: Install Dependencies
74+
run: yarn install --frozen-lockfile
75+
- name: Run Tests
76+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.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: 5 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
@@ -26,10 +27,14 @@
2627
/ember-cli-build.js
2728
/testem.js
2829
/tests/
30+
/yarn-error.log
2931
/yarn.lock
3032
.gitkeep
3133

3234
# ember-try
3335
/.node_modules.ember-try/
3436
/bower.json.ember-try
37+
/npm-shrinkwrap.json.ember-try
3538
/package.json.ember-try
39+
/package-lock.json.ember-try
40+
/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

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane',
4+
extends: 'recommended',
55
};

.travis.yml

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

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ It supports building and live reload for iOS, Android, and Electron.
88
Compatibility
99
------------------------------------------------------------------------------
1010

11-
* Ember.js v3.16 or above
12-
* Ember CLI v2.13 or above
13-
* Node.js v10 or above
11+
* Ember.js v3.24 or above
12+
* Ember CLI v3.24 or above
13+
* Node.js v12 or above
1414

1515

1616
Installation

config/ember-try.js

Lines changed: 7 additions & 17 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.16',
11+
name: 'ember-lts-3.24',
1212
npm: {
1313
devDependencies: {
14-
'ember-source': '~3.16.0',
14+
'ember-source': '~3.24.3',
1515
},
1616
},
1717
},
1818
{
19-
name: 'ember-lts-3.20',
19+
name: 'ember-lts-3.28',
2020
npm: {
2121
devDependencies: {
22-
'ember-source': '~3.20.5',
22+
'ember-source': '~3.28.0',
2323
},
2424
},
2525
},
@@ -47,19 +47,6 @@ module.exports = async function () {
4747
},
4848
},
4949
},
50-
{
51-
name: 'ember-default-with-jquery',
52-
env: {
53-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
54-
'jquery-integration': true,
55-
}),
56-
},
57-
npm: {
58-
devDependencies: {
59-
'@ember/jquery': '^1.1.0',
60-
},
61-
},
62-
},
6350
{
6451
name: 'ember-classic',
6552
env: {
@@ -70,6 +57,9 @@ module.exports = async function () {
7057
}),
7158
},
7259
npm: {
60+
devDependencies: {
61+
'ember-source': '~3.28.0',
62+
},
7363
ember: {
7464
edition: 'classic',
7565
},

0 commit comments

Comments
 (0)