Skip to content

Commit b835d6b

Browse files
makepanicsivakumar-kailasam
makepanic
authored and
sivakumar-kailasam
committed
chore(ember-cli): bump ember-cli to 2.13.2 (#67)
1 parent c534cd4 commit b835d6b

26 files changed

+158
-185
lines changed

‎.editorconfig

-14
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,8 @@ insert_final_newline = true
1313
indent_style = space
1414
indent_size = 2
1515

16-
[*.js]
17-
indent_style = space
18-
indent_size = 2
19-
2016
[*.hbs]
2117
insert_final_newline = false
22-
indent_style = space
23-
indent_size = 2
24-
25-
[*.css]
26-
indent_style = space
27-
indent_size = 2
28-
29-
[*.html]
30-
indent_style = space
31-
indent_size = 2
3218

3319
[*.{diff,md}]
3420
trim_trailing_whitespace = false

‎.eslintrc.js

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module.exports = {
2+
globals: {
3+
server: true,
4+
},
5+
root: true,
6+
parserOptions: {
7+
ecmaVersion: 2017,
8+
sourceType: 'module'
9+
},
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember-suave/recommended'
13+
],
14+
env: {
15+
browser: true
16+
},
17+
rules: {}
18+
};

‎.gitignore

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
44
/dist
@@ -13,7 +13,5 @@
1313
/connect.lock
1414
/coverage/*
1515
/libpeerconnection.log
16-
npm-debug.log
16+
npm-debug.log*
1717
testem.log
18-
19-
.env.deploy.*

‎.jscsrc

-3
This file was deleted.

‎.jshintrc

-32
This file was deleted.

‎.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
22
language: node_js
33
node_js:
4-
- "4"
4+
- "6"
55

66
sudo: false
77

88
cache:
99
directories:
10-
- node_modules
10+
- $HOME/.npm
1111

1212
before_install:
1313
- npm config set spin false
1414
- npm install -g bower
1515
- bower --version
16-
- npm install phantomjs-prebuilt
17-
- node_modules/phantomjs-prebuilt/bin/phantomjs --version
16+
- npm install -g phantomjs-prebuilt
17+
- phantomjs --version
1818

1919
install:
2020
- npm install

‎README.md

+5-6
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ further!
7575

7676
You will need the following things properly installed on your computer.
7777

78-
* [Git](http://git-scm.com/)
79-
* [Node.js](http://nodejs.org/) (with NPM)
80-
* [Bower](http://bower.io/)
81-
* [Ember CLI](http://www.ember-cli.com/)
78+
* [Git](https://git-scm.com/)
79+
* [Node.js](https://nodejs.org/) (with NPM)
80+
* [Bower](https://bower.io/)
81+
* [Ember CLI](https://ember-cli.com/)
8282
* [PhantomJS](http://phantomjs.org/)
8383

8484
## Installation
@@ -114,8 +114,7 @@ Specify what it takes to deploy your app.
114114
## Further Reading / Useful Links
115115

116116
* [ember.js](http://emberjs.com/)
117-
* [ember-cli](http://www.ember-cli.com/)
117+
* [ember-cli](https://ember-cli.com/)
118118
* Development Browser Extensions
119119
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
120120
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
121-

‎app/app.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ import config from './config/environment';
55

66
const { Application } = Ember;
77

8-
let App;
9-
10-
Ember.MODEL_FACTORY_INJECTIONS = true;
11-
12-
App = Application.extend({
8+
const App = Application.extend({
139
modulePrefix: config.modulePrefix,
1410
podModulePrefix: config.podModulePrefix,
1511
Resolver

‎app/styles/base/_buttons.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#{$all-button-inputs},
1+
//TODO: #{$all-button-inputs},
22
button {
33
@include appearance(none);
44
-webkit-font-smoothing: antialiased;

‎app/styles/base/_variables.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $highlight-red: #EC605E;
4040
$highlight-blue: #90D7F5;
4141
$highlight-cyan: #78CEC8;
4242
$code-background: $dark-gray;
43-
$code-header-background: shade($code-background, 40%);
43+
$code-header-background: shade($code-background, .4);
4444
$code-line-number-background: mix($code-background, $code-header-background);
4545

4646
$highlight-colors: (

‎bower.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
22
"name": "ember-help-wanted",
33
"dependencies": {
4-
"ember": "~2.8.0",
5-
"ember-cli-shims": "0.1.1",
6-
"bourbon": "4.2.6",
7-
"neat": "~1.7.2",
8-
"normalize.css": "3.0.3"
4+
"normalize.css": "3.0.3",
5+
"bourbon": "4.2.6"
96
}
107
}

‎config/deploy.js

+27-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,32 @@
1-
module.exports = function(deployTarget) {
2-
return {
1+
/* eslint-env node */
2+
3+
module.exports = function(deployTarget) {
4+
var ENV = {
35
pagefront: {
46
app: 'help-wanted',
57
key: process.env.PAGEFRONT_KEY
6-
}
8+
},
9+
build: {}
10+
// include other plugin configuration that applies to all deploy targets here
711
};
12+
13+
if (deployTarget === 'development') {
14+
ENV.build.environment = 'development';
15+
// configure other plugins for development deploy target here
16+
}
17+
18+
if (deployTarget === 'staging') {
19+
ENV.build.environment = 'production';
20+
// configure other plugins for staging deploy target here
21+
}
22+
23+
if (deployTarget === 'production') {
24+
ENV.build.environment = 'production';
25+
// configure other plugins for production deploy target here
26+
}
27+
28+
// Note: if you need to build some configuration asynchronously, you can return
29+
// a promise that resolves with the ENV object instead of returning the
30+
// ENV object synchronously.
31+
return ENV;
832
};

