diff --git a/qt/aqt/data/web/js/vendor/BUILD.bazel b/qt/aqt/data/web/js/vendor/BUILD.bazel index fbdae540a..19e6e8c21 100644 --- a/qt/aqt/data/web/js/vendor/BUILD.bazel +++ b/qt/aqt/data/web/js/vendor/BUILD.bazel @@ -1,18 +1,15 @@ load( "//ts:vendor.bzl", + "copy_bootstrap_js", "copy_css_browser_selector", "copy_jquery", "copy_jquery_ui", - "copy_protobufjs", - "copy_bootstrap_js", ) copy_jquery(name = "jquery") copy_jquery_ui(name = "jquery-ui") -copy_protobufjs(name = "protobufjs") - copy_css_browser_selector(name = "css-browser-selector") copy_bootstrap_js(name = "bootstrap") @@ -20,7 +17,6 @@ copy_bootstrap_js(name = "bootstrap") files = [ "jquery", "jquery-ui", - "protobufjs", "css-browser-selector", "bootstrap", ] diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py index 174fa18b7..21764547d 100644 --- a/qt/aqt/editor.py +++ b/qt/aqt/editor.py @@ -137,7 +137,6 @@ class Editor: ], js=[ "js/vendor/jquery.min.js", - "js/vendor/protobuf.min.js", "js/editor.js", ], context=self, diff --git a/qt/aqt/reviewer.py b/qt/aqt/reviewer.py index d2804a9de..fa540c55b 100644 --- a/qt/aqt/reviewer.py +++ b/qt/aqt/reviewer.py @@ -293,7 +293,6 @@ class Reviewer: "js/mathjax.js", "js/vendor/mathjax/tex-chtml.js", "js/reviewer.js", - "js/vendor/protobuf.min.js", "js/reviewer_extras.js", ], context=self, diff --git a/ts/BUILD.bazel b/ts/BUILD.bazel index 5233fc3c5..3ca8c216b 100644 --- a/ts/BUILD.bazel +++ b/ts/BUILD.bazel @@ -29,7 +29,6 @@ exports_files([ ".eslintrc.js", "licenses.json", "sql_format.ts", - "protobuf-shim.js", "jest.config.js", "package.json", "protobuf-no-long.js", diff --git a/ts/change-notetype/BUILD.bazel b/ts/change-notetype/BUILD.bazel index 697ae9685..c116b3f80 100644 --- a/ts/change-notetype/BUILD.bazel +++ b/ts/change-notetype/BUILD.bazel @@ -61,20 +61,13 @@ ts_library( esbuild( name = "change-notetype", - srcs = [ - "//ts:protobuf-shim.js", - ], args = [ "--global-name=anki", - "--inject:$(location //ts:protobuf-shim.js)", "--resolve-extensions=.mjs,.js", "--log-level=warning", "--loader:.svg=text", ], entry_point = "index.ts", - external = [ - "protobufjs/light", - ], output_css = "change-notetype.css", visibility = ["//visibility:public"], deps = [ @@ -87,6 +80,7 @@ esbuild( "//ts/sveltelib", "//ts/components", "//ts/components:svelte_components", + "@npm//protobufjs", ] + svelte_names, ) diff --git a/ts/change-notetype/change-notetype.html b/ts/change-notetype/change-notetype.html index 244e1cf81..90e18ca94 100644 --- a/ts/change-notetype/change-notetype.html +++ b/ts/change-notetype/change-notetype.html @@ -5,7 +5,6 @@ - diff --git a/ts/congrats/BUILD.bazel b/ts/congrats/BUILD.bazel index 1148e3ae0..fb3ae63c4 100644 --- a/ts/congrats/BUILD.bazel +++ b/ts/congrats/BUILD.bazel @@ -43,19 +43,12 @@ ts_library( esbuild( name = "congrats", - srcs = [ - "//ts:protobuf-shim.js", - ], args = [ "--global-name=anki", - "--inject:$(location //ts:protobuf-shim.js)", "--resolve-extensions=.mjs,.js", "--log-level=warning", ], entry_point = "index.ts", - external = [ - "protobufjs/light", - ], output_css = "congrats.css", visibility = ["//visibility:public"], deps = [ @@ -64,6 +57,7 @@ esbuild( ":index", "//ts/lib", "//ts/lib:backend_proto", + "@npm//protobufjs", ], ) diff --git a/ts/congrats/congrats.html b/ts/congrats/congrats.html index 2226e657c..023c3f369 100644 --- a/ts/congrats/congrats.html +++ b/ts/congrats/congrats.html @@ -5,7 +5,6 @@ - diff --git a/ts/deck-options/BUILD.bazel b/ts/deck-options/BUILD.bazel index 6703cb8b5..401034e86 100644 --- a/ts/deck-options/BUILD.bazel +++ b/ts/deck-options/BUILD.bazel @@ -26,8 +26,8 @@ compile_svelte( name = "svelte", srcs = svelte_files, deps = [ - "//ts/sveltelib", "//ts/components", + "//ts/sveltelib", "@npm//@types/bootstrap", "@npm//@types/marked", ], @@ -48,8 +48,8 @@ ts_library( deps = [ "DeckOptionsPage", "lib", - "//ts/lib", "//ts/components", + "//ts/lib", "@npm//@popperjs", "@npm//svelte2tsx", ], @@ -66,10 +66,10 @@ ts_library( module_name = "deckoptions", deps = [ "//ts:image_module_support", + "//ts/components", "//ts/lib", "//ts/lib:backend_proto", "//ts/sveltelib", - "//ts/components", "@npm//lodash-es", "@npm//svelte", ], @@ -77,20 +77,13 @@ ts_library( esbuild( name = "deck-options", - srcs = [ - "//ts:protobuf-shim.js", - ], args = [ "--global-name=anki", - "--inject:$(location //ts:protobuf-shim.js)", "--resolve-extensions=.mjs,.js", "--log-level=warning", "--loader:.svg=text", ], entry_point = "index.ts", - external = [ - "protobufjs/light", - ], output_css = "deck-options.css", visibility = ["//visibility:public"], deps = [ @@ -99,6 +92,7 @@ esbuild( ":base_css", "@npm//bootstrap", "@npm//marked", + "@npm//protobufjs", "//ts/lib", "//ts/lib:backend_proto", "//ts/sveltelib", diff --git a/ts/deck-options/deck-options.html b/ts/deck-options/deck-options.html index ecbbb4def..0b7c3915e 100644 --- a/ts/deck-options/deck-options.html +++ b/ts/deck-options/deck-options.html @@ -5,7 +5,6 @@ - diff --git a/ts/editor/BUILD.bazel b/ts/editor/BUILD.bazel index d0f1aa91d..15946689b 100644 --- a/ts/editor/BUILD.bazel +++ b/ts/editor/BUILD.bazel @@ -114,7 +114,6 @@ copy_mdi_icons( "function-variant.svg", "contain.svg", "xml.svg", - "format-color-text.svg", "format-color-highlight.svg", "color-helper.svg", @@ -124,19 +123,12 @@ copy_mdi_icons( esbuild( name = "editor", - srcs = [ - "//ts:protobuf-shim.js", - ], args = [ "--loader:.svg=text", - "--inject:$(location //ts:protobuf-shim.js)", "--resolve-extensions=.mjs,.js", "--log-level=warning", ], entry_point = "index_wrapper.ts", - external = [ - "protobufjs/light", - ], output_css = "editor.css", visibility = ["//visibility:public"], deps = [ @@ -148,6 +140,7 @@ esbuild( "svelte_components", "//ts/components", "//ts/components:svelte_components", + "@npm//protobufjs", ], ) diff --git a/ts/graphs/BUILD.bazel b/ts/graphs/BUILD.bazel index 35210709f..a59f10784 100644 --- a/ts/graphs/BUILD.bazel +++ b/ts/graphs/BUILD.bazel @@ -57,19 +57,12 @@ ts_library( esbuild( name = "graphs", - srcs = [ - "//ts:protobuf-shim.js", - ], args = [ "--global-name=anki", - "--inject:$(location //ts:protobuf-shim.js)", "--resolve-extensions=.mjs,.js", "--log-level=warning", ], entry_point = "index.ts", - external = [ - "protobufjs/light", - ], output_css = "graphs.css", visibility = ["//visibility:public"], deps = [ @@ -78,6 +71,7 @@ esbuild( "//ts/lib:backend_proto", ":index", ":base_css", + "@npm//protobufjs", ] + svelte_names, ) diff --git a/ts/graphs/graphs.html b/ts/graphs/graphs.html index ffdd3f89e..b2fdee675 100644 --- a/ts/graphs/graphs.html +++ b/ts/graphs/graphs.html @@ -5,7 +5,6 @@ - diff --git a/ts/package.json b/ts/package.json index 779513746..1b68e2934 100644 --- a/ts/package.json +++ b/ts/package.json @@ -37,6 +37,7 @@ "jsdoc": "^3.6.6", "license-checker-rseidelsohn": "^1.2.2", "minimist": "^1.2.5", + "patch-package": "^6.4.7", "prettier": "=2.3.0", "prettier-plugin-svelte": "=2.3.0", "sass": "=1.32.12", @@ -51,7 +52,8 @@ "uglify-js": "^3.13.1" }, "scripts": { - "fix": "prettier --write */*.ts */*.svelte" + "fix": "prettier --write */*.ts */*.svelte", + "postinstall": "patch-package" }, "dependencies": { "@fluent/bundle": "^0.15.1", diff --git a/ts/patches/protobufjs+6.11.2.patch b/ts/patches/protobufjs+6.11.2.patch new file mode 100644 index 000000000..cb9fcb718 --- /dev/null +++ b/ts/patches/protobufjs+6.11.2.patch @@ -0,0 +1,13 @@ +diff --git a/node_modules/protobufjs/src/root.js b/node_modules/protobufjs/src/root.js +index df6f11f..112f9e8 100644 +--- a/node_modules/protobufjs/src/root.js ++++ b/node_modules/protobufjs/src/root.js +@@ -259,7 +259,7 @@ Root.prototype.resolveAll = function resolveAll() { + }; + + // only uppercased (and thus conflict-free) children are exposed, see below +-var exposeRe = /^[A-Z]/; ++var exposeRe = /^[A-Za-z]/; + + /** + * Handles a deferred declaring extension field by creating a sister field to represent it within its extended type. diff --git a/ts/protobuf-shim.js b/ts/protobuf-shim.js deleted file mode 100644 index 3f4f213ef..000000000 --- a/ts/protobuf-shim.js +++ /dev/null @@ -1,4 +0,0 @@ -window.require = (name) => { - if (name === "protobufjs/light") return window.protobuf; - else throw new Error(`Cannot require ${name}`); -}; diff --git a/ts/reviewer/BUILD.bazel b/ts/reviewer/BUILD.bazel index 4b2217a48..6069fe858 100644 --- a/ts/reviewer/BUILD.bazel +++ b/ts/reviewer/BUILD.bazel @@ -16,23 +16,17 @@ ts_library( esbuild( name = "reviewer_extras", - srcs = [ - "//ts:protobuf-shim.js", - ], args = [ - "--inject:$(location //ts:protobuf-shim.js)", "--resolve-extensions=.mjs,.js", "--log-level=warning", ], entry_point = "index.ts", - external = [ - "protobufjs/light", - ], visibility = ["//visibility:public"], deps = [ ":lib", "//ts/lib", "//ts/lib:backend_proto", + "@npm//protobufjs", ], ) diff --git a/ts/vendor.bzl b/ts/vendor.bzl index 13b948adc..578d95e3e 100644 --- a/ts/vendor.bzl +++ b/ts/vendor.bzl @@ -60,17 +60,6 @@ def copy_jquery_ui(name = "jquery-ui", visibility = ["//visibility:public"]): visibility = visibility, ) -def copy_protobufjs(name = "protobufjs", visibility = ["//visibility:public"]): - vendor_js_lib( - name = name, - pkg = pkg_from_name(name), - include = [ - "dist/protobuf.min.js", - ], - strip_prefix = "dist/", - visibility = visibility, - ) - def copy_mathjax(name = "mathjax", visibility = ["//visibility:public"]): vendor_js_lib( name = name, @@ -140,4 +129,3 @@ def copy_mdi_icons(name = "mdi-icons", icons = [], visibility = ["//visibility:p strip_prefix = "svg/", visibility = visibility, ) - diff --git a/ts/yarn.lock b/ts/yarn.lock index 50c723e2b..fc5719c20 100644 --- a/ts/yarn.lock +++ b/ts/yarn.lock @@ -1177,6 +1177,11 @@ "@typescript-eslint/types" "4.27.0" eslint-visitor-keys "^2.0.0" +"@yarnpkg/lockfile@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + abab@^2.0.3, abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" @@ -1474,7 +1479,7 @@ catharsis@^0.9.0: dependencies: lodash "^4.17.15" -chalk@^2.0.0: +chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1511,6 +1516,11 @@ char-regex@^1.0.2: optionalDependencies: fsevents "~2.3.2" +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + ci-info@^3.1.1: version "3.2.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6" @@ -1605,6 +1615,17 @@ cross-env@^7.0.2: dependencies: cross-spawn "^7.0.1" +cross-spawn@^6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -2271,6 +2292,13 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-yarn-workspace-root@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" + integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== + dependencies: + micromatch "^4.0.2" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -2293,6 +2321,15 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +fs-extra@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -2376,7 +2413,7 @@ globby@^11.0.3: merge2 "^1.3.0" slash "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.9, graceful-fs@^4.2.4: +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.4: version "4.2.6" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== @@ -2512,6 +2549,13 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + is-ci@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz#c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994" @@ -2526,6 +2570,11 @@ is-core-module@^2.2.0: dependencies: has "^1.0.3" +is-docker@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -2568,6 +2617,13 @@ is-typedarray@^1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +is-wsl@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -3144,6 +3200,20 @@ json5@^2.1.2: dependencies: minimist "^1.2.5" +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +klaw-sync@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" + integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== + dependencies: + graceful-fs "^4.1.11" + klaw@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146" @@ -3343,7 +3413,7 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@^1.2.5: +minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== @@ -3368,6 +3438,11 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + no-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" @@ -3444,6 +3519,14 @@ onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" +open@^7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== + dependencies: + is-docker "^2.0.0" + is-wsl "^2.1.1" + optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -3468,6 +3551,11 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + p-each-series@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a" @@ -3512,6 +3600,25 @@ pascal-case@^3.1.1: no-case "^3.0.4" tslib "^2.0.3" +patch-package@^6.4.7: + version "6.4.7" + resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.4.7.tgz#2282d53c397909a0d9ef92dae3fdeb558382b148" + integrity sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ== + dependencies: + "@yarnpkg/lockfile" "^1.1.0" + chalk "^2.4.2" + cross-spawn "^6.0.5" + find-yarn-workspace-root "^2.0.0" + fs-extra "^7.0.1" + is-ci "^2.0.0" + klaw-sync "^6.0.0" + minimist "^1.2.0" + open "^7.4.2" + rimraf "^2.6.3" + semver "^5.6.0" + slash "^2.0.0" + tmp "^0.0.33" + path-exists@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" @@ -3522,6 +3629,11 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= +path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" @@ -3760,6 +3872,13 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== +rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" @@ -3815,7 +3934,7 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -"semver@2 || 3 || 4 || 5": +"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -3837,6 +3956,13 @@ semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: dependencies: lru-cache "^6.0.0" +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + dependencies: + shebang-regex "^1.0.0" + shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -3844,6 +3970,11 @@ shebang-command@^2.0.0: dependencies: shebang-regex "^3.0.0" +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + shebang-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" @@ -3859,6 +3990,11 @@ sisteransi@^1.0.5: resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== +slash@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" + integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== + slash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" @@ -4132,6 +4268,13 @@ throat@^6.0.1: resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + tmp@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" @@ -4257,7 +4400,7 @@ underscore@~1.13.1: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1" integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g== -universalify@^0.1.2: +universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== @@ -4348,6 +4491,13 @@ whatwg-url@^8.0.0, whatwg-url@^8.5.0: tr46 "^2.1.0" webidl-conversions "^6.1.0" +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"