Skip to content

Commit f9a6e68

Browse files
mixonicmixonic
committed
v3.28.0...v5.2.0
1 parent fd92851 commit f9a6e68

Some content is hidden

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

53 files changed

+5036
-3934
lines changed

‎.ember-cli

Lines changed: 7 additions & 1 deletion
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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
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
!.*
10+
.*/
1611

1712
# ember-try
1813
/.node_modules.ember-try/
19-
/bower.json.ember-try
20-
/package.json.ember-try
14+
15+
.eslintrc.js

‎.eslintrc.js

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
module.exports = {
22
root: true,
3+
parser: '@babel/eslint-parser',
34
parserOptions: {
4-
ecmaVersion: 2018,
5-
sourceType: 'module'
5+
ecmaVersion: 'latest',
6+
sourceType: 'module',
7+
requireConfigFile: false,
8+
babelOptions: {
9+
plugins: [
10+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
11+
],
12+
},
613
},
714
plugins: [
815
'ember'
@@ -21,26 +28,27 @@ module.exports = {
2128
rules: {
2229
'quotes': ['error', 'single', { 'allowTemplateLiterals': true, 'avoidEscape': true }],
2330

24-
'ember/closure-actions': 'off'
31+
'ember/closure-actions': 'off',
32+
'ember/no-get': 'off',
33+
'ember/no-classic-components': 'off',
34+
'ember/require-tagless-components': 'off',
35+
'ember/no-classic-classes': 'off',
36+
'ember/no-actions-hash': 'off',
2537
},
2638
overrides: [
2739
// node files
2840
{
2941
files: [
30-
'.eslintrc.js',
31-
'.template-lintrc.js',
32-
'ember-cli-build.js',
33-
'index.js',
34-
'testem.js',
35-
'blueprints/*/index.js',
36-
'config/**/*.js',
37-
'tests/dummy/config/**/*.js'
38-
],
39-
excludedFiles: [
40-
'addon/**',
41-
'addon-test-support/**',
42-
'app/**',
43-
'tests/dummy/app/**'
42+
'./.eslintrc.js',
43+
'./.prettierrc.js',
44+
'./.stylelintrc.js',
45+
'./.template-lintrc.js',
46+
'./ember-cli-build.js',
47+
'./index.js',
48+
'./testem.js',
49+
'./blueprints/*/index.js',
50+
'./config/**/*.js',
51+
'./tests/dummy/config/**/*.js',
4452
],
4553
parserOptions: {
4654
sourceType: 'script'
@@ -49,10 +57,12 @@ module.exports = {
4957
browser: false,
5058
node: true
5159
},
52-
plugins: ['node'],
53-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
54-
// add your custom rules and overrides for node files here
55-
})
56-
}
57-
]
60+
extends: ['plugin:n/recommended'],
61+
},
62+
{
63+
// test files
64+
files: ['tests/**/*-test.{js,ts}'],
65+
extends: ['plugin:qunit/recommended'],
66+
},
67+
],
5868
};

‎.github/workflows/ci.yml

Lines changed: 49 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,94 @@
1-
name: Vertical Collection CI
1+
name: CI
2+
23
on:
3-
pull_request:
4-
types: [opened, synchronize, reopened, ready_for_review]
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
513

614
jobs:
715
test:
8-
name: Run Tests
16+
name: "Tests"
917
runs-on: ubuntu-latest
1018
timeout-minutes: 12
1119

1220
steps:
1321
- name: Checkout
1422
uses: actions/checkout@v3
15-
1623
- name: Use Volta
17-
uses: volta-cli/action@v1
18-
24+
uses: volta-cli/action@v4
1925
- name: Node Modules Cache
2026
id: cache-npm
2127
uses: actions/cache@v3
2228
with:
2329
path: '**/node_modules'
2430
key: ci-yarn-${{ hashFiles('yarn.lock') }}
25-
2631
- name: Install Dependencies
2732
if: steps.cache-npm.outputs.cache-hit != 'true'
2833
run: yarn install --frozen-lockfile
29-
3034
- name: Lint
3135
run: yarn lint
32-
3336
- name: Run Build
3437
run: . bin/restore-env.sh && yarn run ember build
35-
3638
- name: Run Tests
3739
uses: nick-fields/retry@v2
3840
with:
3941
timeout_minutes: 2
4042
max_attempts: 5
4143
command: . bin/restore-env.sh && CI=true yarn run ember test --path=dist
4244

