Revert "web: replace deprecated dependencies"

This reverts commit 95db54b819.

web/package-lock.json

@@ -23,8 +23,6 @@
                 "@polymer/iron-form": "^3.0.1",
                 "@polymer/paper-input": "^3.2.1",
                 "@rollup/plugin-babel": "^5.3.0",
-                "@rollup/plugin-commonjs": "^20.0.0",
-                "@rollup/plugin-node-resolve": "^13.0.4",
                 "@rollup/plugin-replace": "^3.0.0",
                 "@rollup/plugin-typescript": "^8.2.5",
                 "@sentry/browser": "^6.12.0",
@@ -52,9 +50,11 @@
                 "prettier": "^2.3.2",
                 "rapidoc": "^9.0.0",
                 "rollup": "^2.56.2",
+                "rollup-plugin-commonjs": "^10.1.0",
                 "rollup-plugin-copy": "^3.4.0",
                 "rollup-plugin-cssimport": "^1.0.2",
                 "rollup-plugin-minify-html-literals": "^1.2.6",
+                "rollup-plugin-node-resolve": "^5.2.0",
                 "rollup-plugin-sourcemaps": "^0.6.3",
                 "rollup-plugin-terser": "^7.0.2",
                 "ts-lit-plugin": "^1.2.1",
@@ -2230,58 +2230,6 @@
                 }
             }
         },
-        "node_modules/@rollup/plugin-commonjs": {
-            "version": "20.0.0",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-20.0.0.tgz",
-            "integrity": "sha512-5K0g5W2Ol8hAcTHqcTBHiA7M58tfmYi1o9KxeJuuRNpGaTa5iLjcyemBitCBcKXaHamOBBEH2dGom6v6Unmqjg==",
-            "dependencies": {
-                "@rollup/pluginutils": "^3.1.0",
-                "commondir": "^1.0.1",
-                "estree-walker": "^2.0.1",
-                "glob": "^7.1.6",
-                "is-reference": "^1.2.1",
-                "magic-string": "^0.25.7",
-                "resolve": "^1.17.0"
-            },
-            "engines": {
-                "node": ">= 8.0.0"
-            },
-            "peerDependencies": {
-                "rollup": "^2.38.3"
-            }
-        },
-        "node_modules/@rollup/plugin-commonjs/node_modules/estree-walker": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-        },
-        "node_modules/@rollup/plugin-node-resolve": {
-            "version": "13.0.4",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.4.tgz",
-            "integrity": "sha512-eYq4TFy40O8hjeDs+sIxEH/jc9lyuI2k9DM557WN6rO5OpnC2qXMBNj4IKH1oHrnAazL49C5p0tgP0/VpqJ+/w==",
-            "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"
-            },
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "peerDependencies": {
-                "rollup": "^2.42.0"
-            }
-        },
-        "node_modules/@rollup/plugin-node-resolve/node_modules/@types/resolve": {
-            "version": "1.17.1",
-            "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
-            "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
         "node_modules/@rollup/plugin-replace": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-3.0.0.tgz",
@@ -2563,6 +2511,14 @@
             "resolved": "https://registry.npmjs.org/@types/relateurl/-/relateurl-0.2.29.tgz",
             "integrity": "sha512-QSvevZ+IRww2ldtfv1QskYsqVVVwCKQf1XbwtcyyoRvLIQzfyPhj/C+3+PKzSDRdiyejaiLgnq//XTkleorpLg=="
         },
+        "node_modules/@types/resolve": {
+            "version": "0.0.8",
+            "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
+            "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
         "node_modules/@types/tern": {
             "version": "0.23.4",
             "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.4.tgz",
@@ -3548,11 +3504,6 @@
                 "node": ">= 6"
             }
         },
-        "node_modules/commondir": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-            "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
-        },
         "node_modules/component-emitter": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -3721,14 +3672,6 @@
             "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
             "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
         },
-        "node_modules/deepmerge": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-            "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/defaults": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
@@ -6969,6 +6912,27 @@
                 "fsevents": "~2.3.2"
             }
         },
+        "node_modules/rollup-plugin-commonjs": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz",
+            "integrity": "sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==",
+            "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-commonjs.",
+            "dependencies": {
+                "estree-walker": "^0.6.1",
+                "is-reference": "^1.1.2",
+                "magic-string": "^0.25.2",
+                "resolve": "^1.11.0",
+                "rollup-pluginutils": "^2.8.1"
+            },
+            "peerDependencies": {
+                "rollup": ">=1.12.0"
+            }
+        },
+        "node_modules/rollup-plugin-commonjs/node_modules/estree-walker": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+            "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="
+        },
         "node_modules/rollup-plugin-copy": {
             "version": "3.4.0",
             "resolved": "https://registry.npmjs.org/rollup-plugin-copy/-/rollup-plugin-copy-3.4.0.tgz",
@@ -7076,6 +7040,22 @@
                 "rollup": "^0.65.2 || ^1.0.0 || ^2.0.0"
             }
         },
+        "node_modules/rollup-plugin-node-resolve": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz",
+            "integrity": "sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==",
+            "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-node-resolve.",
+            "dependencies": {
+                "@types/resolve": "0.0.8",
+                "builtin-modules": "^3.1.0",
+                "is-module": "^1.0.0",
+                "resolve": "^1.11.1",
+                "rollup-pluginutils": "^2.8.1"
+            },
+            "peerDependencies": {
+                "rollup": ">=1.11.0"
+            }
+        },
         "node_modules/rollup-plugin-sourcemaps": {
             "version": "0.6.3",
             "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz",
@@ -10013,50 +9993,6 @@
                 "@rollup/pluginutils": "^3.1.0"
             }
         },
