diff --git a/WORKSPACE b/WORKSPACE index f50b3e4101..7502297fe3 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -187,8 +187,8 @@ container_pull( http_archive( name = "build_bazel_rules_nodejs", - sha256 = "55a25a762fcf9c9b88ab54436581e671bc9f4f523cb5a1bd32459ebec7be68a8", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.2.2/rules_nodejs-3.2.2.tar.gz"], + sha256 = "cfc289523cf1594598215901154a6c2515e8bf3671fd708264a6f6aefe02bf39", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.4.6/rules_nodejs-4.4.6.tar.gz"], ) load( @@ -199,7 +199,7 @@ load( ### https://bazelbuild.github.io/rules_nodejs/Built-ins.html#usage node_repositories( - node_version = "12.13.0", + node_version = "16.13.0", package_json = ["//pkg/app/web:package.json"], yarn_version = "1.22.4", ) @@ -208,6 +208,7 @@ yarn_install( name = "npm", package_json = "//pkg/app/web:package.json", yarn_lock = "//pkg/app/web:yarn.lock", + frozen_lockfile = False, ) load("@npm//@bazel/labs:package.bzl", "npm_bazel_labs_dependencies") diff --git a/pkg/app/web/BUILD.bazel b/pkg/app/web/BUILD.bazel index f728691977..f0fd3dae39 100644 --- a/pkg/app/web/BUILD.bazel +++ b/pkg/app/web/BUILD.bazel @@ -50,6 +50,7 @@ ts_project( ":build_model", ], allow_js = True, + declaration = True, tsconfig = ":tsconfig.json", deps = [ "@npm//:node_modules", diff --git a/pkg/app/web/package.json b/pkg/app/web/package.json index 19be99a1d5..1a91fcf1c1 100644 --- a/pkg/app/web/package.json +++ b/pkg/app/web/package.json @@ -16,8 +16,8 @@ }, "devDependencies": { "@babel/core": "^7.12.9", - "@bazel/labs": "^3.2.2", - "@bazel/typescript": "^3.2.2", + "@bazel/labs": "^4.4.6", + "@bazel/typescript": "^4.4.6", "@storybook/addon-actions": "^6.2.7", "@storybook/addon-essentials": "^6.2.7", "@storybook/react": "^6.2.7", diff --git a/pkg/app/web/src/modules/application-counts/index.ts b/pkg/app/web/src/modules/application-counts/index.ts index 02f7d8fe0c..92386c73c8 100644 --- a/pkg/app/web/src/modules/application-counts/index.ts +++ b/pkg/app/web/src/modules/application-counts/index.ts @@ -19,7 +19,7 @@ export const INSIGHT_APPLICATION_COUNT_LABEL_KEY_TEXT: Record< [InsightApplicationCountLabelKey.ACTIVE_STATUS]: "ACTIVE_STATUS", }; -interface ApplicationCounts { +export interface ApplicationCounts { updatedAt: number; counts: Record>; } diff --git a/pkg/app/web/tsconfig.json b/pkg/app/web/tsconfig.json index df1ff30a6a..50008137e8 100644 --- a/pkg/app/web/tsconfig.json +++ b/pkg/app/web/tsconfig.json @@ -46,7 +46,8 @@ "../../../bazel-out/darwin-dbg/bin", "../../../bazel-out/k8-dbg/bin", "../../../bazel-out/x64_windows-dbg/bin" - ] + ], + "declaration": true }, "include": [ "./src/**/*.*", diff --git a/pkg/app/web/yarn.lock b/pkg/app/web/yarn.lock index c88e1bbfed..be9895b12e 100644 --- a/pkg/app/web/yarn.lock +++ b/pkg/app/web/yarn.lock @@ -1851,20 +1851,28 @@ resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.0.tgz#860ce718b0b73f4009e153541faff2cb6b85d047" integrity sha512-4Th98KlMHr5+JkxfcoDT//6vY8vM+iSPrLNpHhRyLx2CFYi8e2RfqPLdpbnpo0Q5lQC5hNB79yes07zb02fvCw== -"@bazel/labs@^3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@bazel/labs/-/labs-3.2.2.tgz#b736196bcb1b59629916684bdf861ba15b4cc305" - integrity sha512-Sky9sOzbPLuBqDRYfQ+AH7lDZLVS/3kqWpAuF3AODBZrSkm51mavg0zAD7cTIumdHAW/+g08BTTC54t+j9jrVg== +"@bazel/labs@^4.4.6": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@bazel/labs/-/labs-4.4.6.tgz#df686f33ca1803eebcb7e53deedb04504f5c798e" + integrity sha512-WK4uZr/0yJLObc7/eNmAFX5tUv9MY8QE/N1XraOHDWRHMjwWNM9jaySrGImW9YsKmQpDRIl34x92V+TVo/xLnA== -"@bazel/typescript@^3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-3.2.2.tgz#b53ee35dee68952abd711a2d472485748c7521c1" - integrity sha512-fTPtX3kZAQ50fWJaBvHtHf4w0fqMCrOhK9A8c5GgbqRrIWF8GG/+Tbt4OPwsG0N3+JDYOsHATacJI0qkjIeG1g== +"@bazel/typescript@^4.4.6": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-4.4.6.tgz#fbaac22460b3aa4a0961c6c657d239af8f895778" + integrity sha512-J205En8MjmnWSPnz4CqJm1x4mzcdWM+HvAsOzzVb0DHx86O+mjPFwqleeAtPGLTE9aWskel81XICJfEuTlNtiw== dependencies: + "@bazel/worker" "4.4.6" protobufjs "6.8.8" semver "5.6.0" source-map-support "0.5.9" - tsutils "2.27.2" + tsutils "3.21.0" + +"@bazel/worker@4.4.6": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-4.4.6.tgz#c9122c8ec765f62dc723203270a3c913caf8826a" + integrity sha512-1Sk0FGIc1m9rFwXhCnm46XDRng88vAnY1FBb7OQPonha/kuxjZTpPDP7q2ndSkqDNyCFKp94cPUFUT58Fgqvfw== + dependencies: + google-protobuf "^3.6.1" "@bcoe/v8-coverage@^0.2.3": version "0.2.3" @@ -8083,6 +8091,11 @@ google-protobuf@^3.12.0-rc.1: resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.12.2.tgz#50ce9f9b6281235724eb243d6a83e969a2176e53" integrity sha512-4CZhpuRr1d6HjlyrxoXoocoGFnRYgKULgMtikMddA9ztRyYR59Aondv2FioyxWVamRo0rF2XpYawkTCBEQOSkA== +google-protobuf@^3.6.1: + version "3.19.1" + resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.19.1.tgz#5af5390e8206c446d8f49febaffd4b7f4ac28f41" + integrity sha512-Isv1RlNC+IzZzilcxnlVSf+JvuhxmY7DaxYCBy+zPS9XVuJRtlTTIXR9hnZ1YL1MMusJn/7eSy2swCzZIomQSg== + got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -14214,10 +14227,10 @@ tslib@^2.0.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== -tsutils@2.27.2: - version "2.27.2" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7" - integrity sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg== +tsutils@3.21.0, tsutils@^3.21.0: + version "3.21.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== dependencies: tslib "^1.8.1" @@ -14228,13 +14241,6 @@ tsutils@^3.17.1: dependencies: tslib "^1.8.1" -tsutils@^3.21.0: - version "3.21.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" - integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== - dependencies: - tslib "^1.8.1" - tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"