Skip to content

Commit 115b1a6

Browse files
authored
Updates including support for ember-basic-dropdown v8 (#1)
* ember-cli-update v3.26.1...v4.9.2 * Bump ember-basic-dropdown to v6, other required updates * ember-cli-update v4.9.2...v4.12.3 * ember-cli-update v4.12.3...v5.12.0 * Various updates for ember-basic-dropdown v8 support * Update package name and bump version to v5.0.0-alpha.0 * lint auto-fixes * Various lint fixes / ignores * Add Ember 5.8 to ember-try list * Fix yarn.lock
1 parent 5258e28 commit 115b1a6

Some content is hidden

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

69 files changed

+6034
-7913
lines changed

.ember-cli

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
22
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
3+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
4+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
75
*/
8-
"disableAnalytics": false
6+
"isTypeScriptProject": false
97
}

.eslintignore

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
5+
/declarations/
66
/dist/
77
/tmp/
88

9-
# dependencies
10-
/node_modules/
11-
/bower_components/
12-
/node_modules/
13-
149
# misc
1510
/coverage/
1611
!.*
17-
.eslintcache
12+
.*/
1813

1914
# ember-try
2015
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/package.json.ember-try

.eslintrc.js

Lines changed: 23 additions & 17 deletions
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'],
@@ -24,17 +27,16 @@ module.exports = {
2427
// node files
2528
{
2629
files: [
27-
'.eslintrc.js',
28-
'.prettierrc.js',
29-
'.template-lintrc.js',
30-
'.eslintrc.js',
31-
'ember-cli-build.js',
32-
'testem.js',
33-
'blueprints/*/index.js',
34-
'config/**/*.js',
35-
'tests/dummy/config/**/*.js',
36-
'lib/*/index.js',
37-
'index.js',
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',
3840
],
3941
excludedFiles: [
4042
'addon/**',
@@ -49,8 +51,12 @@ module.exports = {
4951
browser: false,
5052
node: true,
5153
},
52-
plugins: ['node'],
53-
extends: ['plugin:node/recommended'],
54+
extends: ['plugin:n/recommended'],
55+
},
56+
{
57+
// test files
58+
files: ['tests/**/*-test.{js,ts}'],
59+
extends: ['plugin:qunit/recommended'],
5460
},
5561
],
5662
};

.github/workflows/ci-pr.yml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ jobs:
88
timeout-minutes: 5
99

1010
steps:
11-
- uses: actions/checkout@v1
12-
- uses: volta-cli/action@v1
11+
- uses: actions/checkout@v3
12+
- name: Install Node
13+
uses: actions/setup-node@v3
14+
with:
15+
node-version: 18
16+
cache: yarn
1317
- uses: mydea/actions-ember-testing@v2
14-
- name: Install dependencies
15-
run: yarn install
18+
- name: Install Dependencies
19+
run: yarn install --frozen-lockfile
1620
- name: Run tests
1721
run: yarn test:ember
1822
- name: Lint
@@ -29,18 +33,21 @@ jobs:
2933
# Keep this in sync with config/ember-try.js
3034
ember:
3135
[
32-
ember-lts-3.16,
33-
ember-lts-3.20,
36+
ember-lts-4.12,
37+
ember-lts-5.4,
38+
ember-lts-5.8,
3439
ember-release,
35-
ember-default-with-jquery,
36-
ember-classic,
3740
]
3841

3942
steps:
40-
- uses: actions/checkout@v1
41-
- uses: volta-cli/action@v1
43+
- uses: actions/checkout@v3
44+
- name: Install Node
45+
uses: actions/setup-node@v3
46+
with:
47+
node-version: 18
48+
cache: yarn
4249
- uses: mydea/actions-ember-testing@v2
43-
- name: Install dependencies
44-
run: yarn install
50+
- name: Install Dependencies
51+
run: yarn install --frozen-lockfile
4552
- name: Run tests
4653
run: yarn test:one ${{ matrix.ember }}

.github/workflows/ci.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,29 @@ name: ci
33
on:
44
push:
55
branches:
6+
- main
67
- master
8+
pull_request: {}
9+
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
713

814
jobs:
915
test:
16+
name: "Tests"
1017
runs-on: ubuntu-latest
1118
timeout-minutes: 5
1219

1320
steps:
14-
- uses: actions/checkout@v1
15-
- uses: volta-cli/action@v1
16-
- uses: mydea/actions-ember-testing@v2
17-
- name: Install dependencies
18-
run: yarn install
21+
- uses: actions/checkout@v3
22+
- name: Install Node
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: 18
26+
cache: yarn
27+
- name: Install Dependencies
28+
run: yarn install --frozen-lockfile
1929
- name: Run tests
2030
run: yarn test:ember
2131
- name: Lint

.gitignore

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
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/

.npmignore

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
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
2825
/tests/
26+
/tsconfig.declarations.json
27+
/tsconfig.json
28+
/yarn-error.log
2929
/yarn.lock
3030
.gitkeep
3131
/.idea
@@ -41,5 +41,7 @@ CHANGELOG.md
4141

4242
# ember-try
4343
/.node_modules.ember-try/
44-
/bower.json.ember-try
44+
/npm-shrinkwrap.json.ember-try
4545
/package.json.ember-try
46+
/package-lock.json.ember-try
47+
/yarn.lock.ember-try

.prettierignore

Lines changed: 1 addition & 9 deletions
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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
'use strict';
22

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

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

0 commit comments

Comments
 (0)