tqt
/
Ghost-Admin
mirror of https://github.com/TryGhost/Ghost-Admin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update ember-cli to version 2.7.0 🚀 (#148) 

* chore(package): update ember-cli to version 2.7.0

https://greenkeeper.io/

* update app from ember-cli blueprint

* deps: ember-cli-test-loader@1.1.0
This commit is contained in:
Greenkeeper 2016-07-31 21:47:19 +02:00 committed by Kevin Ansfield
parent e9c5beec34
commit 51af60af93
8 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.jshintrc
View File

@ -31,6 +31,6 @@
"strict": false,
"white": false,
"eqnull": true,
"esnext": true,
"esversion": 6,
"unused": true
}

8
app/index.html
View File

@ -7,7 +7,7 @@
<title>Ghost Admin</title>
{{content-for 'head'}}
{{content-for "head"}}
<meta name="HandheldFriendly" content="True" />
<meta name="MobileOptimized" content="320" />
@ -42,12 +42,12 @@
<link rel="stylesheet" href="{{asset "vendor.css" ghost="true" minifyInProduction="true"}}" />
<link rel="stylesheet" href="{{asset "ghost.css" ghost="true" minifyInProduction="true"}}" />
{{content-for 'head-footer'}}
{{content-for "head-footer"}}
</head>
<body>
{{content-for 'body'}}
{{content-for "body"}}
{{content-for 'body-footer'}}
{{content-for "body-footer"}}
{{! Dem scripts }}
<script src="{{asset "vendor.js" ghost="true" minifyInProduction="true"}}"></script>

4
app/mirage/config.js
View File

@ -136,7 +136,7 @@ function mockSubscribers(server) {
export default function () {
// this.urlPrefix = ''; // make this `http://localhost:8080`, for example, if your API is on a different server
this.namespace = 'ghost/api/v0.1'; // make this `api`, for example, if your API is namespaced
this.namespace = '/ghost/api/v0.1'; // make this `api`, for example, if your API is namespaced
this.timing = 400; // delay for each request, automatically set to 0 during testing
// Mock endpoints here to override real API requests during development
@ -153,7 +153,7 @@ export default function () {
// Mock all endpoints here as there is no real API during testing
export function testConfig() {
// this.urlPrefix = ''; // make this `http://localhost:8080`, for example, if your API is on a different server
this.namespace = 'ghost/api/v0.1'; // make this `api`, for example, if your API is namespaced
this.namespace = '/ghost/api/v0.1'; // make this `api`, for example, if your API is namespaced
// this.timing = 400; // delay for each request, automatically set to 0 during testing
// this.logging = true;

1
bower.json
View File

@ -4,7 +4,6 @@
"devicejs": "0.2.7",
"ember": "2.6.1",
"ember-cli-shims": "0.1.3",
"ember-cli-test-loader": "0.2.2",
"ember-mocha": "0.8.11",
"Faker": "3.1.0",
"fastclick": "1.0.6",

10
config/environment.js
View File

@ -5,12 +5,19 @@ module.exports = function (environment) {
var ENV = {
modulePrefix: 'ghost-admin',
environment: environment,
baseURL: '/',
rootURL: '/',
locationType: 'trailing-history',
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
},
// @TODO verify that String/Function need to be enabled
EXTEND_PROTOTYPES: {
Date: false,
Array: true,
String: true,
Function: true
}
},
@ -45,7 +52,6 @@ module.exports = function (environment) {
if (environment === 'test') {
// Testem prefers this...
ENV.baseURL = '/';
ENV.locationType = 'none';
// keep test console output quieter

3
package.json
View File

@ -36,7 +36,7 @@
"codemirror": "5.17.0",
"csscomb": "3.1.8",
"ember-ajax": "2.4.1",
"ember-cli": "2.6.3",
"ember-cli": "2.7.0",
"ember-cli-app-version": "1.0.0",
"ember-cli-babel": "5.1.7",
"ember-cli-content-security-policy": "0.5.0",
@ -53,6 +53,7 @@
"ember-cli-release": "0.2.8",
"ember-cli-selectize": "0.5.5",
"ember-cli-sri": "2.1.0",
"ember-cli-test-loader": "1.1.0",
"ember-cli-uglify": "1.2.0",
"ember-data": "2.7.0",
"ember-data-filter": "1.13.0",

2
tests/.jshintrc
View File

@ -55,5 +55,5 @@
"strict": false,
"white": false,
"eqnull": true,
"esnext": true
"esversion": 6
}

35
tests/index.html
View File

@ -7,8 +7,8 @@
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
{{content-for 'head'}}
{{content-for 'test-head'}}
{{content-for "head"}}
{{content-for "test-head"}}
<meta name="env-fileStorage" content="true" />
<meta name="env-apps" content="false" />
@ -18,12 +18,12 @@
<meta name="env-clientId" content="ghost-admin" />
<meta name="env-clientSecret" content="5076dc643873" />
<link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/ghost.css">
<link rel="stylesheet" href="assets/test-support.css">
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
<link rel="stylesheet" href="{{rootURL}}assets/ghost.css">
<link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
{{content-for 'head-footer'}}
{{content-for 'test-head-footer'}}
{{content-for "head-footer"}}
{{content-for "test-head-footer"}}
<style>
/* fix to ensure we use full viewport height when testing */
@ -43,18 +43,17 @@
</style>
</head>
<body>
{{content-for "body"}}
{{content-for "test-body"}}
{{content-for 'body'}}
{{content-for 'test-body'}}
<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/ghost.js"></script>
<script src="{{rootURL}}assets/tests.js"></script>
<script src="{{rootURL}}assets/test-loader.js"></script>
<script src="testem.js" integrity=""></script>
<script src="assets/vendor.js"></script>
<script src="assets/test-support.js"></script>
<script src="assets/ghost.js"></script>
<script src="assets/tests.js"></script>
<script src="assets/test-loader.js"></script>
{{content-for 'body-footer'}}
{{content-for 'test-body-footer'}}
{{content-for "body-footer"}}
{{content-for "test-body-footer"}}
</body>
</html>