Skip to content

Commit 46fc686

Browse files
cafreemanpatrickberkeley
authored andcommitted
Cleanup, updates, and a bugfix (#11)
* update dependencies * remove all the deps and setup we don’t use * set up linting and fix travis config * syntax cleanup * Fix overwrite behavior * more cleanup * fix filepath parsing, use less regex * comment all the things
1 parent a654ac5 commit 46fc686

35 files changed

+3039
-2969
lines changed

.bowerrc

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

.eslintignore

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

.eslintrc.js

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,67 @@ module.exports = {
22
root: true,
33
parserOptions: {
44
ecmaVersion: 2017,
5-
sourceType: 'module'
5+
sourceType: "module"
66
},
7-
extends: 'eslint:recommended',
7+
plugins: ["ember", "prettier"],
8+
extends: ["eslint:recommended", "plugin:ember/recommended", "prettier"],
89
env: {
910
browser: true
1011
},
1112
rules: {
12-
}
13+
"ember/avoid-leaking-state-in-ember-objects": 0,
14+
"prettier/prettier": ["error", { singleQuote: true }]
15+
},
16+
overrides: [
17+
// node files
18+
{
19+
files: [
20+
".template-lintrc.js",
21+
"ember-cli-build.js",
22+
"index.js",
23+
"testem.js",
24+
"blueprints/*/index.js",
25+
"config/**/*.js",
26+
"tests/dummy/config/**/*.js"
27+
],
28+
excludedFiles: [
29+
"addon/**",
30+
"addon-test-support/**",
31+
"app/**",
32+
"tests/dummy/app/**"
33+
],
34+
parserOptions: {
35+
sourceType: "script",
36+
ecmaVersion: 2015
37+
},
38+
env: {
39+
browser: false,
40+
node: true
41+
},
42+
plugins: ["node"],
43+
rules: Object.assign(
44+
{},
45+
require("eslint-plugin-node").configs.recommended.rules,
46+
{
47+
// add your custom rules and overrides for node files here
48+
}
49+
)
50+
},
51+
{
52+
files: ["tests/unit/**/*.js"],
53+
env: {
54+
browser: false,
55+
node: true,
56+
mocha: true
57+
},
58+
plugins: ["node"],
59+
rules: Object.assign(
60+
{},
61+
require("eslint-plugin-node").configs.recommended.rules,
62+
{
63+
// add your custom rules and overrides for node files here
64+
}
65+
)
66+
}
67+
]
1368
};

.travis.yml

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,20 @@
11
---
22
language: node_js
33
node_js:
4-
- "4"
54
- "6"
6-
- "7"
75

8-
sudo: required
6+
sudo: false
97
dist: trusty
108

11-
addons:
12-
apt:
13-
sources:
14-
- google-chrome
15-
packages:
16-
- google-chrome-stable
17-
189
cache:
19-
directories:
20-
- node_modules
10+
yarn: true
2111

2212
before_install:
23-
- "export DISPLAY=:99.0"
24-
- "sh -e /etc/init.d/xvfb start"
25-
- npm config set spin false
13+
- curl -o- -L https://yarnpkg.com/install.sh | bash
14+
- export PATH=$HOME/.yarn/bin:$PATH
2615

2716
install:
28-
- npm install -g bower
29-
- npm install
30-
- bower install
17+
- yarn install --no-lockfile --non-interactive
3118

3219
script:
33-
- ember try:each
20+
- yarn test

bower.json

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

config/ember-try.js

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

config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
'use strict';
33

44
module.exports = function(/* environment, appConfig */) {
5-
return { };
5+
return {};
66
};

0 commit comments

Comments
 (0)