Skip to content

Commit 48f9d15

Browse files
authored
Merge pull request #119 from yapplabs/ci-and-upgrade
[BREAKING] Update dependencies, including ember-auto-import and add CI
2 parents d66a91d + b596a15 commit 48f9d15

File tree

17 files changed

+2469
-1781
lines changed

17 files changed

+2469
-1781
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
1617
.eslintcache
1718

1819
# ember-try

.eslintrc.js

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,15 @@ 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-
'tests/dummy/config/**/*.js',
36-
],
37-
excludedFiles: [
38-
'addon/**',
39-
'addon-test-support/**',
40-
'app/**',
41-
'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+
'./tests/dummy/config/**/*.js',
4236
],
4337
parserOptions: {
4438
sourceType: 'script',
@@ -50,5 +44,10 @@ module.exports = {
5044
plugins: ['node'],
5145
extends: ['plugin:node/recommended'],
5246
},
47+
{
48+
// Test files:
49+
files: ['tests/**/*-test.{js,ts}'],
50+
extends: ['plugin:qunit/recommended'],
51+
},
5352
],
5453
};

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
updates:
3+
- commit-message:
4+
include: "scope"
5+
prefix: "chore"
6+
directory: "/"
7+
open-pull-requests-limit: 10
8+
package-ecosystem: "npm"
9+
schedule:
10+
interval: "weekly"
11+
time: "10:00"
12+
versioning-strategy: "increase"

.github/workflows/ci.yml

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
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.20
58+
- ember-lts-3.24
59+
- ember-lts-3.28
60+
- ember-release
61+
- ember-beta
62+
- ember-canary
63+
- ember-classic
64+
- embroider-safe
65+
- embroider-optimized
66+
67+
steps:
68+
- uses: actions/checkout@v2
69+
- name: Install Node
70+
uses: actions/setup-node@v2
71+
with:
72+
node-version: 12.x
73+
cache: yarn
74+
- name: Install Dependencies
75+
run: yarn install --frozen-lockfile
76+
- name: Run Tests
77+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
/ember-cli-build.js
2727
/testem.js
2828
/tests/
29+
/yarn-error.log
2930
/yarn.lock
3031
.gitkeep
3132

.template-lintrc.js

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

