diff --git a/package.json b/package.json index d998a894d8..10b47ac861 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "regenerator-runtime": "^0.13.3", "script-loader": "^0.7.2", "shebang-loader": "^0.0.1", - "simplebar": "^6.0.0-beta.3", + "simplebar": "^5.2.1", "sortablejs": "^1.9.0", "sorttable": "^1.0.2", "source-sans-pro": "^3.6.0", diff --git a/static/js/portico/help.js b/static/js/portico/help.js index fbdeb2d3d4..35cd6f761c 100644 --- a/static/js/portico/help.js +++ b/static/js/portico/help.js @@ -1,4 +1,4 @@ -import SimpleBar from "simplebar"; +import SimpleBar from "simplebar/dist/simplebar"; import * as google_analytics from "./google-analytics"; import {activate_correct_tab} from "./tabbed-instructions"; diff --git a/static/js/ui.js b/static/js/ui.js index 4e0db00d07..a20d80981f 100644 --- a/static/js/ui.js +++ b/static/js/ui.js @@ -1,6 +1,6 @@ "use strict"; -const {default: SimpleBar} = require("simplebar"); +const SimpleBar = require("simplebar/dist/simplebar"); // What, if anything, obscures the home tab? diff --git a/tools/webpack.assets.json b/tools/webpack.assets.json index 09d8c84090..7312afe306 100644 --- a/tools/webpack.assets.json +++ b/tools/webpack.assets.json @@ -49,7 +49,7 @@ "help": [ "./static/js/bundles/portico", "simplebar/dist/simplebar.css", - "simplebar", + "simplebar/dist/simplebar", "./static/js/portico/help", "./static/js/portico/tabbed-instructions" ], diff --git a/version.py b/version.py index 1d4bb217c5..cede0f2799 100644 --- a/version.py +++ b/version.py @@ -44,4 +44,4 @@ API_FEATURE_LEVEL = 33 # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = '107.2' +PROVISION_VERSION = '108.0' diff --git a/yarn.lock b/yarn.lock index 274a8dcecd..e440657bd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -882,7 +882,7 @@ pirates "^4.0.0" source-map-support "^0.5.16" -"@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.8.4": +"@babel/runtime@^7.10.1", "@babel/runtime@^7.8.4": version "7.11.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736" integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw== @@ -3283,7 +3283,7 @@ core-js@^2.4.0, core-js@^2.5.7: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== -core-js@^3.0.1, core-js@^3.6.5: +core-js@^3.0.1: version "3.6.5" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== @@ -7342,11 +7342,6 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lodash-es@^4.17.15: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78" - integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ== - lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -7357,6 +7352,11 @@ lodash.clonedeep@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= + lodash.flatmap@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz#ef8cbf408f6e48268663345305c6acc0b778702e" @@ -10255,6 +10255,11 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= +resize-observer-polyfill@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" + integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== + resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -10745,23 +10750,17 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" -simplebar-core@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/simplebar-core/-/simplebar-core-1.0.2.tgz#5f23abd96d7b80078de267d81ddbd517116c074b" - integrity sha512-01BSmdUphVatUB78rjDMZzkfawW7iYX1+zJmKJRsGzj5BnOmBgKC6zYrUbg3DdR0j3wPwdKjbUfcanV+kQwrcg== +simplebar@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/simplebar/-/simplebar-5.2.1.tgz#b373841d10df1827562481306a51dae9062734d6" + integrity sha512-nfOsptB/tb1kzSOaDIJFcrm8EXj5J0pZBPLGetJR8SE6v+97cbedtlNH/L81okgjsFlF11kDndmZ0mscaGAILw== dependencies: can-use-dom "^0.1.0" - lodash-es "^4.17.15" - -simplebar@^6.0.0-beta.3: - version "6.0.0-beta.4" - resolved "https://registry.yarnpkg.com/simplebar/-/simplebar-6.0.0-beta.4.tgz#17266a8cba42ca7873a91deec82c26ea5abc6ed4" - integrity sha512-M+D6GSWh1pBOiXut9oRTvLBj8wPn+KCM04Pf80hcHBtXj3O2Rl2ruTCzj8yruWi4JlduzAzTeDvxgijYQWDJGg== - dependencies: - "@babel/runtime" "^7.10.2" - can-use-dom "^0.1.0" - core-js "^3.6.5" - simplebar-core "^1.0.2" + core-js "^3.0.1" + lodash.debounce "^4.0.8" + lodash.memoize "^4.1.2" + lodash.throttle "^4.1.1" + resize-observer-polyfill "^1.5.1" simplicial-complex-boundary@^1.0.0: version "1.0.1"