mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-26 04:13:30 +03:00
Bumped dependencies (#1108)
Bumped all non-ember-core dependencies that do not require significant work or that contain unresolvable inter-dependencies. Skipped: - `ember-drag-drop` - our usage needs re-working for closure actions - `ember-infinity`, `ember-in-viewport` - one depends on the other and `ember-light-table` depends on a particular version of `ember-in-viewport` in a way that breaks if they are upgraded Removed/bumped: - removed ember-cli-es6-transform - removed ember-cli-cjs-transform - removed current-device - removed ember-responsive - bumped yarn.lock sub-dependencies - bumped @ember/jquery - bumped @tryghost/mobiledoc-kit - bumped autoprefixer - bumped broccoli-funnel - bumped coveralls - bumped ember-auto-import - bumped ember-moment - bumped ember-power-select - bumped ember-simple-auth - bumped broccoli-uglify-sourcemap - bumped ember-cli-eslint and eslint-plugin-ghost with fixes for new rules - bumped ember-cli-mirage - bumped ember-cli-pretender - bumped ember-power-calendar-moment - bumped ember-power-datepicker - bumped ember-composable-helpers - bumped ember-concurrency - bumped ember-load - bumped eslint - bumped walk-sync - bumped ember-useragent - bumped fs-extra - bumped ember-resolver - bumped @html-next/vertical-collection - bumped ember-cli-babel
This commit is contained in:
parent
4fbfd73af6
commit
c4d16d5d67
@ -7,7 +7,7 @@ export default Helper.extend({
|
|||||||
settings: service(),
|
settings: service(),
|
||||||
|
|
||||||
compute([timeago], {draft, scheduled, published}) {
|
compute([timeago], {draft, scheduled, published}) {
|
||||||
assert(timeago, 'You must pass a time to the gh-format-post-time helper');
|
assert('You must pass a time to the gh-format-post-time helper', timeago);
|
||||||
|
|
||||||
if (draft) {
|
if (draft) {
|
||||||
// No special handling for drafts, just use moment.from
|
// No special handling for drafts, just use moment.from
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import Mixin from '@ember/object/mixin';
|
import Mixin from '@ember/object/mixin';
|
||||||
import device from 'current-device';
|
|
||||||
import {computed} from '@ember/object';
|
import {computed} from '@ember/object';
|
||||||
|
import {inject as service} from '@ember/service';
|
||||||
|
|
||||||
const keyCodes = {
|
const keyCodes = {
|
||||||
13: 'Enter',
|
13: 'Enter',
|
||||||
@ -8,6 +8,8 @@ const keyCodes = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export default Mixin.create({
|
export default Mixin.create({
|
||||||
|
userAgent: service(),
|
||||||
|
|
||||||
attributeBindings: ['autofocus'],
|
attributeBindings: ['autofocus'],
|
||||||
|
|
||||||
selectOnClick: false,
|
selectOnClick: false,
|
||||||
@ -16,7 +18,7 @@ export default Mixin.create({
|
|||||||
|
|
||||||
autofocus: computed(function () {
|
autofocus: computed(function () {
|
||||||
if (this.get('shouldFocus')) {
|
if (this.get('shouldFocus')) {
|
||||||
return (device.ios()) ? false : 'autofocus';
|
return (this.userAgent.os.isIOS) ? false : 'autofocus';
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@ -73,7 +75,7 @@ export default Mixin.create({
|
|||||||
_focus() {
|
_focus() {
|
||||||
// Until mobile safari has better support
|
// Until mobile safari has better support
|
||||||
// for focusing, we just ignore it
|
// for focusing, we just ignore it
|
||||||
if (this.get('shouldFocus') && !device.ios()) {
|
if (this.get('shouldFocus') && !this.userAgent.os.isIOS) {
|
||||||
this.element.focus();
|
this.element.focus();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -29,17 +29,17 @@ Router.map(function () {
|
|||||||
this.route('signout');
|
this.route('signout');
|
||||||
this.route('signup', {path: '/signup/:token'});
|
this.route('signup', {path: '/signup/:token'});
|
||||||
this.route('reset', {path: '/reset/:token'});
|
this.route('reset', {path: '/reset/:token'});
|
||||||
this.route('about', {path: '/about'});
|
this.route('about');
|
||||||
|
|
||||||
this.route('posts', {path: '/'}, function () {});
|
this.route('posts', {path: '/'}, function () {});
|
||||||
this.route('pages', {path: '/pages'}, function () {});
|
this.route('pages', function () {});
|
||||||
|
|
||||||
this.route('editor', function () {
|
this.route('editor', function () {
|
||||||
this.route('new', {path: ':type'});
|
this.route('new', {path: ':type'});
|
||||||
this.route('edit', {path: ':type/:post_id'});
|
this.route('edit', {path: ':type/:post_id'});
|
||||||
});
|
});
|
||||||
|
|
||||||
this.route('staff', {path: '/staff'}, function () {
|
this.route('staff', function () {
|
||||||
this.route('user', {path: ':user_slug'});
|
this.route('user', {path: ':user_slug'});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
6
ghost/admin/app/services/media.js
Normal file
6
ghost/admin/app/services/media.js
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
import Service from '@ember/service';
|
||||||
|
|
||||||
|
// dummy service to account for not having the ember-responsive dependency
|
||||||
|
// available for ember-light-table (we don't use it so no need for the dep)
|
||||||
|
// see https://github.com/offirgolan/ember-light-table/issues/576
|
||||||
|
export default Service.extend({});
|
@ -222,11 +222,7 @@ module.exports = function (defaults) {
|
|||||||
app.import('node_modules/keymaster/keymaster.js');
|
app.import('node_modules/keymaster/keymaster.js');
|
||||||
app.import('node_modules/@tryghost/mobiledoc-kit/dist/amd/mobiledoc-kit.js');
|
app.import('node_modules/@tryghost/mobiledoc-kit/dist/amd/mobiledoc-kit.js');
|
||||||
app.import('node_modules/@tryghost/mobiledoc-kit/dist/amd/mobiledoc-kit.map');
|
app.import('node_modules/@tryghost/mobiledoc-kit/dist/amd/mobiledoc-kit.map');
|
||||||
app.import('node_modules/reframe.js/dist/noframe.es.js', {
|
app.import('node_modules/reframe.js/dist/noframe.js');
|
||||||
using: [
|
|
||||||
{transformation: 'es6', as: 'noframe.js'}
|
|
||||||
]
|
|
||||||
});
|
|
||||||
|
|
||||||
// pull things we rely on via lazy-loading into the test-support.js file so
|
// pull things we rely on via lazy-loading into the test-support.js file so
|
||||||
// that tests don't break when running via http://localhost:4200/tests
|
// that tests don't break when running via http://localhost:4200/tests
|
||||||
|
@ -37,15 +37,15 @@ module.exports = {
|
|||||||
fs.ensureDirSync(assetsOut);
|
fs.ensureDirSync(assetsOut);
|
||||||
|
|
||||||
if (fs.existsSync(results.directory + '/index.min.html')) {
|
if (fs.existsSync(results.directory + '/index.min.html')) {
|
||||||
fs.copySync(results.directory + '/index.min.html', `${templateOutDir}/default-prod.html`, {overwrite: true});
|
fs.copySync(results.directory + '/index.min.html', `${templateOutDir}/default-prod.html`, {overwrite: true, dereference: true});
|
||||||
} else {
|
} else {
|
||||||
fs.copySync(results.directory + '/index.html', `${templateOutDir}/default.html`, {overwrite: true});
|
fs.copySync(results.directory + '/index.html', `${templateOutDir}/default.html`, {overwrite: true, dereference: true});
|
||||||
}
|
}
|
||||||
|
|
||||||
assets.forEach(function (relativePath) {
|
assets.forEach(function (relativePath) {
|
||||||
if (relativePath.slice(-1) === '/') { return; }
|
if (relativePath.slice(-1) === '/') { return; }
|
||||||
|
|
||||||
fs.copySync(assetsIn + '/' + relativePath, assetsOut + '/' + relativePath, {overwrite: true});
|
fs.copySync(assetsIn + '/' + relativePath, assetsOut + '/' + relativePath, {overwrite: true, dereference: true});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
/* global noframe */
|
||||||
import Component from '@ember/component';
|
import Component from '@ember/component';
|
||||||
import countWords, {stripTags} from '../utils/count-words';
|
import countWords, {stripTags} from '../utils/count-words';
|
||||||
import layout from '../templates/components/koenig-card-embed';
|
import layout from '../templates/components/koenig-card-embed';
|
||||||
import noframe from 'noframe.js';
|
|
||||||
import {NO_CURSOR_MOVEMENT} from './koenig-editor';
|
import {NO_CURSOR_MOVEMENT} from './koenig-editor';
|
||||||
import {computed} from '@ember/object';
|
import {computed} from '@ember/object';
|
||||||
import {isBlank} from '@ember/utils';
|
import {isBlank} from '@ember/utils';
|
||||||
|
@ -26,51 +26,48 @@
|
|||||||
"node": ">= 6"
|
"node": ">= 6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@ember/jquery": "0.5.2",
|
"@ember/jquery": "0.6.0",
|
||||||
"@ember/optional-features": "0.7.0",
|
"@ember/optional-features": "0.7.0",
|
||||||
"@html-next/vertical-collection": "1.0.0-beta.12",
|
"@html-next/vertical-collection": "1.0.0-beta.13",
|
||||||
"@tryghost/mobiledoc-kit": "0.11.1-ghost.6",
|
"@tryghost/mobiledoc-kit": "0.11.1-ghost.7",
|
||||||
"@tryghost/timezone-data": "0.1.1",
|
"@tryghost/timezone-data": "0.1.1",
|
||||||
"autoprefixer": "9.4.8",
|
"autoprefixer": "9.4.10",
|
||||||
"blueimp-md5": "2.10.0",
|
"blueimp-md5": "2.10.0",
|
||||||
"broccoli-asset-rev": "3.0.0",
|
"broccoli-asset-rev": "3.0.0",
|
||||||
"broccoli-concat": "3.7.3",
|
"broccoli-concat": "3.7.3",
|
||||||
"broccoli-funnel": "2.0.1",
|
"broccoli-funnel": "2.0.2",
|
||||||
"broccoli-merge-trees": "3.0.2",
|
"broccoli-merge-trees": "3.0.2",
|
||||||
"broccoli-uglify-sourcemap": "2.2.0",
|
"broccoli-uglify-sourcemap": "3.0.0",
|
||||||
"chai-dom": "1.8.1",
|
"chai-dom": "1.8.1",
|
||||||
"codemirror": "5.42.2",
|
"codemirror": "5.42.2",
|
||||||
"coveralls": "3.0.2",
|
"coveralls": "3.0.3",
|
||||||
"csscomb": "4.2.0",
|
"csscomb": "4.2.0",
|
||||||
"cssnano": "4.1.10",
|
"cssnano": "4.1.10",
|
||||||
"current-device": "0.7.8",
|
|
||||||
"element-resize-detector": "^1.1.14",
|
"element-resize-detector": "^1.1.14",
|
||||||
"ember-ajax": "4.0.2",
|
"ember-ajax": "4.0.2",
|
||||||
"ember-assign-helper": "0.2.0",
|
"ember-assign-helper": "0.2.0",
|
||||||
"ember-auto-import": "1.2.19",
|
"ember-auto-import": "1.2.21",
|
||||||
"ember-cli": "3.4.1",
|
"ember-cli": "3.4.1",
|
||||||
"ember-cli-app-version": "3.2.0",
|
"ember-cli-app-version": "3.2.0",
|
||||||
"ember-cli-babel": "6.18.0",
|
"ember-cli-babel": "7.5.0",
|
||||||
"ember-cli-chai": "0.5.0",
|
"ember-cli-chai": "0.5.0",
|
||||||
"ember-cli-cjs-transform": "1.3.0",
|
|
||||||
"ember-cli-code-coverage": "0.4.2",
|
"ember-cli-code-coverage": "0.4.2",
|
||||||
"ember-cli-dependency-checker": "3.1.0",
|
"ember-cli-dependency-checker": "3.1.0",
|
||||||
"ember-cli-es6-transform": "0.0.5",
|
"ember-cli-eslint": "5.1.0",
|
||||||
"ember-cli-eslint": "4.2.3",
|
|
||||||
"ember-cli-htmlbars": "3.0.1",
|
"ember-cli-htmlbars": "3.0.1",
|
||||||
"ember-cli-htmlbars-inline-precompile": "2.1.0",
|
"ember-cli-htmlbars-inline-precompile": "2.1.0",
|
||||||
"ember-cli-inject-live-reload": "2.0.1",
|
"ember-cli-inject-live-reload": "2.0.1",
|
||||||
"ember-cli-mirage": "0.4.12",
|
"ember-cli-mirage": "0.4.15",
|
||||||
"ember-cli-moment-shim": "3.7.1",
|
"ember-cli-moment-shim": "3.7.1",
|
||||||
"ember-cli-node-assets": "0.2.2",
|
"ember-cli-node-assets": "0.2.2",
|
||||||
"ember-cli-postcss": "4.2.0",
|
"ember-cli-postcss": "4.2.0",
|
||||||
"ember-cli-pretender": "3.0.0",
|
"ember-cli-pretender": "3.1.1",
|
||||||
"ember-cli-shims": "1.2.0",
|
"ember-cli-shims": "1.2.0",
|
||||||
"ember-cli-string-helpers": "2.0.0",
|
"ember-cli-string-helpers": "2.0.0",
|
||||||
"ember-cli-test-loader": "2.2.0",
|
"ember-cli-test-loader": "2.2.0",
|
||||||
"ember-cli-uglify": "2.1.0",
|
"ember-cli-uglify": "2.1.0",
|
||||||
"ember-composable-helpers": "2.1.0",
|
"ember-composable-helpers": "2.2.0",
|
||||||
"ember-concurrency": "0.8.26",
|
"ember-concurrency": "0.8.27",
|
||||||
"ember-data": "3.4.0",
|
"ember-data": "3.4.0",
|
||||||
"ember-drag-drop": "0.4.8",
|
"ember-drag-drop": "0.4.8",
|
||||||
"ember-export-application-global": "2.0.0",
|
"ember-export-application-global": "2.0.0",
|
||||||
@ -78,29 +75,28 @@
|
|||||||
"ember-in-viewport": "~3.0.3",
|
"ember-in-viewport": "~3.0.3",
|
||||||
"ember-infinity": "1.2.6",
|
"ember-infinity": "1.2.6",
|
||||||
"ember-light-table": "1.13.2",
|
"ember-light-table": "1.13.2",
|
||||||
"ember-load": "0.0.16",
|
"ember-load": "0.0.17",
|
||||||
"ember-load-initializers": "2.0.0",
|
"ember-load-initializers": "2.0.0",
|
||||||
"ember-mocha": "0.14.0",
|
"ember-mocha": "0.14.0",
|
||||||
"ember-moment": "7.8.0",
|
"ember-moment": "7.8.1",
|
||||||
"ember-one-way-select": "4.0.0",
|
"ember-one-way-select": "4.0.0",
|
||||||
"ember-power-calendar-moment": "0.1.3",
|
"ember-power-calendar-moment": "0.1.4",
|
||||||
"ember-power-datepicker": "https://github.com/cibernox/ember-power-datepicker/tarball/cd4dffa8852236a3312f6dc7040719c0e9196bc0",
|
"ember-power-datepicker": "0.5.3",
|
||||||
"ember-power-select": "2.2.1",
|
"ember-power-select": "2.2.2",
|
||||||
"ember-resolver": "5.0.1",
|
"ember-resolver": "5.1.3",
|
||||||
"ember-responsive": "2.0.5",
|
|
||||||
"ember-route-action-helper": "2.0.6",
|
"ember-route-action-helper": "2.0.6",
|
||||||
"ember-simple-auth": "1.8.0",
|
"ember-simple-auth": "1.8.1",
|
||||||
"ember-sinon": "3.1.0",
|
"ember-sinon": "3.1.0",
|
||||||
"ember-source": "3.5.1",
|
"ember-source": "3.5.1",
|
||||||
"ember-sticky-element": "0.2.3",
|
"ember-sticky-element": "0.2.3",
|
||||||
"ember-svg-jar": "1.2.2",
|
"ember-svg-jar": "1.2.2",
|
||||||
"ember-test-selectors": "2.0.0",
|
"ember-test-selectors": "2.0.0",
|
||||||
"ember-truth-helpers": "2.1.0",
|
"ember-truth-helpers": "2.1.0",
|
||||||
"ember-useragent": "0.8.0",
|
"ember-useragent": "0.9.0",
|
||||||
"emberx-file-input": "1.2.1",
|
"emberx-file-input": "1.2.1",
|
||||||
"eslint": "4.19.1",
|
"eslint": "5.15.1",
|
||||||
"eslint-plugin-ghost": "0.1.0",
|
"eslint-plugin-ghost": "0.2.0",
|
||||||
"fs-extra": "4.0.3",
|
"fs-extra": "7.0.1",
|
||||||
"glob": "7.1.3",
|
"glob": "7.1.3",
|
||||||
"google-caja-bower": "https://github.com/acburdine/google-caja-bower#ghost",
|
"google-caja-bower": "https://github.com/acburdine/google-caja-bower#ghost",
|
||||||
"grunt": "1.0.3",
|
"grunt": "1.0.3",
|
||||||
@ -126,7 +122,7 @@
|
|||||||
"testem": "2.14.0",
|
"testem": "2.14.0",
|
||||||
"top-gh-contribs": "2.0.4",
|
"top-gh-contribs": "2.0.4",
|
||||||
"validator": "7.2.0",
|
"validator": "7.2.0",
|
||||||
"walk-sync": "1.0.1"
|
"walk-sync": "1.1.3"
|
||||||
},
|
},
|
||||||
"ember-addon": {
|
"ember-addon": {
|
||||||
"paths": [
|
"paths": [
|
||||||
|
@ -3,5 +3,8 @@ module.exports = {
|
|||||||
env: {
|
env: {
|
||||||
'embertest': true,
|
'embertest': true,
|
||||||
'mocha': true
|
'mocha': true
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
'ghost/ember/no-invalid-debug-function-arguments': 'off'
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user