33
module.exports = {
4-
extends: 'octane',
4+
extends: 'recommended',
55
rules: {
66
'no-positive-tabindex': 'off',
77
},

.travis.yml

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

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ A `radio-button` will be in a checked state when the `value` property matches th
88

99
Clicking on a `radio-button` will set `groupValue` to its `value`.
1010

11-
## Usage
11+
* Ember.js v3.20 or above
12+
* Ember CLI v3.20 or above
13+
* Node.js v12 or above
1214

15+
## Usage
1316
### Block Form
1417

1518
The block form emits a label wrapping the input element and any elements passed to the block.

config/ember-try.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,26 @@ module.exports = async function () {
88
useYarn: true,
99
scenarios: [
1010
{
11-
name: 'ember-lts-3.16',
11+
name: 'ember-lts-3.20',
1212
npm: {
1313
devDependencies: {
14-
'ember-source': '~3.16.0',
14+
'ember-source': '~3.20.5',
1515
},
1616
},
1717
},
1818
{
19-
name: 'ember-lts-3.20',
19+
name: 'ember-lts-3.24',
2020
npm: {
2121
devDependencies: {
22-
'ember-source': '~3.20.5',
22+
'ember-source': '~3.24.3',
23+
},
24+
},
25+
},
26+
{
27+
name: 'ember-lts-3.28',
28+
npm: {
29+
devDependencies: {
30+
'ember-source': '~3.28.9',
2331
},
2432
},
2533
},

ember-cli-build.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,11 @@ module.exports = function (defaults) {
1515
*/
1616

1717
const { maybeEmbroider } = require('@embroider/test-setup');
18-
return maybeEmbroider(app);
18+
return maybeEmbroider(app, {
19+
skipBabel: [
20+
{
21+
package: 'qunit',
22+
},
23+
],
24+
});
1925
};

package.json

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"scripts": {
1616
"build": "ember build --environment=production",
17-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
17+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
1818
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
1919
"lint:hbs": "ember-template-lint .",
2020
"lint:hbs:fix": "ember-template-lint . --fix",
@@ -26,48 +26,50 @@
2626
"test:ember-compatibility": "ember try:each"
2727
},
2828
"dependencies": {
29-
"ember-cli-babel": "^7.26.3",
30-
"ember-cli-htmlbars": "^5.7.1"
29+
"ember-cli-babel": "^7.26.11",
30+
"ember-cli-htmlbars": "^5.7.1",
31+
"webpack": "^5.72.1"
3132
},
3233
"devDependencies": {
3334
"@ember/optional-features": "^2.0.0",
34-
"@ember/test-helpers": "^2.2.5",
35-
"@embroider/test-setup": "^0.37.0",
36-
"@glimmer/component": "^1.0.4",
37-
"@glimmer/tracking": "^1.0.4",
35+
"@ember/test-helpers": "^2.4.2",
36+
"@embroider/test-setup": "^1.7.1",
37+
"@glimmer/component": "^1.1.2",
38+
"@glimmer/tracking": "^1.1.2",
3839
"babel-eslint": "^10.1.0",
3940
"broccoli-asset-rev": "^3.0.0",
40-
"ember-auto-import": "^1.11.2",
41-
"ember-cli": "~3.26.1",
42-
"ember-cli-dependency-checker": "^3.2.0",
43-
"ember-cli-inject-live-reload": "^2.0.2",
41+
"ember-auto-import": "^2.4.2",
42+
"ember-cli": "~3.28.0",
43+
"ember-cli-dependency-checker": "^3.3.1",
44+
"ember-cli-inject-live-reload": "^2.1.0",
4445
"ember-cli-sri": "^2.1.1",
45-
"ember-cli-terser": "^4.0.1",
46+
"ember-cli-terser": "^4.0.2",
4647
"ember-disable-prototype-extensions": "^1.1.3",
4748
"ember-export-application-global": "^2.0.1",
4849
"ember-load-initializers": "^2.1.2",
49-
"ember-maybe-import-regenerator": "^0.1.6",
50-
"ember-page-title": "^6.2.1",
51-
"ember-qunit": "^5.1.4",
52-
"ember-resolver": "^8.0.2",
53-
"ember-source": "~3.26.1",
50+
"ember-maybe-import-regenerator": "^1.0.0",
51+
"ember-page-title": "^7.0.0",
52+
"ember-qunit": "^5.1.5",
53+
"ember-resolver": "^8.0.3",
54+
"ember-source": "~3.28.0",
5455
"ember-source-channel-url": "^3.0.0",
55-
"ember-template-lint": "^3.2.0",
56+
"ember-template-lint": "^3.6.0",
5657
"ember-try": "^1.4.0",
57-
"ember-welcome-page": "^4.0.0",
58-
"eslint": "^7.23.0",
59-
"eslint-config-prettier": "^8.1.0",
60-
"eslint-plugin-ember": "^10.3.0",
58+
"ember-welcome-page": "^6.2.0",
59+
"eslint": "^7.32.0",
60+
"eslint-config-prettier": "^8.3.0",
61+
"eslint-plugin-ember": "^10.5.4",
6162
"eslint-plugin-node": "^11.1.0",
62-
"eslint-plugin-prettier": "^3.3.1",
63+
"eslint-plugin-prettier": "^3.4.1",
64+
"eslint-plugin-qunit": "^6.2.0",
6365
"loader.js": "^4.7.0",
6466
"npm-run-all": "^4.1.5",
65-
"prettier": "^2.2.1",
66-
"qunit": "^2.14.1",
67-
"qunit-dom": "^1.6.0"
67+
"prettier": "^2.3.2",
68+
"qunit": "^2.16.0",
69+
"qunit-dom": "^2.0.0"
6870
},
6971
"engines": {
70-
"node": "14.* || >= 16"
72+
"node": "12.* || 14.* || >= 16"
7173
},
7274
"ember": {
7375
"edition": "octane"

tests/.eslintrc.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/* eslint-disable no-undef */
2+
'use strict';
3+
14
module.exports = {
25
env: {
36
embertest: true,

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": "3.26.1",
6+
"version": "3.28.0",
77
"blueprints": [
88
{
99
"name": "addon",

0 commit comments

Comments
 (0)