Merge branch 'master' into v3

2025-02-24 23:48:13 -05:00 · 2019-10-14 11:08:10 +01:00 · 2019-10-14 11:08:10 +01:00 · 56786f370c
commit 56786f370c
parent 4743d372d9 0f1d6d7786
3 changed files with 83 additions and 47 deletions
--- a/ghost/admin/lib/koenig-editor/package.json
+++ b/ghost/admin/lib/koenig-editor/package.json
@ -16,6 +16,6 @@
    "@tryghost/kg-parser-plugins": "*",
    "ember-auto-import": "^1.2.21",
    "ember-cli-babel": "^7.5.0",
-    "ember-cli-htmlbars": "^3.0.1"
+    "ember-cli-htmlbars": "^4.0.5"
  }
 }
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@ -29,12 +29,12 @@
    "@ember/optional-features": "1.0.0",
    "@ember/render-modifiers": "1.0.2",
    "@html-next/vertical-collection": "1.0.0",
-    "@tryghost/helpers": "1.1.12",
+    "@tryghost/helpers": "1.1.15",
    "@tryghost/kg-clean-basic-html": "0.1.3",
    "@tryghost/kg-parser-plugins": "0.8.0",
    "@tryghost/mobiledoc-kit": "0.11.2-ghost.4",
    "@tryghost/string": "0.1.5",
-    "@tryghost/timezone-data": "0.2.11",
+    "@tryghost/timezone-data": "0.2.12",
    "autoprefixer": "9.6.4",
    "blueimp-md5": "2.12.0",
    "broccoli-asset-rev": "3.0.0",
@ -49,7 +49,7 @@
    "element-resize-detector": "1.1.15",
    "ember-ajax": "5.0.0",
    "ember-assign-helper": "0.2.0",
-    "ember-auto-import": "1.5.2",
+    "ember-auto-import": "1.5.3",
    "ember-cli": "3.12.0",
    "ember-cli-app-version": "3.2.0",
    "ember-cli-babel": "7.12.0",
@ -59,8 +59,7 @@
    "ember-cli-deprecation-workflow": "1.0.1",
    "ember-cli-eslint": "5.1.0",
    "ember-cli-htmlbars": "4.0.5",
-    "ember-cli-htmlbars-inline-precompile": "3.0.1",
-    "ember-cli-inject-live-reload": "2.0.1",
+    "ember-cli-inject-live-reload": "2.0.2",
    "ember-cli-mirage": "1.1.3",
    "ember-cli-moment-shim": "3.7.1",
    "ember-cli-node-assets": "0.2.2",
@ -71,7 +70,7 @@
    "ember-cli-test-loader": "2.2.0",
    "ember-cli-uglify": "3.0.0",
    "ember-composable-helpers": "2.3.1",
-    "ember-concurrency": "1.1.0",
+    "ember-concurrency": "1.1.1",
    "ember-data": "3.12.4",
    "ember-drag-drop": "0.4.8",
    "ember-exam": "4.0.4",
@ -81,7 +80,7 @@
    "ember-infinity": "1.4.9",
    "ember-load": "0.0.17",
    "ember-load-initializers": "2.1.0",
-    "ember-mocha": "0.16.0",
+    "ember-mocha": "0.16.1",
    "ember-moment": "8.0.0",
    "ember-one-way-select": "4.0.0",
    "ember-power-calendar-moment": "0.1.7",
--- a/ghost/admin/yarn.lock
+++ b/ghost/admin/yarn.lock
@ -860,7 +860,7 @@
    ember-cli-babel "^7.10.0"
    ember-modifier-manager-polyfill "^1.1.0"

-"@ember/test-helpers@^1.5.0":
+"@ember/test-helpers@^1.6.1":
  version "1.6.1"
  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-1.6.1.tgz#5eb0b58486524c54f1b617a83e4ab327b7c62f07"
  integrity sha512-gXLXR0XdZKfyXHFP+QLpG55TlrDtvrZI6TMQVQxdZwsz589kN8idmc01rDjyy53jx430tZTEsdhJvC2LrHXPwg==
@ -1021,10 +1021,10 @@
  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==

-"@tryghost/helpers@1.1.12":
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/@tryghost/helpers/-/helpers-1.1.12.tgz#ca77aa2649abd2d12760b36af2d6779619202971"
-  integrity sha512-9ns/YTXfUb+UOmILQq071qZ8Y6eIEvNQFLZtFiguhOzXqSHC+rKg45aNCcoP8G9opG7vmm7bkxeE/hiQ205qpw==
+"@tryghost/helpers@1.1.15":
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/@tryghost/helpers/-/helpers-1.1.15.tgz#8a8e53af47630707aeb328fc949ce37464f7d447"
+  integrity sha512-llve/Ha+uUnqrqP4TlGIXf+W5nDRv6XsiqLWoUFARtciP42kMQLQY+ABC4Fmc0N1daD1P020jTjd7eX+9fdVFw==
  dependencies:
    lodash-es "^4.17.11"

@ -1055,10 +1055,10 @@
  dependencies:
    unidecode "^0.1.8"

