diff --git a/BUILD b/BUILD index 709f10afb6..96c10cae63 100644 --- a/BUILD +++ b/BUILD @@ -195,7 +195,7 @@ alias( alias( name = "yarn", - actual = "@nodejs//:bin/yarn.cmd" if is_windows else "@nodejs//:bin/yarn", + actual = "@nodejs//:yarn", ) alias( diff --git a/WORKSPACE b/WORKSPACE index b3189492d4..53394b3fac 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -636,7 +636,7 @@ dev_env_tool( ) # Setup the Node.js toolchain -load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "yarn_install") +load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install") node_repositories( package_json = ["//:package.json"], @@ -654,7 +654,7 @@ load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies") install_bazel_dependencies() -load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace") +load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace") ts_setup_workspace() diff --git a/bazel_tools/rules_nodejs_posix_path.patch b/bazel_tools/rules_nodejs_posix_path.patch deleted file mode 100644 index efd7b93856..0000000000 --- a/bazel_tools/rules_nodejs_posix_path.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/internal/npm_package/npm_package.bzl b/internal/npm_package/npm_package.bzl -index 7b19296b..af1ed3b0 100644 ---- a/internal/npm_package/npm_package.bzl -+++ b/internal/npm_package/npm_package.bzl -@@ -66,6 +66,7 @@ def create_package(ctx, deps_sources, nested_packages): - if ctx.version_file: - inputs.append(ctx.version_file) - -+ posix = ctx.toolchains["@rules_sh//sh/posix:toolchain_type"] - ctx.actions.run( - progress_message = "Assembling npm package %s" % package_dir.short_path, - executable = ctx.executable._packager, -@@ -80,6 +81,9 @@ def create_package(ctx, deps_sources, nested_packages): - # See https://github.com/bazelbuild/rules_nodejs/issues/187 - "local": "1", - }, -+ env = { -+ "PATH": ctx.host_configuration.host_path_separator.join(posix.paths), -+ }, - ) - return package_dir - -@@ -168,6 +172,7 @@ npm_package = rule( - implementation = _npm_package, - attrs = NPM_PACKAGE_ATTRS, - outputs = NPM_PACKAGE_OUTPUTS, -+ toolchains = ["@rules_sh//sh/posix:toolchain_type"], - ) - """The npm_package rule creates a directory containing a publishable npm artifact. - diff --git a/compiler/daml-extension/BUILD.bazel b/compiler/daml-extension/BUILD.bazel index 565305e05b..e870bbc73c 100644 --- a/compiler/daml-extension/BUILD.bazel +++ b/compiler/daml-extension/BUILD.bazel @@ -88,6 +88,7 @@ genrule( # rm -rf can fail with "directory not empty" on Windows. # As a workaround we add `|| return`. cmd = """ + export HOME=/does-not-exist set -euo pipefail TMP_DIR=$$(mktemp -d) cleanup () { rm -rf $$TMP_DIR || return; } diff --git a/deps.bzl b/deps.bzl index 36ffe41c0c..1021a8f817 100644 --- a/deps.bzl +++ b/deps.bzl @@ -166,19 +166,20 @@ def daml_deps(): if "io_bazel_rules_sass" not in native.existing_rules(): http_archive( name = "io_bazel_rules_sass", - sha256 = "7f0d64061e5bac749275349a7a7918b6f5759365f289192ff791f3c1495afcf1", - strip_prefix = "rules_sass-1.22.3", - urls = ["https://github.com/bazelbuild/rules_sass/archive/1.22.3.tar.gz"], + sha256 = "7b9c9a88099d00dbb16be359c3b1946309d99673220c6b39c7e8bda8ecc692f8", + strip_prefix = "rules_sass-1.24.4", + urls = [ + "https://github.com/bazelbuild/rules_sass/archive/1.24.4.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.24.4.zip", + ], ) # Fetch rules_nodejs so we can install our npm dependencies if "build_bazel_rules_nodejs" not in native.existing_rules(): http_archive( name = "build_bazel_rules_nodejs", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.32.2/rules_nodejs-0.32.2.tar.gz"], - sha256 = "6d4edbf28ff6720aedf5f97f9b9a7679401bf7fca9d14a0fff80f644a99992b4", - patches = ["@com_github_digital_asset_daml//bazel_tools:rules_nodejs_posix_path.patch"], - patch_args = ["-p1"], + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.1.0/rules_nodejs-1.1.0.tar.gz"], + sha256 = "c97bf38546c220fa250ff2cc052c1a9eac977c662c1fc23eda797b0ce8e70a43", ) if "com_github_grpc_grpc" not in native.existing_rules(): diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel index 752def1c47..48d9618cc8 100644 --- a/docs/BUILD.bazel +++ b/docs/BUILD.bazel @@ -1,7 +1,7 @@ # Copyright (c) 2020 The DAML Authors. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") load("@os_info//:os_info.bzl", "is_linux", "is_windows") load("//rules_daml:daml.bzl", "daml_compile", "daml_test") load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") @@ -25,7 +25,84 @@ genrule( "theme/da_theme/**", ], ) + [ + # we need to list all the transitive dependencies here because of https://github.com/bazelbuild/rules_nodejs/issues/1553 + "@npm//acorn", + "@npm//acorn-dynamic-import", + "@npm//acorn-node", + "@npm//acorn-walk", + "@npm//ansi-regex", + "@npm//ansi-styles", + "@npm//anymatch", + "@npm//assert", + "@npm//async", + "@npm//async-each", + "@npm//balanced-match", + "@npm//basic-auth", + "@npm//batch", + "@npm//binary-extensions", + "@npm//body", + "@npm//brace-expansion", "@npm//browserify", + "@npm//browserify-cache-api", + "@npm//browserify-incremental", + "@npm//browserify-zlib", + "@npm//browser-pack", + "@npm//browser-resolve", + "@npm//buffer", + "@npm//buffer-from", + "@npm//cached-path-relative", + "@npm//chalk", + "@npm//chokidar", + "@npm//coffeescript", + "@npm//color-convert", + "@npm//colors", + "@npm//combine-source-map", + "@npm//concat-map", + "@npm//concat-stream", + "@npm//connect", + "@npm//connect-livereload", + "@npm//console-browserify", + "@npm//constants-browserify", + "@npm//continuable-cache", + "@npm//convert-source-map", + "@npm//core-util-is", + "@npm//cross-spawn", + "@npm//crypto-browserify", + "@npm//dargs", + "@npm//dash-ast", + "@npm//dateformat", + "@npm//defined", + "@npm//depd", + "@npm//deps-sort", + "@npm//destroy", + "@npm//detective", + "@npm//domain-browser", + "@npm//duplexer", + "@npm//duplexer2", + "@npm//ee-first", + "@npm//encodeurl", + "@npm//error", + "@npm//escape-html", + "@npm//escape-string-regexp", + "@npm//etag", + "@npm//eventemitter2", + "@npm//events", + "@npm//exit", + "@npm//faye-websocket", + "@npm//figures", + "@npm//file-sync-cmp", + "@npm//findup-sync", + "@npm//fresh", + "@npm//fs.realpath", + "@npm//function-bind", + "@npm//gaze", + "@npm//get-assigned-identifiers", + "@npm//getobject", + "@npm//glob", + "@npm//glob-parent", + "@npm//globule", + "@npm//graceful-fs", + "@npm//grunt", "@npm//grunt-banner", "@npm//grunt-browserify", "@npm//grunt-contrib-clean", @@ -35,8 +112,107 @@ genrule( "@npm//grunt-contrib-uglify", "@npm//grunt-contrib-watch", "@npm//grunt-exec", + "@npm//grunt-legacy-log", + "@npm//grunt-legacy-log-utils", + "@npm//grunt-legacy-util", "@npm//grunt-open", + "@npm//gzip-size", + "@npm//has", + "@npm//has-ansi", + "@npm//has-flag", + "@npm//hooker", + "@npm//htmlescape", + "@npm//http-parser-js", + "@npm//https-browserify", + "@npm//iconv-lite", + "@npm//inflight", + "@npm//inherits", + "@npm//inline-source-map", + "@npm//insert-module-globals", + "@npm//is-binary-path", + "@npm//is-number-like", + "@npm//is-wsl", + "@npm//jsonparse", + "@npm//json-stable-stringify", + "@npm//JSONStream", + "@npm//js-yaml", + "@npm//labeled-stream-splicer", + "@npm//lodash", + "@npm//lodash.isfinite", + "@npm//lodash.memoize", + "@npm//lru-cache", "@npm//matchdep", + "@npm//maxmin", + "@npm//mime-db", + "@npm//mime-types", + "@npm//minimatch", + "@npm//mkdirp", + "@npm//module-deps", + "@npm//morgan", + "@npm//node-http2", + "@npm//nopt", + "@npm//normalize-path", + "@npm//number-is-nan", + "@npm//object-assign", + "@npm//once", + "@npm//on-finished", + "@npm//on-headers", + "@npm//opn", + "@npm//os-browserify", + "@npm//parents", + "@npm//parseurl", + "@npm//path-browserify", + "@npm//path-dirname", + "@npm//path-is-absolute", + "@npm//path-platform", + "@npm//portscanner", + "@npm//pretty-bytes", + "@npm//process", + "@npm//process-nextick-args", + "@npm//querystring-es3", + "@npm//readable-stream", + "@npm//readdirp", + "@npm//read-only-stream", + "@npm//remove-trailing-separator", + "@npm//rimraf", + "@npm//safe-buffer", + "@npm//safe-json-parse", + "@npm//safer-buffer", + "@npm//serve-index", + "@npm//shasum", + "@npm//sprintf-js", + "@npm//statuses", + "@npm//stream-browserify", + "@npm//stream-combiner2", + "@npm//stream-http", + "@npm//stream-splicer", + "@npm//string_decoder", + "@npm//string-template", + "@npm//strip-ansi", + "@npm//supports-color", + "@npm//syntax-error", + "@npm//through", + "@npm//through2", + "@npm//timers-browserify", + "@npm//tiny-lr", + "@npm//tty-browserify", + "@npm//uglify-js", + "@npm//umd", + "@npm//undeclared-identifiers", + "@npm//underscore.string", + "@npm//unpipe", + "@npm//upath", + "@npm//uri-path", + "@npm//url", + "@npm//util", + "@npm//util-deprecate", + "@npm//utils-merge", + "@npm//vm-browserify", + "@npm//watchify", + "@npm//websocket-driver", + "@npm//websocket-extensions", + "@npm//wrappy", + "@npm//xtend", ], outs = ["da_theme.tar.gz"], cmd = """ diff --git a/navigator/frontend/BUILD.bazel b/navigator/frontend/BUILD.bazel index 76b2fa0355..866dfc725e 100644 --- a/navigator/frontend/BUILD.bazel +++ b/navigator/frontend/BUILD.bazel @@ -1,8 +1,9 @@ # Copyright (c) 2020 The DAML Authors. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") load("@os_info//:os_info.bzl", "is_windows") +# load ("@npm_bazel_typescript//:index.bzl", "ts_library") filegroup( name = "src", @@ -48,8 +49,21 @@ nodejs_binary( # ], ) +# TODO (drsk) We should switch the frontend rule to use the bazel typescript rules instead of +# webpack. Something like the following: +# ts_library( +# name = "frontend", +# tsconfig = ":tsconfig.json", +# srcs = glob(["**/*.ts"]), +# data = [":package.json", ":tslint.json"], +# node_modules = "@navigator_frontend_deps//:node_modules", +# visibility = [ +# "//navigator:__subpackages__", +# ], +# ) + # Builds the frontend single page application and bundles all output files -# (HTML + JavaScript + CSS + images) in a .tgz or .jar archive. +#  (HTML + JavaScript + CSS + images) in a .tgz or .jar archive. genrule( name = "frontend", srcs = [ diff --git a/navigator/frontend/package.json b/navigator/frontend/package.json index ae581c9a44..d0db4c9bc8 100644 --- a/navigator/frontend/package.json +++ b/navigator/frontend/package.json @@ -20,7 +20,7 @@ "lint": "tslint --project tslint.json" }, "devDependencies": { - "@bazel/hide-bazel-files": "0.32.0", + "@bazel/hide-bazel-files": "1.1.0", "@types/async": "2.0.39", "@types/babel-core": "^6.25.3", "@types/classnames": "0.0.32", diff --git a/navigator/frontend/webpack.config.js b/navigator/frontend/webpack.config.js index 56ef3b39ee..009757c85a 100644 --- a/navigator/frontend/webpack.config.js +++ b/navigator/frontend/webpack.config.js @@ -52,8 +52,14 @@ const APP_NAME = 'Navigator'; */ module.exports = (env) => { const paths_case_check = env && env.paths_case_check || 'true'; - const in_dir = env && env.bazel_in_dir || __dirname; - const out_dir = env && env.bazel_out_dir || path.join(__dirname, 'dist'); + // const in_dir = env && env.bazel_in_dir || __dirname; + // const out_dir = env && env.bazel_out_dir || path.join(__dirname, 'dist'); + // TODO (drsk) there seems to be a bug in the code producing the `env.bazel_in_dir, + // env.bazel_out_dir` that just concats directory components. We should switch back to rely on + // bazel_in_dir/bazel_out_dir once it's fixed. + // The issue is reported and tracked here: https://github.com/bazelbuild/rules_nodejs/issues/1554 + const in_dir = __dirname; + const out_dir = path.join(__dirname, 'dist'); const build_version = env && env.bazel_version_file ? fs.readFileSync(env.bazel_version_file, 'utf8').trim() : 'HEAD'; const build_commit = env && env.bazel_commit_file ? fs.readFileSync(env.bazel_commit_file, 'utf8').trim() : 'HEAD'; const isProduction = env ? (!!env.prod || !!env.production) : false; diff --git a/navigator/frontend/yarn.lock b/navigator/frontend/yarn.lock index 59c2842e87..6eed553695 100644 --- a/navigator/frontend/yarn.lock +++ b/navigator/frontend/yarn.lock @@ -76,10 +76,10 @@ lodash "^4.17.11" to-fast-properties "^2.0.0" -"@bazel/hide-bazel-files@0.32.0": - version "0.32.0" - resolved "https://registry.yarnpkg.com/@bazel/hide-bazel-files/-/hide-bazel-files-0.32.0.tgz#642becc6ac9c27a4486b3f671a078090f93371cb" - integrity sha512-eraORpt2iBiHal4FRV2c/3enH2nttWp4myOcHZvEVd8v7P/tt9FWv04MrxDIKHCqZIVt51D/2sXmOJKuKsKqvA== +"@bazel/hide-bazel-files@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@bazel/hide-bazel-files/-/hide-bazel-files-1.1.0.tgz#a7d46a4aa3717150b54fde05b2f8b6bab733f493" + integrity sha512-JJ9eMKPBodWugC4Wu0QLe0saDZ971RcP2kjZbG1vJfQHn/gnxvw+4nXDRwei5EzxBsGGuLxY1MkNDtRFIfZr5w== "@endemolshinegroup/cosmiconfig-typescript-loader@^1.0.0": version "1.0.0" diff --git a/package.json b/package.json index fb9da50aae..e7855ef69d 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,6 @@ "version": "0.0.0", "dependencies": { "bower": "1.8.8", - "browserify": "16.2.3", "dockerode": "^2.5.8", "express": "^4.16.4", "express-session": "^1.15.6", @@ -22,15 +21,17 @@ "grunt-contrib-watch": "1.1.0", "grunt-exec": "3.0.0", "grunt-open": "0.2.4", - "http-proxy": "^1.17.0", "matchdep": "2.0.0", + "color-convert": "2.0.1", + "colors": "1.4.0", + "http-proxy": "^1.17.0", "node-cache": "^4.2.0", "typescript": "3.1.6", "url": "^0.11.0" }, "devDependencies": { - "@bazel/bazel": "0.22.0", - "@bazel/hide-bazel-files": "0.32.2", - "@bazel/typescript": "0.32.2" + "@bazel/bazel": "0.29.0", + "@bazel/hide-bazel-files": "1.1.0", + "@bazel/typescript": "1.1.0" } } diff --git a/yarn.lock b/yarn.lock index a2988baa77..d46dce6b43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,39 +2,41 @@ # yarn lockfile v1 -"@bazel/bazel-darwin_x64@0.22.0": - version "0.22.0" - resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.22.0.tgz#a2bea5922dba9a32554a218ba4849a200115b248" - integrity sha512-LFxkyQgPATeB64z/1IvOWZhK+lc3JVHejbmdo96qB4lsoD8zselvOlgHvVXxlAjRxVZ9mlmXDvDRDyaXyyRdwA== +"@bazel/bazel-darwin_x64@0.29.0": + version "0.29.0" + resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.29.0.tgz#d2ebcb95bc66031b0545dd8b0e597b3aa5b9024b" + integrity sha512-q6snNakVA3wzv3VIuFlsw3/xcB/ygsAMhkigsuZXv1yHmwnuBOI4UJ2r2+Ttc4HPHflS0aWuI/raHDq81vBYKw== -"@bazel/bazel-linux_x64@0.22.0": - version "0.22.0" - resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.22.0.tgz#12e5884f2a7b7f3b62afbef9f8da4de0976f3bc8" - integrity sha512-xDs8cb2bbGZ9uvzYZOzCVrMBywzRhLj0J/t+py+FYZj+VO5B3wVg9eUf6nWWR0oJ2mzvToI9h31t2tNdqwy2kQ== +"@bazel/bazel-linux_x64@0.29.0": + version "0.29.0" + resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.29.0.tgz#95250ad8463425bec81a95736056f432c186cb9d" + integrity sha512-QxWdtlsFKMi3SJ++osjA8QQbWOlGZXU0/TtUTiswsRwWdOEwZhOa2c1ljIQY5QBgzc3CCh2clRnkjWQj0/V/Dw== -"@bazel/bazel-win32_x64@0.22.0": - version "0.22.0" - resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.22.0.tgz#a8a65986639583a8cc7b018e001aedfdafe41b50" - integrity sha512-FbJaXVDoCLnpIFLnPHFkQdfriYPXfnfQNuf9EXMliERdRuoeBVbwEZfwcuArxZWNFus7bD8QiTj0XzKVWO+Wbw== +"@bazel/bazel-win32_x64@0.29.0": + version "0.29.0" + resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.29.0.tgz#62af30d4ccf0a31e656a6ac9337e928d29a4598d" + integrity sha512-r0DhNarJrzzcXrvRbey43hGVO4J2QBAS43VrgjrxVw+1kyjKkIOQIh3wKr/OKx2jKOX0y3hCrLpL/aivHqub4g== -"@bazel/bazel@0.22.0": - version "0.22.0" - resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.22.0.tgz#feb0f2d82f9d169cb47951d95d55e512eda72bc9" - integrity sha512-uaXZsfCXOASBXzmge56akRIhJnKYdShn1X3AdEBzq2NNCf2llkc1H25gKGm4BfuWDBXRbXDMmcXup+fw39h+WQ== +"@bazel/bazel@0.29.0": + version "0.29.0" + resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.29.0.tgz#bf4ecf47d6e67e8df8d342d24c146bd732d78640" + integrity sha512-OBxPv+V73PtADVG4qsGJ7Zj0wJrJorRbHgYE8qsRBNKls6e6rf0jkjSIQvAvP1Dyt7x4MGyhIzzK/5IsPeQZIA== + dependencies: + "@bazel/hide-bazel-files" latest optionalDependencies: - "@bazel/bazel-darwin_x64" "0.22.0" - "@bazel/bazel-linux_x64" "0.22.0" - "@bazel/bazel-win32_x64" "0.22.0" + "@bazel/bazel-darwin_x64" "0.29.0" + "@bazel/bazel-linux_x64" "0.29.0" + "@bazel/bazel-win32_x64" "0.29.0" -"@bazel/hide-bazel-files@0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@bazel/hide-bazel-files/-/hide-bazel-files-0.32.2.tgz#a482855eafbccb56b1fce0d92ff922c2c6e0a90c" - integrity sha512-585XY53mhMZaCjEQJ+aDqkmydWZbuXsKrZsSpoW9YeAVEH0poQY3YhdyCPmMVBo7/l1mkrqpFuOK5BpECfwdtA== +"@bazel/hide-bazel-files@1.1.0", "@bazel/hide-bazel-files@latest": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@bazel/hide-bazel-files/-/hide-bazel-files-1.1.0.tgz#a7d46a4aa3717150b54fde05b2f8b6bab733f493" + integrity sha512-JJ9eMKPBodWugC4Wu0QLe0saDZ971RcP2kjZbG1vJfQHn/gnxvw+4nXDRwei5EzxBsGGuLxY1MkNDtRFIfZr5w== -"@bazel/typescript@0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.32.2.tgz#c296bb44cb6362a0e3a08ca88752852bc9591ecf" - integrity sha512-32zDyvHdYjIa63vtImhl6wy5ErOFVWPkjMT2T035D0UPSKI1tvENW/bRZ3QFlFHqfmJZRBpaI3GiUpO3vUvzmw== +"@bazel/typescript@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.1.0.tgz#b57ac6c6d627577f394a60fb540fbbdf53bcff0d" + integrity sha512-QnTdb6rwZUR+KfUuAdyazpkA7BOvrWRe7tkPDdyIZHJdBPYdpJW+AapnFSfxvXEIP0Nwesl5KP6Saau0GPiBLg== dependencies: protobufjs "6.8.8" semver "5.6.0" @@ -100,9 +102,9 @@ integrity sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q== "@types/node@^10.1.0": - version "10.14.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.10.tgz#e491484c6060af8d461e12ec81c0da8a3282b8de" - integrity sha512-V8wj+w2YMNvGuhgl/MA5fmTxgjmVHVoasfIaxMMZJV6Y8Kk+Ydpi1z2whoShDCJ2BuNVoqH/h1hrygnBxkrw/Q== + version "10.17.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c" + integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg== JSONStream@1.3.2: version "1.3.2" @@ -542,7 +544,7 @@ browserify-zlib@~0.2.0: dependencies: pako "~1.0.5" -browserify@16.2.3, browserify@^16.0.0, browserify@^16.1.0: +browserify@^16.0.0, browserify@^16.1.0: version "16.2.3" resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.2.3.tgz#7ee6e654ba4f92bce6ab3599c3485b1cc7a0ad0b" integrity sha512-zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ== @@ -719,7 +721,12 @@ chokidar@^2.1.1: optionalDependencies: fsevents "^1.2.7" -chownr@^1.0.1, chownr@^1.1.1: +chownr@^1.0.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" + integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw== + +chownr@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g== @@ -765,6 +772,13 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" +color-convert@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -777,6 +791,16 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +colors@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + colors@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" @@ -876,11 +900,6 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" - integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= - cookie@0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" @@ -990,7 +1009,7 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3: dependencies: ms "2.0.0" -debug@^3.1.0, debug@^3.2.6: +debug@^3.0.0, debug@^3.1.0, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -1174,13 +1193,20 @@ encodeurl@~1.0.1, encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -end-of-stream@^1.0.0, end-of-stream@^1.1.0: +end-of-stream@^1.0.0: version "1.4.1" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== dependencies: once "^1.4.0" +end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + error-ex@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -1221,10 +1247,10 @@ eventemitter2@~0.4.13: resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab" integrity sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas= -eventemitter3@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" - integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== +eventemitter3@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb" + integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg== events@1.1.1: version "1.1.1" @@ -1270,17 +1296,17 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: homedir-polyfill "^1.0.1" express-session@^1.15.6: - version "1.16.1" - resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.16.1.tgz#251ff9776c59382301de6c8c33411af357ed439c" - integrity sha512-pWvUL8Tl5jUy1MLH7DhgUlpoKeVPUTe+y6WQD9YhcN0C5qAhsh4a8feVjiUXo3TFhIy191YGZ4tewW9edbl2xQ== + version "1.17.0" + resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.0.tgz#9b50dbb5e8a03c3537368138f072736150b7f9b3" + integrity sha512-t4oX2z7uoSqATbMfsxWMbNjAL0T5zpvcJCk3Z9wnPPN7ibddhnmDZXHfEcoBMG2ojKXZoCyPMc5FbtK+G7SoDg== dependencies: - cookie "0.3.1" + cookie "0.4.0" cookie-signature "1.0.6" debug "2.6.9" depd "~2.0.0" on-headers "~1.0.2" - parseurl "~1.3.2" - safe-buffer "5.1.2" + parseurl "~1.3.3" + safe-buffer "5.2.0" uid-safe "~2.1.5" express@^4.16.4: @@ -1451,11 +1477,11 @@ flagged-respawn@^1.0.0: integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== follow-redirects@^1.0.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76" - integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ== + version "1.9.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.9.0.tgz#8d5bcdc65b7108fe1508649c79c12d732dcedb4f" + integrity sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A== dependencies: - debug "^3.2.6" + debug "^3.0.0" for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -1917,7 +1943,7 @@ htmlescape@^1.1.0: resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E= -http-errors@1.7.2, http-errors@~1.7.2: +http-errors@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== @@ -1938,17 +1964,28 @@ http-errors@~1.6.2: setprototypeof "1.1.0" statuses ">= 1.4.0 < 2" +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + http-parser-js@>=0.4.0: version "0.5.0" resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8" integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w== http-proxy@^1.17.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a" - integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g== + version "1.18.0" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a" + integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ== dependencies: - eventemitter3 "^3.0.0" + eventemitter3 "^4.0.0" follow-redirects "^1.0.0" requires-port "^1.0.0" @@ -2006,6 +2043,11 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= +inherits@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -2350,11 +2392,16 @@ lodash.memoize@~3.0.3: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8= -lodash@4.x, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@~4.17.10, lodash@~4.17.5: +lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@~4.17.10, lodash@~4.17.5: version "4.17.14" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw== +lodash@^4.17.15: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" @@ -2484,10 +2531,10 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.40.0: - version "1.40.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" - integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA== +mime-db@1.43.0: + version "1.43.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" + integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== mime-db@~1.38.0: version "1.38.0" @@ -2502,11 +2549,11 @@ mime-types@~2.1.17, mime-types@~2.1.18: mime-db "~1.38.0" mime-types@~2.1.24: - version "2.1.24" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81" - integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ== + version "2.1.26" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" + integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== dependencies: - mime-db "1.40.0" + mime-db "1.43.0" mime@1.4.1: version "1.4.1" @@ -2659,12 +2706,12 @@ negotiator@0.6.2: integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== node-cache@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-4.2.0.tgz#48ac796a874e762582692004a376d26dfa875811" - integrity sha512-obRu6/f7S024ysheAjoYFEEBqqDWv4LOMNJEuO8vMeEw2AT4z+NCzO4hlc2lhI4vATzbCQv6kke9FVdx0RbCOw== + version "4.2.1" + resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-4.2.1.tgz#efd8474dee4edec4138cdded580f5516500f7334" + integrity sha512-BOb67bWg2dTyax5kdef5WfU3X8xu4wPg+zHzkvls0Q/QpYycIFRLEEIdAx9Wma43DxG6Qzn4illdZoYseKWa4A== dependencies: clone "2.x" - lodash "4.x" + lodash "^4.17.15" node-http2@^4.0.1: version "4.0.1" @@ -3205,7 +3252,7 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== @@ -3218,6 +3265,19 @@ readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@^2.3.0, readable-stream@^2.3.5: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + readable-stream@~1.0.26-4: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" @@ -3337,6 +3397,11 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +safe-buffer@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" + integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== + safe-json-parse@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57" @@ -3920,9 +3985,9 @@ trim-newlines@^1.0.0: integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= tslib@^1.8.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== + version "1.10.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" + integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== tsutils@2.27.2: version "2.27.2"