43-
test-ember-try:
44-
name: Run Tests
45+
floating:
46+
name: "Floating Dependencies"
47+
runs-on: ubuntu-latest
48+
timeout-minutes: 12
49+
50+
steps:
51+
- uses: actions/checkout@v3
52+
- name: Use Volta
53+
uses: volta-cli/action@v4
54+
- name: Node Modules Cache
55+
id: cache-npm
56+
uses: actions/cache@v3
57+
with:
58+
path: '**/node_modules'
59+
key: ci-yarn-${{ hashFiles('yarn.lock') }}
60+
- name: Install Dependencies
61+
if: steps.cache-npm.outputs.cache-hit != 'true'
62+
run: yarn install --no-lockfile
63+
- name: Run Tests
64+
run: yarn test:ember
65+
66+
try-scenarios:
67+
name: ${{ matrix.try-scenario }}
4568
runs-on: ubuntu-latest
4669
timeout-minutes: 12
4770

4871
strategy:
4972
fail-fast: false
5073
matrix:
51-
ember-version:
52-
[
53-
ember-lts-3.12,
54-
ember-lts-3.16,
55-
ember-lts-3.20,
56-
ember-lts-3.28,
57-
ember-lts-4.4,
58-
ember-release,
59-
ember-beta,
60-
ember-canary,
61-
]
74+
try-scenario:
75+
- ember-lts-3.28
76+
- ember-lts-4.4
77+
- ember-lts-4.12,
78+
- ember-5.2,
79+
- ember-release,
80+
- ember-beta,
81+
- ember-canary,
82+
- embroider-safe
83+
- embroider-optimized
6284

6385
steps:
6486
- name: Checkout
6587
uses: actions/checkout@v3
66-
6788
- name: Use Volta
68-
uses: volta-cli/action@v1
69-
89+
uses: volta-cli/action@v4
7090
- name: Stash yarn.lock for cache key
7191
run: cp yarn.lock __cache-key
72-
7392
- name: Node Modules Cache
7493
id: cache-npm
7594
uses: actions/cache@v3
@@ -79,21 +98,17 @@ jobs:
7998
package.json
8099
yarn.lock
81100
__env
82-
key: ci-yarn-v3-${{ matrix.ember-version }}-${{ hashFiles('config/ember-try.js', '__cache-key') }}
101+
key: ci-yarn-v3-${{ matrix.try-scenario }}-${{ hashFiles('config/ember-try.js', '__cache-key') }}
83102
restore-keys: |
84103
ci-yarn-${{ hashFiles('yarn.lock') }}
85-
86104
- name: Install Dependencies
87105
if: steps.cache-npm.outputs.cache-hit != 'true'
88106
run: yarn install --frozen-lockfile
89-
90107
- name: Ember-Try Setup
91108
if: steps.cache-npm.outputs.cache-hit != 'true'
92-
run: node_modules/.bin/ember try:one ${{ matrix.ember-version }} --skip-cleanup --- bin/stash-env.sh
93-
109+
run: node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup --- bin/stash-env.sh
94110
- name: Run Build
95111
run: . bin/restore-env.sh && yarn run ember build
96-
97112
- name: Run Tests
98113
uses: nick-fields/retry@v2
99114
with:

‎.gitignore

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115
/yarn-error.log
2216

2317
# ember-try
2418
/.node_modules.ember-try/
25-
/bower.json.ember-try
19+
/npm-shrinkwrap.json.ember-try
2620
/package.json.ember-try
21+
/package-lock.json.ember-try
22+
/yarn.lock.ember-try
23+
24+
# broccoli-debug
25+
/DEBUG/
2726

2827
# custom
2928
.idea/

‎.npmignore

Lines changed: 6 additions & 7 deletions
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,8 +29,10 @@
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
3736

3837
# custom
3938
.idea/

‎.prettierignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
7+
# misc
8+
/coverage/
9+
!.*
10+
.*/
11+
12+
# ember-try
13+
/.node_modules.ember-try/

‎.prettierrc.js

Lines changed: 12 additions & 0 deletions
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

Lines changed: 8 additions & 0 deletions
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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
rules: {
6+
'selector-class-pattern': null,
7+
}
8+
};

0 commit comments

Comments
 (0)