Skip to content

Commit 512a65b

Browse files
committed
Merge remote-tracking branch 'upsteam/master'
2 parents 5c16681 + 7dbb122 commit 512a65b

63 files changed

Lines changed: 10569 additions & 3599 deletions

Some content is hidden

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

.bowerrc

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

.dir-locals.el

Lines changed: 0 additions & 1 deletion
This file was deleted.

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

.ember-cli

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
"useYarn": true
910
}

.eslintignore

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints
3+
/fastboot-tests
4+
/vendor/
5+
6+
# compiled output
7+
/dist/
8+
/tmp/
9+
10+
# dependencies
11+
/bower_components/
12+
/node_modules/
13+
14+
# misc
15+
/coverage/
16+
!.*
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

.eslintrc.js

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,59 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
5+
parser: 'babel-eslint',
36
parserOptions: {
4-
ecmaVersion: 6,
5-
sourceType: 'module'
7+
ecmaVersion: 2018,
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true
11+
}
612
},
7-
extends: 'eslint:recommended',
13+
plugins: [
14+
'ember'
15+
],
16+
extends: [
17+
'eslint:recommended',
18+
'plugin:ember/recommended'
19+
],
820
env: {
921
browser: true
1022
},
1123
rules: {
12-
}
24+
'ember/no-jquery': 'error',
25+
'ember/no-get': 'off',
26+
},
27+
overrides: [
28+
// node files
29+
{
30+
files: [
31+
'.eslintrc.js',
32+
'.template-lintrc.js',
33+
'ember-cli-build.js',
34+
'index.js',
35+
'testem.js',
36+
'blueprints/*/index.js',
37+
'config/**/*.js',
38+
'tests/dummy/config/**/*.js'
39+
],
40+
excludedFiles: [
41+
'addon/**',
42+
'addon-test-support/**',
43+
'app/**',
44+
'tests/dummy/app/**'
45+
],
46+
parserOptions: {
47+
sourceType: 'script'
48+
},
49+
env: {
50+
browser: false,
51+
node: true
52+
},
53+
plugins: ['node'],
54+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
55+
// add your custom rules and overrides for node files here
56+
})
57+
}
58+
]
1359
};

.github/workflows/build.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Build
2+
on:
3+
pull_request: {}
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- v*
9+
schedule:
10+
- cron: '0 0 * * *'
11+
12+
jobs:
13+
test:
14+
name: Test (${{ matrix.scenario }})
15+
runs-on: ubuntu-latest
16+
env:
17+
CI: 'true'
18+
strategy:
19+
fail-fast: false
20+
matrix:
21+
scenario:
22+
- default
23+
- default-with-lockfile
24+
- default-with-jquery
25+
- release
26+
- beta
27+
- canary
28+
- lts-3.16
29+
- lts-3.12
30+
- lts-3.8
31+
- lts-3.4
32+
- lts-2.18
33+
- embroider
34+
steps:
35+
- name: Checkout
36+
uses: actions/checkout@v1
37+
- name: Set up Volta
38+
uses: volta-cli/action@v1
39+
- name: Install dependencies (yarn)
40+
if: matrix.scenario == 'default-with-lockfile'
41+
run: yarn install --non-interactive --frozen-lockfile
42+
- name: Install dependencies (yarn)
43+
if: matrix.scenario != 'default-with-lockfile'
44+
run: yarn install --non-interactive --no-lockfile
45+
- name: Setup ember-try scenario
46+
if: matrix.scenario != 'default' && matrix.scenario != 'default-with-lockfile'
47+
run: >-
48+
yarn ember try:one ember-${{ matrix.scenario }} --skip-cleanup ---
49+
'[ -z "$EMBER_OPTIONAL_FEATURES" ] || echo "EMBER_OPTIONAL_FEATURES=$EMBER_OPTIONAL_FEATURES" >> $GITHUB_ENV'
50+
- name: Lint (hbs)
51+
run: yarn lint:hbs
52+
- name: Lint (js)
53+
run: yarn lint:js
54+
- name: Build
55+
run: yarn ember build --environment test
56+
- name: Run test
57+
# Due to a bug in ember-cli, running `ember test` with `--path` doesn't set `EMBER_ENV=test`
58+
# See https://github.com/ember-cli/ember-cli/issues/8922
59+
run: EMBER_ENV=test yarn test --path dist

.gitignore

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
5-
/tmp
4+
/dist/
5+
/tmp/
66

77
# dependencies
8-
/node_modules
9-
/bower_components
8+
/bower_components/
9+
/node_modules/
1010

1111
# misc
12+
/.env*
13+
/.pnp*
1214
/.sass-cache
1315
/connect.lock
14-
/coverage/*
16+
/coverage/
1517
/libpeerconnection.log
16-
npm-debug.log*
17-
testem.log
18+
/npm-debug.log*
19+
/testem.log
20+
/yarn-error.log
21+
22+
# ember-try
23+
/.node_modules.ember-try/
24+
/bower.json.ember-try
25+
/package.json.ember-try

.jscsrc

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

.npmignore

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,32 @@
1-
/bower_components
1+
# compiled output
2+
/dist/
3+
/tmp/
4+
5+
# dependencies
6+
/bower_components/
7+
8+
# misc
9+
/.bowerrc
10+
/.editorconfig
11+
/.ember-cli
12+
/.env*
13+
/.eslintignore
14+
/.eslintrc.js
15+
/.git/
16+
/.gitignore
17+
/.template-lintrc.js
18+
/.travis.yml
19+
/.watchmanconfig
20+
/bower.json
221
/config/ember-try.js
3-
/dist
4-
/tests
5-
/tmp
6-
**/.gitkeep
7-
.bowerrc
8-
.editorconfig
9-
.ember-cli
10-
.gitignore
11-
.eslintrc.js
12-
.watchmanconfig
13-
.travis.yml
14-
bower.json
15-
ember-cli-build.js
16-
testem.js
22+
/CONTRIBUTING.md
23+
/ember-cli-build.js
24+
/testem.js
25+
/tests/
26+
/yarn.lock
27+
.gitkeep
28+
29+
# ember-try
30+
/.node_modules.ember-try/
31+
/bower.json.ember-try
32+
/package.json.ember-try

0 commit comments

Comments
 (0)