thermokarst/ccdb-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ENH: upgrade ember 2.7

Browse source
This commit is contained in:
Matthew Ryan Dillon 2016-09-05 16:21:37 -07:00
parent b53386b032
commit 3236bd4fe2
11 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.jshintrc
View file

@ -1,6 +1,5 @@
{ {
"predef": [ "predef": [
"server",
"document", "document",
"window", "window",
"-Promise" "-Promise"
@ -28,6 +27,6 @@
"strict": false, "strict": false,
"white": false, "white": false,
"eqnull": true, "eqnull": true,
"esnext": true, "esversion": 6,
"unused": true "unused": true
} }

2
.travis.yml
View file

@ -12,7 +12,9 @@ cache:
before_install: before_install:
- npm config set spin false - npm config set spin false
- npm install -g bower - npm install -g bower
- bower --version
- npm install phantomjs-prebuilt - npm install phantomjs-prebuilt
- phantomjs --version
install: install:
- npm install - npm install

2
README.md
View file

@ -22,7 +22,7 @@ You will need the following things properly installed on your computer.
## Running / Development ## Running / Development
* `ember server` * `ember serve`
* Visit your app at [http://localhost:4200](http://localhost:4200). * Visit your app at [http://localhost:4200](http://localhost:4200).
### Code Generators ### Code Generators

8
app/index.html
View file

@ -9,16 +9,16 @@
{{content-for "head"}} {{content-for "head"}}
<link rel="stylesheet" href="assets/vendor.css"> <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
<link rel="stylesheet" href="assets/ccdb-web.css"> <link rel="stylesheet" href="{{rootURL}}assets/ccdb-web.css">
{{content-for "head-footer"}} {{content-for "head-footer"}}
</head> </head>
<body> <body>
{{content-for "body"}} {{content-for "body"}}
<script src="assets/vendor.js"></script> <script src="{{rootURL}}assets/vendor.js"></script>
<script src="assets/ccdb-web.js"></script> <script src="{{rootURL}}assets/ccdb-web.js"></script>
{{content-for "body-footer"}} {{content-for "body-footer"}}
</body> </body>

3
app/router.js
View file

@ -2,7 +2,8 @@ import Ember from 'ember';
import config from './config/environment'; import config from './config/environment';
const Router = Ember.Router.extend({ const Router = Ember.Router.extend({
location: config.locationType location: config.locationType,
rootURL: config.rootURL
}); });
Router.map(function() { Router.map(function() {

3
bower.json
View file

@ -1,9 +1,8 @@
{ {
"name": "ccdb-web", "name": "ccdb-web",
"dependencies": { "dependencies": {
"ember": "~2.6.0", "ember": "~2.7.0",
"ember-cli-shims": "0.1.1", "ember-cli-shims": "0.1.1",
"ember-cli-test-loader": "0.2.2",
"ember-qunit-notifications": "0.1.0", "ember-qunit-notifications": "0.1.0",
"pretender": "~1.1.0", "pretender": "~1.1.0",
"Faker": "~3.1.0" "Faker": "~3.1.0"

3
config/environment.js
View file

@ -4,7 +4,7 @@ module.exports = function(environment) {
var ENV = { var ENV = {
modulePrefix: 'ccdb-web', modulePrefix: 'ccdb-web',
environment: environment, environment: environment,
baseURL: '/', rootURL: '/',
locationType: 'auto', locationType: 'auto',
EmberENV: { EmberENV: {
FEATURES: { FEATURES: {
@ -29,7 +29,6 @@ module.exports = function(environment) {
if (environment === 'test') { if (environment === 'test') {
// Testem prefers this... // Testem prefers this...
ENV.baseURL = '/';
ENV.locationType = 'none'; ENV.locationType = 'none';
// keep test console output quieter // keep test console output quieter

8
package.json
View file

@ -21,7 +21,7 @@
"devDependencies": { "devDependencies": {
"broccoli-asset-rev": "^2.4.2", "broccoli-asset-rev": "^2.4.2",
"ember-ajax": "^2.0.1", "ember-ajax": "^2.0.1",
"ember-cli": "2.6.2", "ember-cli": "2.7.0",
"ember-cli-app-version": "^1.0.0", "ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.6", "ember-cli-babel": "^5.1.6",
"ember-cli-dependency-checker": "^1.2.0", "ember-cli-dependency-checker": "^1.2.0",
@ -32,13 +32,13 @@
"ember-cli-jshint": "^1.0.0", "ember-cli-jshint": "^1.0.0",
"ember-cli-mirage": "0.2.1", "ember-cli-mirage": "0.2.1",
"ember-cli-moment-shim": "2.0.0", "ember-cli-moment-shim": "2.0.0",
"ember-cli-qunit": "^1.4.0", "ember-cli-qunit": "^2.0.0",
"ember-cli-release": "^0.2.9", "ember-cli-release": "^0.2.9",
"ember-cli-sri": "^2.1.0", "ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0", "ember-cli-uglify": "^1.2.0",
"ember-data": "^2.6.0", "ember-data": "^2.7.0",
"ember-django-adapter": "1.1.2", "ember-django-adapter": "1.1.2",
"ember-engines": "0.2.6",
"ember-export-application-global": "^1.0.5", "ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.5.1", "ember-load-initializers": "^0.5.1",
"ember-moment": "7.0.0-beta.3", "ember-moment": "7.0.0-beta.3",

3
tests/.jshintrc
View file

@ -1,6 +1,5 @@
{ {
"predef": [ "predef": [
"server",
"document", "document",
"window", "window",
"location", "location",
@ -48,6 +47,6 @@
"strict": false, "strict": false,
"white": false, "white": false,
"eqnull": true, "eqnull": true,
"esnext": true, "esversion": 6,
"unused": true "unused": true
} }

1
tests/helpers/destroy-app.js
View file

@ -2,5 +2,4 @@ import Ember from 'ember';
export default function destroyApp(application) { export default function destroyApp(application) {
Ember.run(application, 'destroy'); Ember.run(application, 'destroy');
server.shutdown();
} }

17
tests/index.html
View file

@ -10,9 +10,9 @@
{{content-for "head"}} {{content-for "head"}}
{{content-for "test-head"}} {{content-for "test-head"}}
<link rel="stylesheet" href="assets/vendor.css"> <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
<link rel="stylesheet" href="assets/ccdb-web.css"> <link rel="stylesheet" href="{{rootURL}}assets/ccdb-web.css">
<link rel="stylesheet" href="assets/test-support.css"> <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
{{content-for "head-footer"}} {{content-for "head-footer"}}
{{content-for "test-head-footer"}} {{content-for "test-head-footer"}}
@ -21,12 +21,11 @@
{{content-for "body"}} {{content-for "body"}}
{{content-for "test-body"}} {{content-for "test-body"}}
<script src="testem.js" integrity=""></script> <script src="{{rootURL}}testem.js" integrity=""></script>
<script src="assets/vendor.js"></script> <script src="{{rootURL}}assets/vendor.js"></script>
<script src="assets/test-support.js"></script> <script src="{{rootURL}}assets/test-support.js"></script>
<script src="assets/ccdb-web.js"></script> <script src="{{rootURL}}assets/ccdb-web.js"></script>
<script src="assets/tests.js"></script> <script src="{{rootURL}}assets/tests.js"></script>
<script src="assets/test-loader.js"></script>
{{content-for "body-footer"}} {{content-for "body-footer"}}
{{content-for "test-body-footer"}} {{content-for "test-body-footer"}}