ENH: upgrade ember 2.7
This commit is contained in:
parent
b53386b032
commit
3236bd4fe2
11 changed files with 25 additions and 28 deletions
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
"predef": [
|
||||
"server",
|
||||
"document",
|
||||
"window",
|
||||
"-Promise"
|
||||
|
|
@ -28,6 +27,6 @@
|
|||
"strict": false,
|
||||
"white": false,
|
||||
"eqnull": true,
|
||||
"esnext": true,
|
||||
"esversion": 6,
|
||||
"unused": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,9 @@ cache:
|
|||
before_install:
|
||||
- npm config set spin false
|
||||
- npm install -g bower
|
||||
- bower --version
|
||||
- npm install phantomjs-prebuilt
|
||||
- phantomjs --version
|
||||
|
||||
install:
|
||||
- npm install
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ You will need the following things properly installed on your computer.
|
|||
|
||||
## Running / Development
|
||||
|
||||
* `ember server`
|
||||
* `ember serve`
|
||||
* Visit your app at [http://localhost:4200](http://localhost:4200).
|
||||
|
||||
### Code Generators
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
{{content-for "head"}}
|
||||
|
||||
<link rel="stylesheet" href="assets/vendor.css">
|
||||
<link rel="stylesheet" href="assets/ccdb-web.css">
|
||||
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
|
||||
<link rel="stylesheet" href="{{rootURL}}assets/ccdb-web.css">
|
||||
|
||||
{{content-for "head-footer"}}
|
||||
</head>
|
||||
<body>
|
||||
{{content-for "body"}}
|
||||
|
||||
<script src="assets/vendor.js"></script>
|
||||
<script src="assets/ccdb-web.js"></script>
|
||||
<script src="{{rootURL}}assets/vendor.js"></script>
|
||||
<script src="{{rootURL}}assets/ccdb-web.js"></script>
|
||||
|
||||
{{content-for "body-footer"}}
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@ import Ember from 'ember';
|
|||
import config from './config/environment';
|
||||
|
||||
const Router = Ember.Router.extend({
|
||||
location: config.locationType
|
||||
location: config.locationType,
|
||||
rootURL: config.rootURL
|
||||
});
|
||||
|
||||
Router.map(function() {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{
|
||||
"name": "ccdb-web",
|
||||
"dependencies": {
|
||||
"ember": "~2.6.0",
|
||||
"ember": "~2.7.0",
|
||||
"ember-cli-shims": "0.1.1",
|
||||
"ember-cli-test-loader": "0.2.2",
|
||||
"ember-qunit-notifications": "0.1.0",
|
||||
"pretender": "~1.1.0",
|
||||
"Faker": "~3.1.0"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ module.exports = function(environment) {
|
|||
var ENV = {
|
||||
modulePrefix: 'ccdb-web',
|
||||
environment: environment,
|
||||
baseURL: '/',
|
||||
rootURL: '/',
|
||||
locationType: 'auto',
|
||||
EmberENV: {
|
||||
FEATURES: {
|
||||
|
|
@ -29,7 +29,6 @@ module.exports = function(environment) {
|
|||
|
||||
if (environment === 'test') {
|
||||
// Testem prefers this...
|
||||
ENV.baseURL = '/';
|
||||
ENV.locationType = 'none';
|
||||
|
||||
// keep test console output quieter
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
"devDependencies": {
|
||||
"broccoli-asset-rev": "^2.4.2",
|
||||
"ember-ajax": "^2.0.1",
|
||||
"ember-cli": "2.6.2",
|
||||
"ember-cli": "2.7.0",
|
||||
"ember-cli-app-version": "^1.0.0",
|
||||
"ember-cli-babel": "^5.1.6",
|
||||
"ember-cli-dependency-checker": "^1.2.0",
|
||||
|
|
@ -32,13 +32,13 @@
|
|||
"ember-cli-jshint": "^1.0.0",
|
||||
"ember-cli-mirage": "0.2.1",
|
||||
"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-sri": "^2.1.0",
|
||||
"ember-cli-test-loader": "^1.1.0",
|
||||
"ember-cli-uglify": "^1.2.0",
|
||||
"ember-data": "^2.6.0",
|
||||
"ember-data": "^2.7.0",
|
||||
"ember-django-adapter": "1.1.2",
|
||||
"ember-engines": "0.2.6",
|
||||
"ember-export-application-global": "^1.0.5",
|
||||
"ember-load-initializers": "^0.5.1",
|
||||
"ember-moment": "7.0.0-beta.3",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
"predef": [
|
||||
"server",
|
||||
"document",
|
||||
"window",
|
||||
"location",
|
||||
|
|
@ -48,6 +47,6 @@
|
|||
"strict": false,
|
||||
"white": false,
|
||||
"eqnull": true,
|
||||
"esnext": true,
|
||||
"esversion": 6,
|
||||
"unused": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,5 +2,4 @@ import Ember from 'ember';
|
|||
|
||||
export default function destroyApp(application) {
|
||||
Ember.run(application, 'destroy');
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
{{content-for "head"}}
|
||||
{{content-for "test-head"}}
|
||||
|
||||
<link rel="stylesheet" href="assets/vendor.css">
|
||||
<link rel="stylesheet" href="assets/ccdb-web.css">
|
||||
<link rel="stylesheet" href="assets/test-support.css">
|
||||
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
|
||||
<link rel="stylesheet" href="{{rootURL}}assets/ccdb-web.css">
|
||||
<link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
|
||||
|
||||
{{content-for "head-footer"}}
|
||||
{{content-for "test-head-footer"}}
|
||||
|
|
@ -21,12 +21,11 @@
|
|||
{{content-for "body"}}
|
||||
{{content-for "test-body"}}
|
||||
|
||||
<script src="testem.js" integrity=""></script>
|
||||
<script src="assets/vendor.js"></script>
|
||||
<script src="assets/test-support.js"></script>
|
||||
<script src="assets/ccdb-web.js"></script>
|
||||
<script src="assets/tests.js"></script>
|
||||
<script src="assets/test-loader.js"></script>
|
||||
<script src="{{rootURL}}testem.js" integrity=""></script>
|
||||
<script src="{{rootURL}}assets/vendor.js"></script>
|
||||
<script src="{{rootURL}}assets/test-support.js"></script>
|
||||
<script src="{{rootURL}}assets/ccdb-web.js"></script>
|
||||
<script src="{{rootURL}}assets/tests.js"></script>
|
||||
|
||||
{{content-for "body-footer"}}
|
||||
{{content-for "test-body-footer"}}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue