This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 2d22a216772a645142b7e5d8a950a8f7e88a9ca8
Author: Zoran Regvart <zregv...@apache.org>
AuthorDate: Fri Jan 4 12:14:45 2019 +0100
CAMEL-11500: more fixes for PnP
---
antora-ui-camel/gulpfile.js/tasks/build.js | 3 +-
antora-ui-camel/package.json | 7 +-
antora-ui-camel/yarn.lock | 104 ++++++++++++++---------------
3 files changed, 58 insertions(+), 56 deletions(-)
diff --git a/antora-ui-camel/gulpfile.js/tasks/build.js
b/antora-ui-camel/gulpfile.js/tasks/build.js
index a2997e9..0126d50 100644
--- a/antora-ui-camel/gulpfile.js/tasks/build.js
+++ b/antora-ui-camel/gulpfile.js/tasks/build.js
@@ -16,6 +16,7 @@ const postcssCalc = require('postcss-calc')
const postcssImport = require('postcss-import')
const postcssUrl = require('postcss-url')
const postcssVar = require('postcss-custom-properties')
+const resolve = require('resolve')
const uglify = require('gulp-uglify')
const vfs = require('vinyl-fs')
@@ -28,7 +29,7 @@ module.exports = (src, dest, preview) => () => {
filter: '**/~typeface-*/files/*',
url: (asset) => {
const relpath = asset.pathname.substr(1)
- const abspath = ospath.resolve('node_modules', relpath)
+ const abspath = resolve.sync(relpath)
const basename = ospath.basename(abspath)
const destpath = ospath.join(dest, 'font', basename)
if (!fs.pathExistsSync(destpath)) fs.copySync(abspath, destpath)
diff --git a/antora-ui-camel/package.json b/antora-ui-camel/package.json
index 91f2e5d..e784905 100644
--- a/antora-ui-camel/package.json
+++ b/antora-ui-camel/package.json
@@ -36,6 +36,7 @@
"js-yaml": "~3.12",
"merge-stream": "~1.0",
"plugin-error": "^1.0.1",
+ "postcss": "~7.0",
"postcss-calc": "~7.0",
"postcss-custom-properties": "~8.0",
"postcss-import": "~12.0",
@@ -43,16 +44,20 @@
"prettier-eslint": "~8.8",
"require-directory": "~2.1",
"require-from-string": "~2.0",
+ "resolve": "~1.9",
"stylelint": "~9.9",
"stylelint-config-standard": "~18.2",
"through2": "~3.0",
"typeface-droid-sans-mono": "^0.0.44",
"typeface-droid-serif": "^0.0.44",
"typeface-open-sans": "^0.0.54",
- "undertaker": "^1.2.0",
+ "undertaker": "~1.2",
"vinyl-buffer": "~1.0",
"vinyl-fs": "~3.0"
},
+ "resolutions": {
+ "resolve": "~1.9"
+ },
"installConfig": {
"pnp": true
}
diff --git a/antora-ui-camel/yarn.lock b/antora-ui-camel/yarn.lock
index ed49246..11d0c1d 100644
--- a/antora-ui-camel/yarn.lock
+++ b/antora-ui-camel/yarn.lock
@@ -206,9 +206,9 @@ acorn@^5.5.0:
integrity
sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
acorn@^6.0.2:
- version "6.0.4"
- resolved
"https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754";
- integrity
sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==
+ version "6.0.5"
+ resolved
"https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a";
+ integrity
sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==
ajv-keywords@^2.1.0:
version "2.1.1"
@@ -524,15 +524,15 @@ atob@^2.1.1:
integrity
sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
autoprefixer@^9.0.0, autoprefixer@~9.4:
- version "9.4.3"
- resolved
"https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.3.tgz#c97384a8fd80477b78049163a91bbc725d9c41d9";
- integrity
sha512-/XSnzDepRkAU//xLcXA/lUWxpsBuw0WiriAHOqnxkuCtzLhaz+fL4it4gp20BQ8n5SyLzK/FOc7A0+u/rti2FQ==
+ version "9.4.4"
+ resolved
"https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.4.tgz#40c42b335bdb22efe8cd80389ca82ffb5e32d68d";
+ integrity
sha512-7tpjBadJyHKf+gOJEmKhZIksWxdZCSrnKbbTJNsw+/zX9+f//DLELRQPWjjjVoDbbWlCuNRkN7RfmZwDVgWMLw==
dependencies:
- browserslist "^4.3.6"
- caniuse-lite "^1.0.30000921"
+ browserslist "^4.3.7"
+ caniuse-lite "^1.0.30000926"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
- postcss "^7.0.6"
+ postcss "^7.0.7"
postcss-value-parser "^3.3.1"
babel-code-frame@^6.22.0:
@@ -847,14 +847,14 @@ browserify@~16.2:
vm-browserify "^1.0.0"
xtend "^4.0.0"
-browserslist@^4.0.0, browserslist@^4.3.6:
- version "4.3.6"
- resolved
"https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.6.tgz#0f9d9081afc66b36f477c6bdf3813f784f42396a";
- integrity
sha512-kMGKs4BTzRWviZ8yru18xBpx+CyHG9eqgRbj9XbE3IMgtczf4aiA0Y1YCpVdvUieKGZ03kolSPXqTcscBCb9qw==
+browserslist@^4.0.0, browserslist@^4.3.7:
+ version "4.3.7"
+ resolved
"https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.7.tgz#f1de479a6466ea47a0a26dcc725e7504817e624a";
+ integrity
sha512-pWQv51Ynb0MNk9JGMCZ8VkM785/4MQNXiFYtPqI7EEP0TJO+/d/NqRVn1uiAN0DNbnlUSpL2sh16Kspasv3pUQ==
dependencies:
- caniuse-lite "^1.0.30000921"
- electron-to-chromium "^1.3.92"
- node-releases "^1.1.1"
+ caniuse-lite "^1.0.30000925"
+ electron-to-chromium "^1.3.96"
+ node-releases "^1.1.3"
buffer-alloc-unsafe@^1.1.0:
version "1.1.0"
@@ -1037,10 +1037,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000921:
- version "1.0.30000925"
- resolved
"https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000925.tgz#f1a3b9aae2a83071b1eccfa39959d72440409b08";
- integrity
sha512-zcYupoUxtW46rOikuDF7vfL9N1Qe9ZuUBTz3n3q8fFsoJIs/h9UN6Vg/0QpjsmvImXw9mVc3g+ZBfqvUz/iALA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000925, caniuse-lite@^1.0.30000926:
+ version "1.0.30000926"
+ resolved
"https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000926.tgz#4361a99d818ca6e521dbe89a732de62a194a789c";
+ integrity
sha512-diMkEvxfFw09SkbErCLmw/1Fx1ZZe9xfWm4aeA2PUffB48x1tfZeMsK5j4BW7zN7Y4PdqmPVVdG2eYjE5IRTag==
caw@^2.0.0, caw@^2.0.1:
version "2.0.1"
@@ -1827,7 +1827,7 @@ default-resolution@^2.0.0:
resolved
"https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684";
integrity sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=
-define-properties@^1.1.2:
+define-properties@^1.1.2, define-properties@^1.1.3:
version "1.1.3"
resolved
"https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1";
integrity
sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -2070,7 +2070,7 @@ ee-first@1.1.1:
resolved
"https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d";
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-electron-to-chromium@^1.3.92:
+electron-to-chromium@^1.3.96:
version "1.3.96"
resolved
"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.96.tgz#25770ec99b8b07706dedf3a5f43fa50cb54c4f9a";
integrity
sha512-ZUXBUyGLeoJxp4Nt6G/GjBRLnyz8IKQGexZ2ndWaoegThgMGFO1tdDYID5gBV32/1S83osjJHyfzvanE/8HY4Q==
@@ -2120,18 +2120,19 @@ error@^7.0.0:
string-template "~0.2.1"
xtend "~4.0.0"
-es-abstract@^1.5.1, es-abstract@^1.6.1:
- version "1.12.0"
- resolved
"https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165";
- integrity
sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==
+es-abstract@^1.12.0, es-abstract@^1.5.1:
+ version "1.13.0"
+ resolved
"https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9";
+ integrity
sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
dependencies:
- es-to-primitive "^1.1.1"
+ es-to-primitive "^1.2.0"
function-bind "^1.1.1"
- has "^1.0.1"
- is-callable "^1.1.3"
+ has "^1.0.3"
+ is-callable "^1.1.4"
is-regex "^1.0.4"
+ object-keys "^1.0.12"
-es-to-primitive@^1.1.1:
+es-to-primitive@^1.2.0:
version "1.2.0"
resolved
"https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377";
integrity
sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
@@ -2878,7 +2879,7 @@ fsevents@^1.2.2:
nan "^2.9.2"
node-pre-gyp "^0.10.0"
-function-bind@^1.1.0, function-bind@^1.1.1:
+function-bind@^1.1.1:
version "1.1.1"
resolved
"https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d";
integrity
sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
@@ -3015,7 +3016,7 @@ glob-watcher@^5.0.0:
just-debounce "^1.0.0"
object.defaults "^1.1.0"
-glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2:
+glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
version "7.1.3"
resolved
"https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1";
integrity
sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -3365,7 +3366,7 @@ has-values@^1.0.0:
is-number "^3.0.0"
kind-of "^4.0.0"
-has@^1.0.0, has@^1.0.1:
+has@^1.0.0, has@^1.0.1, has@^1.0.3:
version "1.0.3"
resolved
"https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796";
integrity
sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
@@ -3793,7 +3794,7 @@ is-builtin-module@^1.0.0:
dependencies:
builtin-modules "^1.0.0"
-is-callable@^1.1.3, is-callable@^1.1.4:
+is-callable@^1.1.4:
version "1.1.4"
resolved
"https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75";
integrity
sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
@@ -4834,7 +4835,7 @@ node-pre-gyp@^0.10.0:
semver "^5.3.0"
tar "^4"
-node-releases@^1.1.1:
+node-releases@^1.1.3:
version "1.1.3"
resolved
"https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.3.tgz#aad9ce0dcb98129c753f772c0aa01360fb90fbd2";
integrity
sha512-6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ==
@@ -5030,14 +5031,14 @@ object.reduce@^1.0.0:
make-iterator "^1.0.0"
object.values@^1.0.4:
- version "1.0.4"
- resolved
"https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a";
- integrity sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=
+ version "1.1.0"
+ resolved
"https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9";
+ integrity
sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==
dependencies:
- define-properties "^1.1.2"
- es-abstract "^1.6.1"
- function-bind "^1.1.0"
- has "^1.0.1"
+ define-properties "^1.1.3"
+ es-abstract "^1.12.0"
+ function-bind "^1.1.1"
+ has "^1.0.3"
on-finished@~2.3.0:
version "2.3.0"
@@ -5862,7 +5863,7 @@ postcss-values-parser@^2.0.0:
indexes-of "^1.0.1"
uniq "^1.0.1"
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.3,
postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.3,
postcss@^7.0.5, postcss@^7.0.7, postcss@~7.0:
version "7.0.7"
resolved
"https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614";
integrity
sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==
@@ -6404,12 +6405,7 @@ resolve-url@^0.2.1:
resolved
"https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a";
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-resolve@1.1.7:
- version "1.1.7"
- resolved
"https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b";
- integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
-
-resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2,
resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1:
+resolve@1.1.7, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2,
resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1, resolve@~1.9:
version "1.9.0"
resolved
"https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06";
integrity
sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==
@@ -6447,11 +6443,11 @@ rgba-regex@^1.0.0:
integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
rimraf@^2.5.4, rimraf@^2.6.1, rimraf@~2.6.2:
- version "2.6.2"
- resolved
"https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36";
- integrity
sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
+ version "2.6.3"
+ resolved
"https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab";
+ integrity
sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
dependencies:
- glob "^7.0.5"
+ glob "^7.1.3"
ripemd160@^2.0.0, ripemd160@^2.0.1:
version "2.0.2"
@@ -7538,7 +7534,7 @@ undertaker-registry@^1.0.0:
resolved
"https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50";
integrity sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=
-undertaker@^1.0.0, undertaker@^1.2.0:
+undertaker@^1.0.0, undertaker@~1.2:
version "1.2.0"
resolved
"https://registry.yarnpkg.com/undertaker/-/undertaker-1.2.0.tgz#339da4646252d082dc378e708067299750e11b49";
integrity sha1-M52kZGJS0ILcN45wgGcpl1DhG0k=
