Bump dependencies (#887)
no issue - ember/ember-data/ember-cli@2.16 - bump all outdated dependencies that do not require additional work or more extensive tests - bump sub-dependencies in yarn.lock - use `broccoli-uglify-sourcemap` (same dep as already used in `ember-cli-uglify`) instead of a separate `broccoli-uglify-js` package for building production codemirror assets - add `/concat-stats-for` to `.gitignore` so that filesize stats from `CONCAT_STATS=true ember build` don't end up in the repo
This commit is contained in:
parent
d469457259
commit
bfb27f677a
|
@ -49,3 +49,4 @@ Session.vim
|
||||||
/coverage/*
|
/coverage/*
|
||||||
/libpeerconnection.log
|
/libpeerconnection.log
|
||||||
testem.log
|
testem.log
|
||||||
|
/concat-stats-for
|
||||||
|
|
|
@ -8,6 +8,7 @@ node_js:
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
- GITHUB_OAUTH_KEY=003a44d58f12089d0c0261338298af3813330949
|
- GITHUB_OAUTH_KEY=003a44d58f12089d0c0261338298af3813330949
|
||||||
|
- JOBS=1 # See https://git.io/vdao3 for details.
|
||||||
|
|
||||||
branches:
|
branches:
|
||||||
except:
|
except:
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import Router from '@ember/routing/router';
|
import EmberRouter from '@ember/routing/router';
|
||||||
import config from './config/environment';
|
import config from './config/environment';
|
||||||
import documentTitle from 'ghost-admin/utils/document-title';
|
import documentTitle from 'ghost-admin/utils/document-title';
|
||||||
import ghostPaths from 'ghost-admin/utils/ghost-paths';
|
import ghostPaths from 'ghost-admin/utils/ghost-paths';
|
||||||
import {inject as injectService} from '@ember/service';
|
import {inject as injectService} from '@ember/service';
|
||||||
import {on} from '@ember/object/evented';
|
import {on} from '@ember/object/evented';
|
||||||
|
|
||||||
const GhostRouter = Router.extend({
|
const Router = EmberRouter.extend({
|
||||||
location: config.locationType, // use HTML5 History API instead of hash-tag based URLs
|
location: config.locationType, // use HTML5 History API instead of hash-tag based URLs
|
||||||
rootURL: ghostPaths().adminRoot, // admin interface lives under sub-directory /ghost
|
rootURL: ghostPaths().adminRoot, // admin interface lives under sub-directory /ghost
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ const GhostRouter = Router.extend({
|
||||||
|
|
||||||
documentTitle();
|
documentTitle();
|
||||||
|
|
||||||
GhostRouter.map(function () {
|
Router.map(function () {
|
||||||
this.route('setup', function () {
|
this.route('setup', function () {
|
||||||
this.route('one');
|
this.route('one');
|
||||||
this.route('two');
|
this.route('two');
|
||||||
|
@ -66,4 +66,4 @@ GhostRouter.map(function () {
|
||||||
this.route('error404', {path: '/*path'});
|
this.route('error404', {path: '/*path'});
|
||||||
});
|
});
|
||||||
|
|
||||||
export default GhostRouter;
|
export default Router;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
|
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
|
||||||
const concat = require('broccoli-concat');
|
const concat = require('broccoli-concat');
|
||||||
const mergeTrees = require('broccoli-merge-trees');
|
const mergeTrees = require('broccoli-merge-trees');
|
||||||
const uglify = require('broccoli-uglify-js');
|
const uglify = require('broccoli-uglify-sourcemap');
|
||||||
const CleanCSS = require('broccoli-clean-css');
|
const CleanCSS = require('broccoli-clean-css');
|
||||||
const environment = EmberApp.env();
|
const environment = EmberApp.env();
|
||||||
const isProduction = environment === 'production';
|
const isProduction = environment === 'production';
|
||||||
|
|
46
package.json
46
package.json
|
@ -27,51 +27,51 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@html-next/vertical-collection": "1.0.0-beta.4",
|
"@html-next/vertical-collection": "1.0.0-beta.4",
|
||||||
"autoprefixer": "7.1.3",
|
"autoprefixer": "7.1.5",
|
||||||
"blueimp-md5": "2.10.0",
|
"blueimp-md5": "2.10.0",
|
||||||
"bower": "1.8.0",
|
"bower": "1.8.2",
|
||||||
"broccoli-asset-rev": "2.6.0",
|
"broccoli-asset-rev": "2.6.0",
|
||||||
"broccoli-clean-css": "^2.0.1",
|
"broccoli-clean-css": "^2.0.1",
|
||||||
"broccoli-concat": "3.2.2",
|
"broccoli-concat": "3.2.2",
|
||||||
"broccoli-funnel": "2.0.1",
|
"broccoli-funnel": "2.0.1",
|
||||||
"broccoli-merge-trees": "2.0.0",
|
"broccoli-merge-trees": "2.0.0",
|
||||||
"broccoli-uglify-js": "0.2.0",
|
"broccoli-uglify-sourcemap": "2.0.0",
|
||||||
"chai-jquery": "2.0.0",
|
"chai-jquery": "2.0.0",
|
||||||
"codemirror": "5.29.0",
|
"codemirror": "5.30.0",
|
||||||
"coveralls": "2.13.1",
|
"coveralls": "3.0.0",
|
||||||
"csscomb": "4.2.0",
|
"csscomb": "4.2.0",
|
||||||
"cssnano": "4.0.0-rc.2",
|
"cssnano": "4.0.0-rc.2",
|
||||||
"ember-ajax": "2.5.6",
|
"ember-ajax": "2.5.6",
|
||||||
"ember-browserify": "1.2.0",
|
"ember-browserify": "1.2.0",
|
||||||
"ember-cli": "2.15.0",
|
"ember-cli": "2.16.2",
|
||||||
"ember-cli-active-link-wrapper": "0.3.2",
|
"ember-cli-active-link-wrapper": "0.3.2",
|
||||||
"ember-cli-app-version": "3.1.0",
|
"ember-cli-app-version": "3.1.0",
|
||||||
"ember-cli-babel": "6.8.2",
|
"ember-cli-babel": "6.8.2",
|
||||||
"ember-cli-chai": "0.4.2",
|
"ember-cli-chai": "0.4.3",
|
||||||
"ember-cli-code-coverage": "0.4.1",
|
"ember-cli-code-coverage": "0.4.1",
|
||||||
"ember-cli-dependency-checker": "2.0.1",
|
"ember-cli-dependency-checker": "2.0.1",
|
||||||
"ember-cli-eslint": "4.2.0",
|
"ember-cli-eslint": "4.2.1",
|
||||||
"ember-cli-htmlbars": "2.0.3",
|
"ember-cli-htmlbars": "2.0.3",
|
||||||
"ember-cli-htmlbars-inline-precompile": "1.0.2",
|
"ember-cli-htmlbars-inline-precompile": "1.0.2",
|
||||||
"ember-cli-inject-live-reload": "1.7.0",
|
"ember-cli-inject-live-reload": "1.7.0",
|
||||||
"ember-cli-mirage": "0.2.8",
|
"ember-cli-mirage": "0.2.8",
|
||||||
"ember-cli-mocha": "0.14.4",
|
"ember-cli-mocha": "0.14.4",
|
||||||
"ember-cli-moment-shim": "3.4.0",
|
"ember-cli-moment-shim": "3.5.0",
|
||||||
"ember-cli-node-assets": "0.2.2",
|
"ember-cli-node-assets": "0.2.2",
|
||||||
"ember-cli-postcss": "3.5.2",
|
"ember-cli-postcss": "3.5.2",
|
||||||
"ember-cli-pretender": "1.0.1",
|
"ember-cli-pretender": "1.0.1",
|
||||||
"ember-cli-selectize": "0.5.12",
|
"ember-cli-selectize": "0.5.12",
|
||||||
"ember-cli-shims": "1.1.0",
|
"ember-cli-shims": "1.1.0",
|
||||||
"ember-cli-string-helpers": "1.4.0",
|
"ember-cli-string-helpers": "1.5.0",
|
||||||
"ember-cli-test-loader": "2.2.0",
|
"ember-cli-test-loader": "2.2.0",
|
||||||
"ember-cli-uglify": "1.2.0",
|
"ember-cli-uglify": "2.0.0",
|
||||||
"ember-composable-helpers": "2.0.3",
|
"ember-composable-helpers": "2.0.3",
|
||||||
"ember-concurrency": "0.8.10",
|
"ember-concurrency": "0.8.10",
|
||||||
"ember-data": "2.15.0",
|
"ember-data": "2.16.2",
|
||||||
"ember-data-filter": "1.13.0",
|
"ember-data-filter": "1.13.0",
|
||||||
"ember-element-resize-detector": "0.1.5",
|
"ember-element-resize-detector": "0.1.5",
|
||||||
"ember-export-application-global": "2.0.0",
|
"ember-export-application-global": "2.0.0",
|
||||||
"ember-fetch": "3.3.1",
|
"ember-fetch": "3.4.0",
|
||||||
"ember-in-viewport": "2.1.1",
|
"ember-in-viewport": "2.1.1",
|
||||||
"ember-infinity": "0.2.8",
|
"ember-infinity": "0.2.8",
|
||||||
"ember-inline-svg": "0.1.11",
|
"ember-inline-svg": "0.1.11",
|
||||||
|
@ -82,14 +82,14 @@
|
||||||
"ember-native-dom-helpers": "0.5.4",
|
"ember-native-dom-helpers": "0.5.4",
|
||||||
"ember-one-way-controls": "2.0.1",
|
"ember-one-way-controls": "2.0.1",
|
||||||
"ember-power-datepicker": "0.4.0",
|
"ember-power-datepicker": "0.4.0",
|
||||||
"ember-power-select": "1.9.5",
|
"ember-power-select": "1.9.9",
|
||||||
"ember-resolver": "4.5.0",
|
"ember-resolver": "4.5.0",
|
||||||
"ember-responsive": "2.0.4",
|
"ember-responsive": "2.0.5",
|
||||||
"ember-route-action-helper": "2.0.6",
|
"ember-route-action-helper": "2.0.6",
|
||||||
"ember-simple-auth": "1.4.0",
|
"ember-simple-auth": "1.4.0",
|
||||||
"ember-sinon": "1.0.0",
|
"ember-sinon": "1.0.1",
|
||||||
"ember-sortable": "1.9.1",
|
"ember-sortable": "1.9.1",
|
||||||
"ember-source": "2.15.0",
|
"ember-source": "2.16.0",
|
||||||
"ember-test-selectors": "0.3.7",
|
"ember-test-selectors": "0.3.7",
|
||||||
"ember-truth-helpers": "1.3.0",
|
"ember-truth-helpers": "1.3.0",
|
||||||
"ember-wormhole": "0.5.2",
|
"ember-wormhole": "0.5.2",
|
||||||
|
@ -97,24 +97,24 @@
|
||||||
"eslint-plugin-ember": "4.5.0",
|
"eslint-plugin-ember": "4.5.0",
|
||||||
"eslint-plugin-ember-suave": "1.0.0",
|
"eslint-plugin-ember-suave": "1.0.0",
|
||||||
"eslint-plugin-sort-imports-es6-autofix": "https://github.com/kevinansfield/eslint-plugin-sort-imports-es6-autofix.git#node-4-compat",
|
"eslint-plugin-sort-imports-es6-autofix": "https://github.com/kevinansfield/eslint-plugin-sort-imports-es6-autofix.git#node-4-compat",
|
||||||
"fs-extra": "4.0.1",
|
"fs-extra": "4.0.2",
|
||||||
"glob": "7.1.2",
|
"glob": "7.1.2",
|
||||||
"grunt": "1.0.1",
|
"grunt": "1.0.1",
|
||||||
"grunt-shell": "2.1.0",
|
"grunt-shell": "2.1.0",
|
||||||
"jquery-deparam": "0.5.3",
|
"jquery-deparam": "0.5.3",
|
||||||
"liquid-fire": "0.28.0",
|
"liquid-fire": "0.28.0",
|
||||||
"liquid-tether": "2.0.4",
|
"liquid-tether": "2.0.5",
|
||||||
"liquid-wormhole": "2.0.7",
|
"liquid-wormhole": "2.1.0",
|
||||||
"loader.js": "4.6.0",
|
"loader.js": "4.6.0",
|
||||||
"markdown-it": "8.4.0",
|
"markdown-it": "8.4.0",
|
||||||
"markdown-it-footnote": "3.0.1",
|
"markdown-it-footnote": "3.0.1",
|
||||||
"markdown-it-lazy-headers": "0.1.3",
|
"markdown-it-lazy-headers": "0.1.3",
|
||||||
"markdown-it-mark": "2.0.0",
|
"markdown-it-mark": "2.0.0",
|
||||||
"matchdep": "2.0.0",
|
"matchdep": "2.0.0",
|
||||||
"password-generator": "2.1.0",
|
"password-generator": "2.2.0",
|
||||||
"postcss-color-function": "4.0.0",
|
"postcss-color-function": "4.0.0",
|
||||||
"postcss-custom-properties": "6.1.0",
|
"postcss-custom-properties": "6.2.0",
|
||||||
"postcss-easy-import": "2.1.0",
|
"postcss-easy-import": "3.0.0",
|
||||||
"simplemde": "https://github.com/kevinansfield/simplemde-markdown-editor.git#ghost",
|
"simplemde": "https://github.com/kevinansfield/simplemde-markdown-editor.git#ghost",
|
||||||
"testem": "1.18.4",
|
"testem": "1.18.4",
|
||||||
"top-gh-contribs": "2.0.4",
|
"top-gh-contribs": "2.0.4",
|
||||||
|
|
|
@ -13,7 +13,7 @@ module.exports = {
|
||||||
'Firefox'
|
'Firefox'
|
||||||
],
|
],
|
||||||
browser_args: {
|
browser_args: {
|
||||||
chrome: {
|
Chrome: {
|
||||||
mode: 'ci',
|
mode: 'ci',
|
||||||
args: [
|
args: [
|
||||||
'--disable-gpu',
|
'--disable-gpu',
|
||||||
|
|
Loading…
Reference in New Issue