diff options
| author | Evan Read <eread@gitlab.com> | 2022-05-17 01:35:55 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2022-05-17 01:35:55 +0300 |
| commit | a2e49a7469d10d682651a36aba278535da2be27a (patch) | |
| tree | 944cc3dc9ea64e7c5b81ccf72c97e83b47ece2fb | |
| parent | 4ac3778b7c5f2162700c73a674c0ff878f908a46 (diff) | |
| parent | a9911925ac453578432b12b8344a49cf948ca0d0 (diff) | |
Merge branch 'update-rollup-commonjs' into 'main'fneill-add-devops-reports-to-global-nav
Update rollup/plugin-commonjs
See merge request gitlab-org/gitlab-docs!2656
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | rollup.config.js | 4 | ||||
| -rw-r--r-- | yarn.lock | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/package.json b/package.json index 705840b9..512da935 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@gitlab/eslint-plugin": "^12.2.0", "@gitlab/stylelint-config": "^4.0.0", "@rollup/plugin-babel": "^5.3.1", - "@rollup/plugin-commonjs": "21.1.0", + "@rollup/plugin-commonjs": "^22.0.0", "@rollup/plugin-inject": "^4.0.4", "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^13.3.0", diff --git a/rollup.config.js b/rollup.config.js index 29efc1b0..43c0942e 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -22,7 +22,9 @@ module.exports = glob.sync('content/frontend/**/*.js').map((file) => ({ }, plugins: [ nodeResolve({ browser: true, preferBuiltins: false }), - commonjs(), + commonjs({ + requireReturnsDefault: 'preferred', + }), vue(), svg(), inject({ @@ -1378,10 +1378,10 @@ "@babel/helper-module-imports" "^7.10.4" "@rollup/pluginutils" "^3.1.0" -"@rollup/plugin-commonjs@21.1.0": - version "21.1.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-21.1.0.tgz#45576d7b47609af2db87f55a6d4b46e44fc3a553" - integrity sha512-6ZtHx3VHIp2ReNNDxHjuUml6ur+WcQ28N1yHgCQwsbNkQg2suhxGMDQGJOn/KuDxKtd1xuZP5xSTwBA4GQ8hbA== +"@rollup/plugin-commonjs@^22.0.0": + version "22.0.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.0.tgz#f4d87016e2fbf187a593ab9f46626fe05b59e8bd" + integrity sha512-Ktvf2j+bAO+30awhbYoCaXpBcyPmJbaEUYClQns/+6SNCYFURbvBiNbWgHITEsIgDDWCDUclWRKEuf8cwZCFoQ== dependencies: "@rollup/pluginutils" "^3.1.0" commondir "^1.0.1" |