Skip to content

Commit 13c2acd

Browse files
committed
run ember-cli-update
1 parent 6053980 commit 13c2acd

15 files changed

Lines changed: 107 additions & 105 deletions

.eslintignore

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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+
17+
# ember-try
18+
/.node_modules.ember-try/
19+
/bower.json.ember-try
20+
/package.json.ember-try

.eslintrc.js

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@ module.exports = {
2020
// node files
2121
{
2222
files: [
23-
'fastboot-server.js',
24-
'testem.js',
23+
'.eslintrc.js',
24+
'.template-lintrc.js',
2525
'ember-cli-build.js',
26+
'testem.js',
27+
'blueprints/*/index.js',
2628
'config/**/*.js',
27-
'lib/*/index.js'
29+
'lib/*/index.js',
30+
'server/**/*.js'
2831
],
2932
parserOptions: {
3033
sourceType: 'script',
@@ -34,15 +37,6 @@ module.exports = {
3437
browser: false,
3538
node: true
3639
}
37-
},
38-
39-
// test files
40-
{
41-
files: ['tests/**/*.js'],
42-
excludedFiles: ['tests/dummy/**/*.js'],
43-
env: {
44-
embertest: true
45-
}
4640
}
4741
]
4842
};

.gitignore

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66
/tmp
77

88
# dependencies
9-
/node_modules
10-
/bower_components
9+
/bower_components/
10+
/node_modules/
1111

