Skip to content

Commit 5803250

Browse files
committed
Ran ember-cli-update
1 parent 2083558 commit 5803250

File tree

12 files changed

+84
-52
lines changed

12 files changed

+84
-52
lines changed

bfcoder-github-com/.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

bfcoder-github-com/.eslintrc.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
5+
parser: 'babel-eslint',
36
parserOptions: {
4-
ecmaVersion: 2017,
5-
sourceType: 'module'
7+
ecmaVersion: 2018,
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true
11+
}
612
},
713
plugins: [
814
'ember'
@@ -15,6 +21,7 @@ module.exports = {
1521
browser: true
1622
},
1723
rules: {
24+
'ember/no-jquery': 'error'
1825
},
1926
overrides: [
2027
// node files
@@ -30,8 +37,7 @@ module.exports = {
3037
'server/**/*.js'
3138
],
3239
parserOptions: {
33-
sourceType: 'script',
34-
ecmaVersion: 2015
40+
sourceType: 'script'
3541
},
3642
env: {
3743
browser: false,
Lines changed: 1 addition & 1 deletion
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
};

bfcoder-github-com/.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
---
22
language: node_js
33
node_js:
4-
- "6"
4+
- "10"
55

6-
sudo: false
76
dist: trusty
87

98
addons:
@@ -17,6 +16,10 @@ env:
1716
# See https://git.io/vdao3 for details.
1817
- JOBS=1
1918

19+
branches:
20+
only:
21+
- master
22+
2023
before_install:
2124
- curl -o- -L https://yarnpkg.com/install.sh | bash
2225
- export PATH=$HOME/.yarn/bin:$PATH
@@ -25,6 +28,4 @@ install:
2528
- yarn install --non-interactive
2629

2730
script:
28-
- yarn lint:hbs
29-
- yarn lint:js
3031
- yarn test

bfcoder-github-com/app/app.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import Application from '@ember/application';
2-
import Resolver from './resolver';
2+
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

6-
const App = Application.extend({
7-
modulePrefix: config.modulePrefix,
8-
podModulePrefix: config.podModulePrefix,
9-
Resolver
10-
});
6+
export default class App extends Application {
7+
modulePrefix = config.modulePrefix;
8+
podModulePrefix = config.podModulePrefix;
9+
Resolver = Resolver;
10+
}
1111

1212
loadInitializers(App, config.modulePrefix);
13-
14-
export default App;

bfcoder-github-com/app/resolver.js

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

bfcoder-github-com/app/router.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import EmberRouter from '@ember/routing/router';
22
import config from './config/environment';
33

4-
const Router = EmberRouter.extend({
5-
location: config.locationType,
6-
rootURL: config.rootURL
7-
});
4+
export default class Router extends EmberRouter {
5+
location = config.locationType;
6+
rootURL = config.rootURL;
7+
}
88

99
Router.map(function() {
1010
this.route('projects');
1111
this.route('photos');
1212
});
13-
14-
export default Router;

bfcoder-github-com/app/templates/components/.gitkeep

Whitespace-only changes.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"schemaVersion": "1.0.0",
3+
"packages": [
4+
{
5+
"name": "ember-cli",
6+
"version": "3.18.0",
7+
"blueprints": [
8+
{
9+
"name": "app",
10+
"outputRepo": "https://github.com/ember-cli/ember-new-output",
11+
"codemodsSource": "ember-app-codemods-manifest@1",
12+
"isBaseBlueprint": true,
13+
"options": [
14+
"--yarn"
15+
]
16+
}
17+
]
18+
}
19+
]
20+
}
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"jquery-integration": true
2+
"application-template-wrapper": false,
3+
"default-async-observers": true,
4+
"jquery-integration": false,
5+
"template-only-glimmer-components": true
36
}

0 commit comments

Comments
 (0)