Skip to content

Commit c0b05ae

Browse files
mansonamansona
authored
Merge pull request #502 from emberjs/remove-yarn
Remove yarn and upgrade ember blueprint with ember-cli-update
2 parents 7da42ab + b723e02 commit c0b05ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+20335
-13934
lines changed

‎.bowerrc

-4
This file was deleted.

‎.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

+5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
17+
.eslintcache
1618

1719
# ember-try
1820
/.node_modules.ember-try/
1921
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2023
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

‎.eslintrc.js

+32-30
Original file line numberDiff line numberDiff line change
@@ -2,53 +2,55 @@
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
11-
}
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
14+
},
1215
},
13-
plugins: [
14-
'ember'
15-
],
16+
plugins: ['ember'],
1617
extends: [
1718
'eslint:recommended',
18-
'plugin:ember/recommended'
19+
'plugin:ember/recommended',
20+
'plugin:prettier/recommended',
1921
],
2022
env: {
21-
browser: true
23+
browser: true,
2224
},
2325
rules: {},
2426
overrides: [
2527
// node files
2628
{
2729
files: [
28-
'.eslintrc.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/**'
30+
'./.eslintrc.js',
31+
'./.prettierrc.js',
32+
'./.stylelintrc.js',
33+
'./.template-lintrc.js',
34+
'./ember-cli-build.js',
35+
'./index.js',
36+
'./testem.js',
37+
'./blueprints/*/index.js',
38+
'./config/**/*.js',
39+
'./tests/dummy/config/**/*.js',
4240
],
4341
parserOptions: {
44-
sourceType: 'script'
42+
sourceType: 'script',
4543
},
4644
env: {
4745
browser: false,
48-
node: true
46+
node: true,
4947
},
50-
plugins: ['node'],
51-
extends: ['plugin:node/recommended']
52-
}
53-
]
48+
extends: ['plugin:n/recommended'],
49+
},
50+
{
51+
// test files
52+
files: ['tests/**/*-test.{js,ts}'],
53+
extends: ['plugin:qunit/recommended'],
54+
},
55+
],
5456
};

‎.github/workflows/ci.yml

+68-53
Original file line numberDiff line numberDiff line change
@@ -3,88 +3,103 @@ name: CI
33
on:
44
push:
55
branches:
6+
- main
67
- master
7-
tags:
8-
- '*'
9-
pull_request:
10-
schedule:
11-
- cron: '0 4 * * 1' # Mondays at 4am
8+
pull_request: {}
9+
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
1213

1314
jobs:
1415
test:
15-
name: Tests
16+
name: "Tests"
1617
runs-on: ubuntu-latest
18+
timeout-minutes: 10
1719

1820
steps:
19-
- name: Checkout code
20-
uses: actions/checkout@v2
21-
- name: Setup node.js
22-
uses: volta-cli/action@v1
23-
- name: Install dependencies
24-
run: yarn --frozen-lockfile
21+
- uses: actions/checkout@v3
22+
- name: Install Node
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: 14.x
26+
cache: npm
27+
- name: Install Dependencies
28+
run: npm ci
2529
- name: Lint
26-
run: yarn lint
27-
- name: Test
28-
run: yarn test:ember
30+
run: npm run lint
31+
- name: Run Tests
32+
run: npm run test:ember
33+
34+
floating:
35+
name: "Floating Dependencies"
36+
runs-on: ubuntu-latest
37+
timeout-minutes: 10
38+
39+
steps:
40+
- uses: actions/checkout@v3
41+
- uses: actions/setup-node@v3
42+
with:
43+
node-version: 14.x
44+
cache: npm
45+
- name: Install Dependencies
46+
run: npm install --no-shrinkwrap
47+
- name: Run Tests
48+
run: npm run test:ember
49+
2950
test-os:
30-
name: Tests (Windows & MacOs)
51+
name: Tests Full Matrix ${{ matrix.os }} Node version ${{ matrix.node }}
3152
runs-on: ${{ matrix.os }}
3253

3354
strategy:
55+
fail-fast: false
3456
matrix:
3557
node: ['10', '12', '14']
36-
os: [ubuntu-latest, macOS-latest, windows-latest]
58+
os: [ubuntu-latest, windows-latest]
3759