-"@tryghost/timezone-data@0.2.11":
-  version "0.2.11"
-  resolved "https://registry.yarnpkg.com/@tryghost/timezone-data/-/timezone-data-0.2.11.tgz#01fd0858b31103a75ad45827a086c814815c3020"
-  integrity sha512-7LG9/0/vNKPQ7d+B9okoqkFP900se2yPGs8CFlqO9S167h+/3gdDB1g0A/gXdv9DsEGu0XKrsr5U2nYFCpIUaA==
+"@tryghost/timezone-data@0.2.12":
+  version "0.2.12"
+  resolved "https://registry.yarnpkg.com/@tryghost/timezone-data/-/timezone-data-0.2.12.tgz#94fa84ede77cf045a3ade7fe816b5d0d5be4654e"
+  integrity sha512-ZCvxvyEdN6IYU3Hpi9desu/iEN7wq5ke6mdR+YBIjAXxJui3llGX/vW2R/CFn4nc+G9eIIc64LlQnpcJyA3T+g==

 "@types/acorn@^4.0.3":
  version "4.0.5"
@ -1899,11 +1899,6 @@ babel-plugin-htmlbars-inline-precompile@^1.0.0:
  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-1.0.0.tgz#a9d2f6eaad8a3f3d361602de593a8cbef8179c22"
  integrity sha512-4jvKEHR1bAX03hBDZ94IXsYCj3bwk9vYsn6ux6JZNL2U5pvzCWjqyrGahfsGNrhERyxw8IqcirOi9Q6WCo3dkQ==

-babel-plugin-htmlbars-inline-precompile@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-2.1.1.tgz#59edd4eab28d27fbafa26d51bc19795278d103a9"
-  integrity sha512-obo5//IFrEZNAQovcXxOXLn5nwkQ0Y+xhR7AMg1sYR6W7KxQLZI9/XzbIytVhjwwY+Bd2e0+qyHEplJbHyZ1Og==
-
 babel-plugin-htmlbars-inline-precompile@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.0.0.tgz#95aa0d2379347cda9a7127c028fe35cb39179fa2"
@ -4576,7 +4571,41 @@ ember-assign-polyfill@^2.5.0, ember-assign-polyfill@^2.6.0:
    ember-cli-babel "^6.16.0"
    ember-cli-version-checker "^2.0.0"

-ember-auto-import@1.5.2, ember-auto-import@^1.2.15, ember-auto-import@^1.2.19:
+ember-auto-import@1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.5.3.tgz#b32936f874d1ed7057ad2ed3f6116357820be44b"
+  integrity sha512-7JfdunM1BmLy/lyUXu7uEoi0Gi4+dxkGM23FgIEyW5g7z4MidhP53Fc61t49oPSnq7+J4lLpbH1f6C+mDMgb4A==
+  dependencies:
+    "@babel/core" "^7.1.6"
+    "@babel/preset-env" "^7.0.0"
+    "@babel/traverse" "^7.1.6"
+    "@babel/types" "^7.1.6"
+    "@embroider/core" "^0.4.3"
+    babel-core "^6.26.3"
+    babel-loader "^8.0.6"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babel-template "^6.26.0"
+    babylon "^6.18.0"
+    broccoli-debug "^0.6.4"
+    broccoli-plugin "^1.3.0"
+    debug "^3.1.0"
+    ember-cli-babel "^6.6.0"
+    enhanced-resolve "^4.0.0"
+    fs-extra "^6.0.1"
+    fs-tree-diff "^1.0.0"
+    handlebars "^4.3.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.10"
+    mkdirp "^0.5.1"
+    pkg-up "^2.0.0"
+    resolve "^1.7.1"
+    rimraf "^2.6.2"
+    symlink-or-copy "^1.2.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^0.3.3"
+    webpack "~4.28"
+
+ember-auto-import@^1.2.15, ember-auto-import@^1.2.19:
  version "1.5.2"
  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.5.2.tgz#e97ed96b600caa6090ffed83e4611c3e7ec9bad7"
  integrity sha512-skVQpfdc6G5OVRsyemDn3vI1nj/iBBgnoqRLRka0ZbDT2GqelmyJ86bp+Bd/ztJe45Le3we+LXbR7T54RU5A9w==
@ -4789,18 +4818,6 @@ ember-cli-get-component-path-option@^1.0.0:
  resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
  integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=

-ember-cli-htmlbars-inline-precompile@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-3.0.1.tgz#dc1f6fbc3bb5e51d01ca334e692c7f0b5e298d57"
-  integrity sha512-mLGJjxEPiOFty9HVM7LHg+5cfM1M9lwbEBmlanZMM333cnwvgZulKjTYU0/e0tpWDvNvPdX8rM+/Leh0TIrqqA==
-  dependencies:
-    babel-plugin-htmlbars-inline-precompile "^2.1.0"
-    ember-cli-version-checker "^3.1.3"
-    hash-for-dep "^1.5.1"
-    heimdalljs-logger "^0.1.9"
-    semver "^6.3.0"
-    silent-error "^1.1.0"
-
 ember-cli-htmlbars-inline-precompile@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-2.1.0.tgz#61b91ff1879d44ae504cadb46fb1f2604995ae08"
