From 072042efaa5c952b356d0a446d6ee8757cde32c8 Mon Sep 17 00:00:00 2001
From: Florian Schade <fschade@datario.de>
Date: Wed, 25 Nov 2020 10:33:14 +0100
Subject: [PATCH] make rollup externals accept globs

---
 tests/k6/README.md        | 10 +++++-----
 tests/k6/package.json     |  1 +
 tests/k6/rollup.config.js |  7 ++++++-
 tests/k6/yarn.lock        | 13 +++++++++++++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/tests/k6/README.md b/tests/k6/README.md
index de9400c1af..d454736982 100644
--- a/tests/k6/README.md
+++ b/tests/k6/README.md
@@ -1,15 +1,15 @@
 ## Requirements
-- [K6](https://k6.io/)
-- [YARN](https://yarnpkg.com/)
-- [OCIS](https://github.com/owncloud/ocis)
+*  [K6](https://k6.io/)
+*  [YARN](https://yarnpkg.com/)
+*  [OCIS](https://github.com/owncloud/ocis)
 
 ## How to build
-```
+```console
 $ yarn
 $ yarn build
 ```
 
 ## How to run
-```
+```console
 k6 run ./dist/TESTNAME.js
 ```
\ No newline at end of file
diff --git a/tests/k6/package.json b/tests/k6/package.json
index 82bd70aca0..d2ff6c66a0 100644
--- a/tests/k6/package.json
+++ b/tests/k6/package.json
@@ -18,6 +18,7 @@
     "@rollup/plugin-commonjs": "^11.1.0",
     "@rollup/plugin-json": "^4.0.3",
     "@rollup/plugin-node-resolve": "^7.1.3",
+    "@rollup/pluginutils": "^4.1.0",
     "@types/faker": "^5.1.4",
     "@types/jest": "^25.2.1",
     "@types/k6": "^0.28.2",
diff --git a/tests/k6/rollup.config.js b/tests/k6/rollup.config.js
index a1d3de345d..3f78f0a1dc 100644
--- a/tests/k6/rollup.config.js
+++ b/tests/k6/rollup.config.js
@@ -5,13 +5,18 @@ import babel from 'rollup-plugin-babel'
 import { terser } from 'rollup-plugin-terser'
 import multiInput from 'rollup-plugin-multi-input';
 import path from 'path';
+import utils from '@rollup/pluginutils';
+import pkg from './package.json';
 
 const extensions = ['.js', '.ts'];
 
 export default [
   {
     input: ['src/test-*.ts'],
-    external: id => ['k6'].some(m => id.includes(m)),
+    external: utils.createFilter([
+      'k6/**',
+      ...Object.keys(pkg.devDependencies),
+    ], null, { resolve: false }),
     output: [
       {
         dir: 'dist',
diff --git a/tests/k6/yarn.lock b/tests/k6/yarn.lock
index 5cfc2311e8..a58223d9f4 100644
--- a/tests/k6/yarn.lock
+++ b/tests/k6/yarn.lock
@@ -1267,6 +1267,14 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
+"@rollup/pluginutils@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.1.0.tgz#0dcc61c780e39257554feb7f77207dceca13c838"
+  integrity sha512-TrBhfJkFxA+ER+ew2U2/fHbebhLT/l/2pRk0hfj9KusXUuRXd2v0R58AfaZK9VXDQ4TogOSEmICVrQAA3zFnHQ==
+  dependencies:
+    estree-walker "^2.0.1"
+    picomatch "^2.2.2"
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
@@ -2619,6 +2627,11 @@ estree-walker@^1.0.1:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
+estree-walker@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.1.tgz#f8e030fb21cefa183b44b7ad516b747434e7a3e0"
+  integrity sha512-tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg==
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"