Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid O'Regan <doregan@gitlab.com>2021-01-27 18:03:52 +0300
committerDavid O'Regan <doregan@gitlab.com>2021-01-27 18:03:52 +0300
commit642faf496b25d4550f10cd21c3c7794e135d793b (patch)
tree426ef7397e0eaf119076ee66b82f75ead2f89421
parentba60133b5b8afa470245761ed10970245f31dc99 (diff)
parentbffb9fafc0846cd1528fbddf655f653d10b1db3d (diff)
Merge branch 'hotfix-node-resolve' into 'master'
fix(search): downgrade node resolve to stop algoliasearch breaking See merge request gitlab-org/gitlab-docs!1456
-rw-r--r--package.json2
-rw-r--r--yarn.lock12
2 files changed, 7 insertions, 7 deletions
diff --git a/package.json b/package.json
index 3e7f556f..e8a6f040 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"@babel/preset-env": "^7.12.11",
"@gitlab/eslint-plugin": "^7.0.0",
"@rollup/plugin-json": "^4.1.0",
- "@rollup/plugin-node-resolve": "^11.1.0",
+ "@rollup/plugin-node-resolve": "^10.0.0",
"@rollup/plugin-replace": "^2.3.4",
"@vue/test-utils": "^1.1.2",
"babel-core": "^7.0.0-bridge.0",
diff --git a/yarn.lock b/yarn.lock
index 86667a57..6e15235b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1214,17 +1214,17 @@
dependencies:
"@rollup/pluginutils" "^3.0.8"
-"@rollup/plugin-node-resolve@^11.1.0":
- version "11.1.0"
- resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.1.0.tgz#fa0f888297b3aebcd6534e8aba4e6fe01997649a"
- integrity sha512-ouBBppRdWJKCllDXGzJ7ZIkYbaq+5TmyP0smt1vdJCFfoZhLi31vhpmjLhyo8lreHf4RoeSNllaWrvSqHpHRog==
+"@rollup/plugin-node-resolve@^10.0.0":
+ version "10.0.0"
+ resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-10.0.0.tgz#44064a2b98df7530e66acf8941ff262fc9b4ead8"
+ integrity sha512-sNijGta8fqzwA1VwUEtTvWCx2E7qC70NMsDh4ZG13byAXYigBNZMxALhKUSycBks5gupJdq0lFrKumFrRZ8H3A==
dependencies:
"@rollup/pluginutils" "^3.1.0"
"@types/resolve" "1.17.1"
builtin-modules "^3.1.0"
deepmerge "^4.2.2"
is-module "^1.0.0"
- resolve "^1.19.0"
+ resolve "^1.17.0"
"@rollup/plugin-replace@^2.3.4":
version "2.3.4"
@@ -5566,7 +5566,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.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1:
version "1.19.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==