3860
steps:
3961
- name: Checkout code
4062
uses: actions/checkout@v2
41-
- name: Setup node.js
42-
uses: volta-cli/action@v1
63+
- name: Install Node
64+
uses: actions/setup-node@v3
65+
with:
66+
node-version: ${{ matrix.node }}
67+
cache: npm
4368
- name: Install dependencies
44-
run: yarn --frozen-lockfile
45-
- name: Lint
46-
run: yarn lint
69+
run: npm i
4770
- name: Test
48-
run: yarn test:ember
49-
71+
run: npm run test:ember
5072

51-
test-no-lock:
52-
name: Floating Dependencies
73+
try-scenarios:
74+
name: ${{ matrix.try-scenario }}
5375
runs-on: ubuntu-latest
76+
needs: "test"
77+
timeout-minutes: 10
5478

55-
steps:
56-
- name: Checkout code
57-
uses: actions/checkout@v2
58-
- name: Setup node.js
59-
uses: volta-cli/action@v1
60-
- name: Install dependencies
61-
run: yarn --no-lockfile
62-
- name: Test
63-
run: yarn test:ember
64-
65-
test-try:
66-
name: Additional Tests
67-
runs-on: ubuntu-latest
68-
needs:
69-
- test
7079
strategy:
80+
fail-fast: false
7181
matrix:
72-
scenario:
82+
try-scenario:
7383
- ember-lts-3.16
7484
- ember-lts-3.20
85+
- ember-lts-3.24
86+
- ember-lts-3.28
87+
- ember-lts-4.4
88+
- ember-lts-4.8
7589
- ember-release
7690
- ember-beta
7791
- ember-canary
78-
- ember-default-with-jquery
79-
- ember-classic
80-
- embroider-tests
92+
- embroider-safe
93+
- embroider-optimized
8194

8295
steps:
83-
- name: Checkout code
84-
uses: actions/checkout@v2
85-
- name: Setup node.js
86-
uses: volta-cli/action@v1
87-
- name: Install dependencies
88-
run: yarn --frozen-lockfile
89-
- name: Test
90-
run: yarn ember try:one ${{ matrix.scenario }}
96+
- uses: actions/checkout@v3
97+
- name: Install Node
98+
uses: actions/setup-node@v3
99+
with:
100+
node-version: 14.x
101+
cache: npm
102+
- name: Install Dependencies
103+
run: npm ci
104+
- name: Run Tests
105+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

‎.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.pnp*
1414
/.sass-cache
15+
/.eslintcache
1516
/connect.lock
1617
/coverage/
1718
/libpeerconnection.log
@@ -22,4 +23,10 @@
2223
# ember-try
2324
/.node_modules.ember-try/
2425
/bower.json.ember-try
26+
/npm-shrinkwrap.json.ember-try
2527
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try
30+
31+
# broccoli-debug
32+
/DEBUG/

‎.npmignore

+10-1
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,32 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
1516
/.git/
17+
/.github/
1618
/.gitignore
19+
/.prettierignore
20+
/.prettierrc.js
21+
/.stylelintignore
22+
/.stylelintrc.js
1723
/.template-lintrc.js
1824
/.travis.yml
1925
/.watchmanconfig
2026
/bower.json
21-
/config/ember-try.js
2227
/CONTRIBUTING.md
2328
/ember-cli-build.js
2429
/testem.js
2530
/tests/
31+
/yarn-error.log
2632
/yarn.lock
2733
.gitkeep
2834

2935
# ember-try
3036
/.node_modules.ember-try/
3137
/bower.json.ember-try
38+
/npm-shrinkwrap.json.ember-try
3239
/package.json.ember-try
40+
/package-lock.json.ember-try
41+
/yarn.lock.ember-try

‎.prettierignore

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
.lint-todo/
18+
19+
# ember-try
20+
/.node_modules.ember-try/
21+
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
23+
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

‎.prettierrc.js

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
'use strict';
2+
3+
module.exports = {
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
12+
};

‎.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+
};

‎.template-lintrc.js

+1-1
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
};

0 commit comments

Comments
 (0)