Skip to content

Commit a1311c6

Browse files
bendemboskibendemboski
authored
Merge pull request #54 from bendemboski/ember-5
Ember 5
2 parents 95166fb + f242fc4 commit a1311c6

29 files changed

+5827
-6357
lines changed

‎.ember-cli

+7-1
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": false
915
}

‎.eslintignore

-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
1610
.*/
17-
.eslintcache
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/package.json.ember-try

‎.eslintrc.js

+10-7
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
5+
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2018,
7+
ecmaVersion: 'latest',
88
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
1114
},
1215
},
1316
plugins: ['ember'],
@@ -26,6 +29,7 @@ module.exports = {
2629
files: [
2730
'./.eslintrc.js',
2831
'./.prettierrc.js',
32+
'./.stylelintrc.js',
2933
'./.template-lintrc.js',
3034
'./ember-cli-build.js',
3135
'./index.js',
@@ -41,11 +45,10 @@ module.exports = {
4145
browser: false,
4246
node: true,
4347
},
44-
plugins: ['node'],
45-
extends: ['plugin:node/recommended'],
48+
extends: ['plugin:n/recommended'],
4649
},
4750
{
48-
// Test files:
51+
// test files
4952
files: ['tests/**/*-test.{js,ts}'],
5053
extends: ['plugin:qunit/recommended'],
5154
},

‎.github/workflows/ci.yml

+43-41
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,78 @@
1-
name: CI Build
1+
name: CI
22

33
on:
44
push:
55
branches:
66
- main
7-
- 'v*'
8-
pull_request:
9-
schedule:
10-
- cron: '0 3 * * *' # daily, at 3am
7+
- master
8+
pull_request: {}
119

12-
env:
13-
NODE_VERSION: 14.x
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
1413

1514
jobs:
1615
test:
17-
timeout-minutes: 10
18-
name: Tests
16+
name: "Tests"
1917
runs-on: ubuntu-latest
18+
timeout-minutes: 10
2019

2120
steps:
22-
- uses: actions/checkout@v2
23-
- uses: volta-cli/action@v1
21+
- uses: actions/checkout@v3
22+
- name: Install Node
23+
uses: actions/setup-node@v3
2424
with:
25-
node-version: ${{ env.NODE_VERSION }}
26-
- run: yarn install --frozen-lockfile
27-
- run: yarn lint
28-
- run: yarn test:ember
25+
node-version: 16
26+
cache: yarn
27+
- name: Install Dependencies
28+
run: yarn install --frozen-lockfile
29+
- name: Lint
30+
run: yarn lint
31+
- name: Run Tests
32+
run: yarn test:ember
2933

30-
floating-dependencies:
31-
timeout-minutes: 10
34+
floating:
3235
name: "Floating Dependencies"
3336
runs-on: ubuntu-latest
37+
timeout-minutes: 10
3438

3539
steps:
36-
- uses: actions/checkout@v2
37-
- uses: volta-cli/action@v1
40+
- uses: actions/checkout@v3
41+
- uses: actions/setup-node@v3
3842
with:
39-
node-version: ${{ env.NODE_VERSION }}
40-
- run: yarn install --no-lockfile
41-
- run: yarn test:ember
43+
node-version: 16
44+
cache: yarn
45+
- name: Install Dependencies
46+
run: yarn install --no-lockfile
47+
- name: Run Tests
48+
run: yarn test:ember
4249

4350
try-scenarios:
44-
timeout-minutes: 10
45-
name: "Try: ${{ matrix.ember-try-scenario }}"
46-
51+
name: ${{ matrix.try-scenario }}
4752
runs-on: ubuntu-latest
48-
49-
needs: test
53+
needs: "test"
54+
timeout-minutes: 10
5055

5156
strategy:
5257
fail-fast: false
5358
matrix:
54-
ember-try-scenario:
55-
- ember-lts-3.8
56-
- ember-lts-3.12
57-
- ember-lts-3.16
58-
- ember-lts-3.20
59-
- ember-lts-3.24
59+
try-scenario:
60+
- ember-lts-4.4
61+
- ember-lts-4.8
6062
- ember-release
6163
- ember-beta
6264
- ember-canary
63-
- ember-classic
64-
- ember-default-with-jquery
6565
- embroider-safe
6666
- embroider-optimized
6767

6868
steps:
69-
- uses: actions/checkout@v2
70-
- uses: volta-cli/action@v1
69+
- uses: actions/checkout@v3
70+
- name: Install Node
71+
uses: actions/setup-node@v3
7172
with:
72-
node-version: ${{ env.NODE_VERSION }}
73-
- name: install dependencies
73+
node-version: 16
74+
cache: yarn
75+
- name: Install Dependencies
7476
run: yarn install --frozen-lockfile
75-
- name: test
76-
run: yarn ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
77+
- name: Run Tests
78+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

‎.gitignore

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
63

74
# dependencies
8-
/bower_components/
95
/node_modules/
106

117
# misc
128
/.env*
139
/.pnp*
14-
/.sass-cache
1510
/.eslintcache
16-
/connect.lock
1711
/coverage/
18-
/libpeerconnection.log
1912
/npm-debug.log*
2013
/testem.log
2114
/yarn-error.log
2215

2316
# ember-try
2417
/.node_modules.ember-try/
25-
/bower.json.ember-try
18+
/npm-shrinkwrap.json.ember-try
2619
/package.json.ember-try
20+
/package-lock.json.ember-try
21+
/yarn.lock.ember-try
2722

28-
/jsconfig.json
23+
# broccoli-debug
24+
/DEBUG/

‎.npmignore

+6-7
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,23 @@
22
/dist/
33
/tmp/
44

5-
# dependencies
6-
/bower_components/
7-
85
# misc
9-
/.bowerrc
106
/.editorconfig
117
/.ember-cli
128
/.env*
139
/.eslintcache
1410
/.eslintignore
1511
/.eslintrc.js
1612
/.git/
13+
/.github/
1714
/.gitignore
1815
/.prettierignore
1916
/.prettierrc.js
17+
/.stylelintignore
18+
/.stylelintrc.js
2019
/.template-lintrc.js
2120
/.travis.yml
2221
/.watchmanconfig
23-
/bower.json
24-
/config/ember-try.js
2522
/CONTRIBUTING.md
2623
/ember-cli-build.js
2724
/testem.js
@@ -32,5 +29,7 @@
3229

3330
# ember-try
3431
/.node_modules.ember-try/
35-
/bower.json.ember-try
32+
/npm-shrinkwrap.json.ember-try
3633
/package.json.ember-try
34+
/package-lock.json.ember-try
35+
/yarn.lock.ember-try

‎.prettierignore

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
10+
.*/
1711

1812
# ember-try
1913
/.node_modules.ember-try/
20-
/bower.json.ember-try
21-
/package.json.ember-try

‎.prettierrc.js

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

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
512
};

‎.stylelintignore

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
7+
# addons
8+
/.node_modules.ember-try/

‎.stylelintrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
};

‎.watchmanconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["dist"]
33
}

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
* `ember serve`
2323
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

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

0 commit comments

Comments
 (0)