Skip to content

Commit 67b1460

Browse files
authored
Merge pull request #25 from lolmaus/first-release
Bunch of updates for the first release
2 parents f6767a1 + 801227b commit 67b1460

35 files changed

+5731
-2296
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
# misc
1313
/coverage/
14+
.eslintcache
1415

1516
# ember-try
1617
/.node_modules.ember-try/

.eslintrc.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const nodeFiles = [
1111
'config/**/*.{js,ts}',
1212
'lib/*/index.{js,ts}',
1313
'server/**/*.{js,ts}',
14+
'tests/dummy/config/**/*.{js,ts}',
1415
];
1516

1617
const browserFiles = [
@@ -29,6 +30,9 @@ module.exports = {
2930
parserOptions: {
3031
ecmaVersion: 2018,
3132
sourceType: 'module',
33+
ecmaFeatures: {
34+
legacyDecorators: true,
35+
},
3236
project: ['./tsconfig.json', './tsconfig-node.json'],
3337
},
3438
plugins: ['@typescript-eslint', 'ember', 'prettier'],
@@ -40,8 +44,7 @@ module.exports = {
4044
'plugin:ember/recommended',
4145
'standard',
4246

43-
'prettier/@typescript-eslint',
44-
'prettier/standard',
47+
'prettier',
4548

4649
// This one should come last
4750
'plugin:prettier/recommended',
@@ -75,6 +78,7 @@ module.exports = {
7578
camelcase: 'off', // Have to keep this off for the TS equivalent to take precedence
7679
'no-console': ['error', { allow: ['debug', 'error', 'info', 'warn'] }],
7780
'no-unused-expressions': 'off',
81+
'no-use-before-define': 'off', // We need circular references
7882
'no-useless-constructor': 'off', // This rule crashes ESLint unless disabled
7983

8084
'node/no-unpublished-require': 'off', // Reenabled for non-Node files only
@@ -94,8 +98,8 @@ module.exports = {
9498
node: true,
9599
},
96100
plugins: ['node'],
101+
extends: ['plugin:node/recommended'],
97102
rules: {
98-
...require('eslint-plugin-node').configs.recommended.rules, // eslint-disable-line node/no-unpublished-require
99103
// add your custom rules and overrides for node files here
100104
'node/no-unsupported-features/es-syntax': ['error', { version: '>=12.0.0' }],
101105
},

.github/workflows/ci.yml

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- gen-4
7+
tags:
8+
- '*'
9+
pull_request:
10+
schedule:
11+
- cron: '0 4 * * 5' # Fridays at 4am
12+
13+
jobs:
14+
test:
15+
name: Tests
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Checkout code
20+
uses: actions/checkout@v2
21+
- name: Setup node.js
22+
uses: actions/setup-node@v1
23+
with:
24+
node-version: 12
25+
- name: Install dependencies
26+
uses: bahmutov/npm-install@v1
27+
- name: Lint
28+
run: yarn lint
29+
- name: Test
30+
run: yarn test:ember
31+
32+
test-no-lock:
33+
name: Floating Dependencies
34+
runs-on: ubuntu-latest
35+
needs:
36+
- test
37+
steps:
38+
- name: Checkout code
39+
uses: actions/checkout@v2
40+
- name: Setup node.js
41+
uses: actions/setup-node@v1
42+
with:
43+
node-version: 12
44+
- name: Install dependencies
45+
uses: bahmutov/npm-install@v1
46+
with:
47+
useLockFile: false
48+
- name: Test
49+
run: yarn test:ember
50+
51+
test-try:
52+
name: Additional Tests
53+
runs-on: ubuntu-latest
54+
needs:
55+
- test
56+
strategy:
57+
matrix:
58+
scenario:
59+
- ember-lts-3.16
60+
- ember-lts-3.20
61+
- ember-release
62+
- ember-beta
63+
- ember-canary
64+
- ember-default-with-jquery
65+
- ember-classic
66+
steps:
67+
- name: Checkout code
68+
uses: actions/checkout@v2
69+
- name: Setup node.js
70+
uses: actions/setup-node@v1
71+
with:
72+
node-version: 12
73+
- name: Install dependencies
74+
uses: bahmutov/npm-install@v1
75+
- name: Test
76+
run: yarn ember try:one ${{ matrix.scenario }}

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
# misc
1212
/.sass-cache
13+
/.eslintcache
1314
/connect.lock
1415
/coverage/
1516
/libpeerconnection.log

.npmignore

+3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
1516
/.git/
1617
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1720
/.template-lintrc.js
1821
/.travis.yml
1922
/.watchmanconfig

.prettierignore

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

.prettierrc.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
module.exports = {
24
arrowParens: 'always', // It's convenient that you don't have to add them by hand when you need to add more args or a type
35
singleQuote: true, // Enabled to align with EmberJS Prettier config

.release-it.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"github": {
3+
"release": true
4+
}
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: 'recommended'
4+
extends: 'octane',
55
};

.travis.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ node_js:
55
# so that your addon works for all apps
66
- "10"
77

8-
dist: trusty
8+
dist: xenial
99

1010
addons:
1111
chrome: stable
@@ -46,20 +46,19 @@ jobs:
4646

4747
# we recommend new addons test the current and previous LTS
4848
# as well as latest stable release (bonus points to beta/canary)
49-
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
5049
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
5151
- env: EMBER_TRY_SCENARIO=ember-release
5252
- env: EMBER_TRY_SCENARIO=ember-beta
5353
- env: EMBER_TRY_SCENARIO=ember-canary
5454
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
5555
- env: EMBER_TRY_SCENARIO=ember-classic
56+
- env: EMBER_TRY_SCENARIO=embroider-safe
57+
- env: EMBER_TRY_SCENARIO=embroider-optimized
5658

5759
before_install:
5860
- curl -o- -L https://yarnpkg.com/install.sh | bash
5961
- export PATH=$HOME/.yarn/bin:$PATH
6062

61-
install:
62-
- yarn install --non-interactive
63-
6463
script:
6564
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Changelog

CONTRIBUTING.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
## Linting
1010

11-
* `yarn lint:hbs`
12-
* `yarn lint:js`
13-
* `yarn lint:js --fix`
11+
* `yarn lint`
12+
* `yarn lint:fix`
1413

1514
## Running tests
1615

0 commit comments

Comments
 (0)