-        "@rollup/plugin-commonjs": {
-            "version": "20.0.0",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-20.0.0.tgz",
-            "integrity": "sha512-5K0g5W2Ol8hAcTHqcTBHiA7M58tfmYi1o9KxeJuuRNpGaTa5iLjcyemBitCBcKXaHamOBBEH2dGom6v6Unmqjg==",
-            "requires": {
-                "@rollup/pluginutils": "^3.1.0",
-                "commondir": "^1.0.1",
-                "estree-walker": "^2.0.1",
-                "glob": "^7.1.6",
-                "is-reference": "^1.2.1",
-                "magic-string": "^0.25.7",
-                "resolve": "^1.17.0"
-            },
-            "dependencies": {
-                "estree-walker": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-                    "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-                }
-            }
-        },
-        "@rollup/plugin-node-resolve": {
-            "version": "13.0.4",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.4.tgz",
-            "integrity": "sha512-eYq4TFy40O8hjeDs+sIxEH/jc9lyuI2k9DM557WN6rO5OpnC2qXMBNj4IKH1oHrnAazL49C5p0tgP0/VpqJ+/w==",
-            "requires": {
-                "@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"
-            },
-            "dependencies": {
-                "@types/resolve": {
-                    "version": "1.17.1",
-                    "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
-                    "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
-                    "requires": {
-                        "@types/node": "*"
-                    }
-                }
-            }
-        },
         "@rollup/plugin-replace": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-3.0.0.tgz",
@@ -10311,6 +10247,14 @@
             "resolved": "https://registry.npmjs.org/@types/relateurl/-/relateurl-0.2.29.tgz",
             "integrity": "sha512-QSvevZ+IRww2ldtfv1QskYsqVVVwCKQf1XbwtcyyoRvLIQzfyPhj/C+3+PKzSDRdiyejaiLgnq//XTkleorpLg=="
         },
+        "@types/resolve": {
+            "version": "0.0.8",
+            "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
+            "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
+            "requires": {
+                "@types/node": "*"
+            }
+        },
         "@types/tern": {
             "version": "0.23.4",
             "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.4.tgz",
@@ -10994,11 +10938,6 @@
             "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
             "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="
         },
-        "commondir": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-            "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
-        },
         "component-emitter": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -11121,11 +11060,6 @@
             "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
             "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
         },
-        "deepmerge": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-            "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
-        },
         "defaults": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
@@ -13540,6 +13474,25 @@
                 "fsevents": "~2.3.2"
             }
         },
+        "rollup-plugin-commonjs": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz",
+            "integrity": "sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==",
+            "requires": {
+                "estree-walker": "^0.6.1",
+                "is-reference": "^1.1.2",
+                "magic-string": "^0.25.2",
+                "resolve": "^1.11.0",
+                "rollup-pluginutils": "^2.8.1"
+            },
+            "dependencies": {
+                "estree-walker": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+                    "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="
+                }
+            }
+        },
         "rollup-plugin-copy": {
             "version": "3.4.0",
             "resolved": "https://registry.npmjs.org/rollup-plugin-copy/-/rollup-plugin-copy-3.4.0.tgz",
@@ -13630,6 +13583,18 @@
                 "rollup-pluginutils": "^2.8.2"
             }
         },
+        "rollup-plugin-node-resolve": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz",
+            "integrity": "sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==",
+            "requires": {
+                "@types/resolve": "0.0.8",
+                "builtin-modules": "^3.1.0",
+                "is-module": "^1.0.0",
+                "resolve": "^1.11.1",
+                "rollup-pluginutils": "^2.8.1"
+            }
+        },
         "rollup-plugin-sourcemaps": {
             "version": "0.6.3",
             "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz",

web/package.json

@@ -54,8 +54,6 @@
         "@polymer/iron-form": "^3.0.1",
         "@polymer/paper-input": "^3.2.1",
         "@rollup/plugin-babel": "^5.3.0",
-        "@rollup/plugin-commonjs": "^20.0.0",
-        "@rollup/plugin-node-resolve": "^13.0.4",
         "@rollup/plugin-replace": "^3.0.0",
         "@rollup/plugin-typescript": "^8.2.5",
         "@sentry/browser": "^6.12.0",
@@ -83,9 +81,11 @@
         "prettier": "^2.3.2",
         "rapidoc": "^9.0.0",
         "rollup": "^2.56.2",
+        "rollup-plugin-commonjs": "^10.1.0",
         "rollup-plugin-copy": "^3.4.0",
         "rollup-plugin-cssimport": "^1.0.2",
         "rollup-plugin-minify-html-literals": "^1.2.6",
+        "rollup-plugin-node-resolve": "^5.2.0",
         "rollup-plugin-sourcemaps": "^0.6.3",
         "rollup-plugin-terser": "^7.0.2",
         "ts-lit-plugin": "^1.2.1",

web/rollup.config.js

@@ -1,12 +1,11 @@
-import resolve from "@rollup/plugin-replace";
+import resolve from "rollup-plugin-node-resolve";
-import commonjs from "@rollup/plugin-commonjs";
+import commonjs from "rollup-plugin-commonjs";
-import babel from "@rollup/plugin-babel";
-import replace from "@rollup/plugin-replace";
-
 import { terser } from "rollup-plugin-terser";
 import sourcemaps from "rollup-plugin-sourcemaps";
 import cssimport from "rollup-plugin-cssimport";
 import copy from "rollup-plugin-copy";
+import babel from "@rollup/plugin-babel";
+import replace from "@rollup/plugin-replace";
 
 const extensions = [".js", ".jsx", ".ts", ".tsx"];