‎config/environment.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/* jshint node: true */
1+
/* eslint-env node */
22

33
module.exports = function(environment) {
4-
var ENV = {
4+
const ENV = {
55
modulePrefix: 'ember-help-wanted',
6-
environment: environment,
6+
environment,
77
contentSecurityPolicy: { 'connect-src': "'self'" },
88
rootURL: '/',
99
locationType: 'auto',
@@ -12,6 +12,10 @@ module.exports = function(environment) {
1212
FEATURES: {
1313
// Here you can enable experimental features on an ember canary build
1414
// e.g. 'with-controller': true
15+
},
16+
EXTEND_PROTOTYPES: {
17+
// Prevent Ember Data from overriding Date.parse.
18+
Date: false
1519
}
1620
},
1721

‎config/release.js

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/* jshint node:true */
2+
// var RSVP = require('rsvp');
3+
4+
// For details on each option run `ember help release`
5+
module.exports = {
6+
// local: true,
7+
// remote: 'some_remote',
8+
// annotation: "Release %@",
9+
// message: "Bumped version to %@",
10+
// manifest: [ 'package.json', 'bower.json', 'someconfig.json' ],
11+
// publish: true,
12+
// strategy: 'date',
13+
// format: 'YYYY-MM-DD',
14+
// timezone: 'America/Los_Angeles',
15+
//
16+
// beforeCommit: function(project, versions) {
17+
// return new RSVP.Promise(function(resolve, reject) {
18+
// // Do custom things here...
19+
// });
20+
// }
21+
};

‎config/targets.js

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/* eslint-env node */
2+
3+
module.exports = {
4+
browsers: [
5+
'ie 9',
6+
'last 1 Chrome versions',
7+
'last 1 Firefox versions',
8+
'last 1 Safari versions'
9+
]
10+
};

‎ember-cli-build.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
/*jshint node:true*/
2-
/* global require, module */
3-
var EmberApp = require('ember-cli/lib/broccoli/ember-app');
1+
/* eslint-env node */
2+
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
43

54
module.exports = function(defaults) {
65
var app = new EmberApp(defaults, {

‎mirage/config.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ export default function() {
99
*/
1010

1111
// this.urlPrefix = ''; // make this `http://localhost:8080`, for example, if your API is on a different server
12-
// this.namespace = ''; // make this `api`, for example, if your API is namespaced
12+
// this.namespace = ''; // make this `/api`, for example, if your API is namespaced
1313
// this.timing = 400; // delay for each request, automatically set to 0 during testing
1414

1515
this.get('/issues');
16-
1716
/*
1817
Shorthand cheatsheet:
1918
@@ -23,6 +22,6 @@ export default function() {
2322
this.put('/posts/:id'); // or this.patch
2423
this.del('/posts/:id');
2524
26-
http://www.ember-cli-mirage.com/docs/v0.2.x/shorthands/
25+
http://www.ember-cli-mirage.com/docs/v0.3.x/shorthands/
2726
*/
2827
}

‎package.json

+36-34
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,52 @@
22
"name": "ember-help-wanted",
33
"version": "0.0.0",
44
"description": "Small description for ember-help-wanted goes here",
5-
"private": true,
5+
"license": "MIT",
6+
"author": "",
67
"directories": {
78
"doc": "doc",
89
"test": "tests"
910
},
11+
"repository": "",
1012
"scripts": {
1113
"build": "ember build",
1214
"start": "ember server",
1315
"test": "ember test"
1416
},
15-
"repository": "",
16-
"engines": {
17-
"node": ">= 4.5.0"
18-
},
19-
"author": "",
20-
"license": "MIT",
2117
"devDependencies": {
22-
"broccoli-asset-rev": "^2.4.2",
23-
"ember-ajax": "^2.0.1",
24-
"ember-cli": "2.9.1",
25-
"ember-cli-app-version": "^2.0.1",
26-
"ember-cli-babel": "^5.1.6",
27-
"ember-cli-bourbon": "1.2.2",
28-
"ember-cli-dependency-checker": "^1.2.0",
29-
"ember-cli-deploy": "^0.6.1",
30-
"ember-cli-htmlbars": "^1.0.3",
31-
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
32-
"ember-cli-inject-live-reload": "^1.4.0",
33-
"ember-cli-jshint": "^1.0.0",
34-
"ember-cli-mirage": "0.2.3",
35-
"ember-cli-neat": "0.0.5",
36-
"ember-cli-qunit": "^3.0.2",
37-
"ember-cli-release": "^0.2.9",
38-
"ember-cli-sass": "5.6.0",
18+
"broccoli-asset-rev": "^2.4.5",
19+
"ember-ajax": "^3.0.0",
20+
"ember-cli": "2.13.2",
21+
"ember-cli-app-version": "^3.0.0",
22+
"ember-cli-babel": "^6.0.0",
23+
"ember-cli-bourbon": "^1.2.2",
24+
"ember-cli-dependency-checker": "^1.3.0",
25+
"ember-cli-deploy": "^1.0.0",
26+
"ember-cli-eslint": "^3.1.0",
27+
"ember-cli-htmlbars": "^1.1.1",
28+
"ember-cli-htmlbars-inline-precompile": "^0.4.0",
29+
"ember-cli-inject-live-reload": "^1.4.1",
30+
"ember-cli-mirage": "^0.3.2",
31+
"ember-cli-neat": "0.0.6",
32+
"ember-cli-qunit": "^4.0.0",
33+
"ember-cli-release": "^1.0.0-beta.2",
34+
"ember-cli-sass": "^6.2.0",
35+
"ember-cli-shims": "^1.1.0",
3936
"ember-cli-sri": "^2.1.0",
40-
"ember-cli-test-loader": "^1.1.0",
4137
"ember-cli-uglify": "^1.2.0",
42-
"ember-data": "^2.8.0",
43-
"ember-export-application-global": "^1.0.5",
44-
"ember-load-initializers": "^0.5.1",
45-
"ember-normalize": "0.0.9",
46-
"ember-pagefront": "^0.11.1",
47-
"ember-resolver": "^2.0.3",
48-
"ember-suave": "4.0.1",
49-
"loader.js": "^4.0.1"
50-
}
38+
"ember-data": "^2.13.0",
39+
"ember-export-application-global": "^2.0.0",
40+
"ember-load-initializers": "^1.0.0",
41+
"ember-normalize": "^1.0.0",
42+
"ember-pagefront": "^0.11.2",
43+
"ember-resolver": "^4.0.0",
44+
"ember-source": "~2.13.0",
45+
"eslint-plugin-ember-suave": "^1.0.0",
46+
"loader.js": "^4.2.3",
47+
"normalize.css": "^4.1.1"
48+
},
49+
"engines": {
50+
"node": ">= 4"
51+
},
52+
"private": true
5153
}

0 commit comments

Comments
 (0)