@ -4858,13 +4875,13 @@ ember-cli-import-polyfill@^0.2.0:
  resolved "https://registry.yarnpkg.com/ember-cli-import-polyfill/-/ember-cli-import-polyfill-0.2.0.tgz#c1a08a8affb45c97b675926272fe78cf4ca166f2"
  integrity sha1-waCKiv+0XJe2dZJicv54z0yhZvI=

-ember-cli-inject-live-reload@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.0.1.tgz#1bf3a6ea1747bceddc9f62f7ca8575de6b53ddaf"
-  integrity sha512-vrW/3KSrku+Prqmp7ZkpCxYkabnLrTHDEvV9B1yphTP++dhiV7n7Dv9NrmyubkoF3Inm0xrbbhB5mScvvuTQSg==
+ember-cli-inject-live-reload@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.0.2.tgz#95edb543b386239d35959e5ea9579f5382976ac7"
+  integrity sha512-HDD6o/kBHT/kUtazklU0OW23q2jigIN42QmcpFdXUSvJ2/2SYA6yIqSUxWfJgISmtn5gTNZ2KPq1p3dLkhJxSQ==
  dependencies:
    clean-base-url "^1.0.0"
-    ember-cli-version-checker "^2.1.2"
+    ember-cli-version-checker "^3.1.3"

 ember-cli-is-package-missing@^1.0.0:
  version "1.0.0"
@ -5166,7 +5183,16 @@ ember-composable-helpers@2.3.1:
    ember-cli-babel "^7.1.0"
    resolve "^1.10.0"

-ember-concurrency@1.1.0, "ember-concurrency@^0.8.27 || ^0.9.0 || ^0.10.0 || ^1.0.0":
+ember-concurrency@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-1.1.1.tgz#5fd16431169f204b5829e295d521f4768078549b"
+  integrity sha512-+NLofyiTxssFo9n2IZxJBHCV0Aec6qlD0EJ0KEco3KMoMMLrRdAjrjWLAi3qXqz3lkXnLPeSEp3mFJ5KW+QVbw==
+  dependencies:
+    ember-cli-babel "^7.7.3"
+    ember-compatibility-helpers "^1.2.0"
+    ember-maybe-import-regenerator "^0.1.6"
+
+"ember-concurrency@^0.8.27 || ^0.9.0 || ^0.10.0 || ^1.0.0":
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-1.1.0.tgz#955f6961937c655ecc6ee4c3213e1191dc227ba3"
  integrity sha512-izwePurc0CMGSvyuZeEyjFrTVBTBQV2k7eYP/b+jYCdh5+J+ajSnx8UYIJ38E7lCukDzeTjDBrQjJxLCNzvDFg==
@ -5358,16 +5384,16 @@ ember-maybe-in-element@^0.2.0:
  dependencies:
    ember-cli-babel "^7.1.0"

-ember-mocha@0.16.0:
-  version "0.16.0"
-  resolved "https://registry.yarnpkg.com/ember-mocha/-/ember-mocha-0.16.0.tgz#0a8499f59e626a5af5ca47e3f1d19c2bd5cc7393"
-  integrity sha512-iYWrCOHdPQNwFsD1UNKa6RnA629wgN4zql9730hfiV0Ib4I4VwDueldGwWjXEF+3jGM/R993z6DPvYQKbNfTdg==
+ember-mocha@0.16.1:
+  version "0.16.1"
+  resolved "https://registry.yarnpkg.com/ember-mocha/-/ember-mocha-0.16.1.tgz#76fc8968e4c71d1992908047bad08b873fbbd578"
+  integrity sha512-TFxgn85ZjG5Oeez+4Muv853mFIDXCRZ0MHrVWvM9JwrnMPrQ+VbuvYdqu3AJx9TxyqDtq4Hn61g3E2q9oOH2cA==
  dependencies:
-    "@ember/test-helpers" "^1.5.0"
+    "@ember/test-helpers" "^1.6.1"
    broccoli-funnel "^2.0.2"
    broccoli-merge-trees "^3.0.2"
    common-tags "^1.8.0"
-    ember-cli-babel "^7.7.3"
+    ember-cli-babel "^7.11.1"
    ember-cli-test-loader "^2.2.0"
    mocha "^2.5.3"

@ -6968,6 +6994,17 @@ handlebars@^4.0.11, handlebars@^4.0.4:
  optionalDependencies:
    uglify-js "^3.1.4"

+handlebars@^4.3.1:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.4.3.tgz#180bae52c1d0e9ec0c15d7e82a4362d662762f6e"
+  integrity sha512-B0W4A2U1ww3q7VVthTKfh+epHx+q4mCt6iK+zEAzbMBpWQAwxCeKxEGpj/1oQTpzPXDNSOG7hmG14TsISH50yw==
+  dependencies:
+    neo-async "^2.6.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 handlebars@~4.1.2:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"