1212
# misc
13+
/.env*
14+
/.pnp*
1315
/.sass-cache
1416
/connect.lock
15-
/coverage/*
17+
/coverage/
1618
/libpeerconnection.log
17-
npm-debug.log*
18-
yarn-error.log
19-
testem.log
19+
/npm-debug.log*
20+
/testem.log
21+
/yarn-error.log
2022

2123
# ember-try
22-
.node_modules.ember-try/
23-
bower.json.ember-try
24-
package.json.ember-try
24+
/.node_modules.ember-try/
25+
/bower.json.ember-try
26+
/package.json.ember-try

.template-lintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'recommended'
5+
};

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ addons:
1010
cache:
1111
yarn: true
1212
directories:
13-
- $HOME/.cache
13+
- $HOME/.npm
1414

1515
env:
1616
global:
1717
# See https://git.io/vdao3 for details.
1818
- JOBS=1
1919

20-
before_install:
21-
- curl -o- -L https://yarnpkg.com/install.sh | bash
22-
- export PATH=$HOME/.yarn/bin:$PATH
2320

2421
install:
2522
- yarn

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ To run the website locally:
2020

2121
### Running Tests
2222

23-
- `ember test`
23+
* `ember test`
24+
* `ember test --server`
25+
26+
### Building
27+
28+
* `ember build` (development)
29+
* `ember build --environment production` (production)
2430

2531
### Deploying
2632

config/environment.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ module.exports = function(environment) {
1919
FEATURES: {
2020
// Here you can enable experimental features on an ember canary build
2121
// e.g. 'with-controller': true
22+
},
23+
EXTEND_PROTOTYPES: {
24+
// Prevent Ember Data from overriding Date.parse.
25+
Date: false
2226
}
2327
},
2428

config/optional-features.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"jquery-integration": true
3+
}

config/targets.js

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1+
'use strict';
2+
3+
const browsers = [
4+
'last 1 Chrome versions',
5+
'last 1 Firefox versions',
6+
'last 1 Safari versions'
7+
];
8+
9+
const isCI = !!process.env.CI;
10+
const isProduction = process.env.EMBER_ENV === 'production';
11+
12+
if (isCI || isProduction) {
13+
browsers.push('ie 11');
14+
}
15+
116
module.exports = {
2-
browsers: [
3-
'ie 9',
4-
'last 1 Chrome versions',
5-
'last 1 Firefox versions',
6-
'last 1 Safari versions'
7-
]
8-
};
17+
browsers
18+
};

package.json

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,65 +3,70 @@
33
"version": "0.0.0",
44
"private": true,
55
"description": "Small description for fastboot-website goes here",
6+
"repository": "https://github.com/ember-fastboot/fastboot-website",
67
"license": "MIT",
78
"author": "",
89
"directories": {
910
"doc": "doc",
1011
"test": "tests"
1112
},
12-
"repository": "https://github.com/ember-fastboot/fastboot-website",
1313
"scripts": {
1414
"build": "ember build",
15-
"lint:js": "eslint ./*.js app config lib server tests",
15+
"lint:hbs": "ember-template-lint .",
16+
"lint:js": "eslint .",
1617
"start": "ember serve",
1718
"test": "ember test"
1819
},
1920
"devDependencies": {
21+
"@ember/jquery": "^0.5.2",
22+
"@ember/optional-features": "^0.6.3",
2023
"autoprefixer": "^6.7.2",
2124
"basscss": "^8.0.10",
22-
"broccoli-asset-rev": "^2.4.5",
23-
"ember-ajax": "^3.0.0",
25+
"broccoli-asset-rev": "^2.7.0",
26+
"ember-ajax": "^5.0.0",
2427
"ember-browserify": "^1.2.2",
25-
"ember-cli": "~2.18.2",
26-
"ember-cli-app-version": "^3.0.0",
28+
"ember-cli": "~3.9.0",
29+
"ember-cli-app-version": "^3.2.0",
2730
"ember-cli-autoprefixer": "0.6.0",
28-
"ember-cli-babel": "^6.6.0",
29-
"ember-cli-dependency-checker": "^2.0.0",
31+
"ember-cli-babel": "^7.1.2",
32+
"ember-cli-dependency-checker": "^3.1.0",
3033
"ember-cli-deploy": "1.0.2",
3134
"ember-cli-deploy-build": "0.1.1",
3235
"ember-cli-deploy-gzip": "0.2.4",
33-
"ember-cli-eslint": "^4.2.1",
36+
"ember-cli-eslint": "^4.2.3",
3437
"ember-cli-fastboot": "^1.0.0",
3538
"ember-cli-head": "^0.3.1",
36-
"ember-cli-htmlbars": "^2.0.1",
37-
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
38-
"ember-cli-inject-live-reload": "^1.6.1",
39+
"ember-cli-htmlbars": "^3.0.0",
40+
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
41+
"ember-cli-inject-live-reload": "^1.8.2",
3942
"ember-cli-postcss": "^3.1.1",
40-
"ember-cli-qunit": "^4.1.1",
41-
"ember-cli-shims": "^1.2.0",
4243
"ember-cli-sri": "^2.1.1",
43-
"ember-cli-uglify": "^2.0.0",
44+
"ember-cli-template-lint": "^1.0.0-beta.1",
45+
"ember-cli-uglify": "^2.1.0",
4446
"ember-disable-proxy-controllers": "^1.0.2",
4547
"ember-export-application-global": "^2.0.0",
4648
"ember-fr-markdown-file": "0.0.0",
4749
"ember-href-to": "^1.13.0",
48-
"ember-load-initializers": "^1.0.0",
50+
"ember-load-initializers": "^1.1.0",
4951
"ember-markedjs": "^0.1.2",
52+
"ember-maybe-import-regenerator": "^0.1.6",
5053
"ember-metrics": "0.6.2",
51-
"ember-resolver": "^4.0.0",
52-
"ember-source": "~2.18.0",
53-
"eslint-plugin-ember": "^5.0.0",
54+
"ember-qunit": "^3.4.1",
55+
"ember-resolver": "^5.0.1",
56+
"ember-source": "~3.9.0",
57+
"eslint-plugin-ember": "^5.2.0",
5458
"highlight.js": "^9.15.6",
5559
"liquid-fire": "^0.27.0",
56-
"loader.js": "^4.2.3",
60+
"loader.js": "^4.7.0",
5761
"marked": "^0.3.6",
5862
"normalize.css": "^4.0.0",
5963
"postcss-custom-media": "^5.0.1",
6064
"postcss-custom-properties": "^5.0.0",
61-
"postcss-import": "^8.0.2"
65+
"postcss-import": "^8.0.2",
66+
"qunit-dom": "^0.8.0"
6267
},
6368
"engines": {
64-
"node": "^4.5 || 6.* || >= 7.*"
69+
"node": "6.* || 8.* || >= 10.*"
6570
},
6671
"dependencies": {
6772
"express": "^4.16.4",

0 commit comments

Comments
 (0)