From b00186a92cfc4b7d5c065970200fbcc312cde3db Mon Sep 17 00:00:00 2001 From: Carina Ursu Date: Mon, 9 Jan 2023 13:05:54 -0800 Subject: [PATCH] chore: fixes Signed-off-by: Carina Ursu --- .yarnrc.yml | 5 - Dockerfile | 4 +- Makefile | 10 +- package.json | 22 +- packages/components/tsconfig.json | 2 +- packages/console/package.json | 19 +- .../ReactFlow/customNodeComponents.tsx | 3 + packages/console/tsconfig.json | 4 +- tsconfig.json | 13 +- website/package.json | 16 +- website/src/server/index.ts | 2 +- website/tsconfig.build.json | 6 +- website/tsconfig.json | 2 +- website/webpack.config.ts | 37 +-- website/webpack.dev.config.ts | 30 +-- website/webpack.utilities.ts | 53 ++-- yarn.lock | 251 +++--------------- 17 files changed, 134 insertions(+), 345 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index 50afcf55c..734906ccf 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -15,15 +15,10 @@ plugins: - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs spec: "@yarnpkg/plugin-workspace-tools" -# nmHoistingLimits: workspaces - nodeLinker: node-modules nmSelfReferences: false nmMode: classic -# lanuage -defaultLanguageName: "node" - # changeset changesetBaseRefs: - "master" diff --git a/Dockerfile b/Dockerfile index c55d1779f..580915288 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,13 +12,15 @@ RUN : \ && yarn workspaces focus @flyteconsole/client-app --production \ # move the production dependencies to the /app folder && mkdir /app \ + && rm -rf node_modules/@flyteorg \ && cp -R node_modules /app WORKDIR /my-project/ RUN : \ --mount=type=cache,target=/root/.yarn \ # install all dependencies so we can build - && yarn workspaces focus @flyteconsole/client-app flyteconsole --production \ + && yarn workspaces focus --all --production \ + && yarn build:pack \ && BASE_URL=/console yarn run build:prod \ && cp -R ./website/dist/* /app diff --git a/Makefile b/Makefile index 79aea0bc3..fc14da47a 100644 --- a/Makefile +++ b/Makefile @@ -17,19 +17,13 @@ lint: #lints the package for common code smells .PHONY: build_prod build_prod: yarn run clean + make pack BASE_URL=/console yarn run build:prod .PHONY: pack pack: yarn workspaces focus --production --all - - yarn workspace @flyteorg/flyteidl build - yarn workspace @flyteorg/common build - yarn workspace @flyteorg/locale build - yarn workspace @flyteorg/ui-atoms build - yarn workspace @flyteorg/flyte-api build - yarn workspace @flyteorg/components build - yarn workspace @flyteorg/console build + yarn run build:pack # test_unit runs all unit tests .PHONY: test_unit diff --git a/package.json b/package.json index 286fa4c53..f4435c681 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "flyteconsole", - "version": "1.3.5", + "version": "2.0.0", "private": true, "description": "The web UI for the Flyte platform", "repository": { @@ -16,13 +16,13 @@ }, "scripts": { "postinstall": "husky install", - "build:pack": "yarn workspaces foreach -vit --include '{@flyteorg/flyteidl,@flyteorg/flyte-api,@flyteorg/ui-atoms,@flyteorg/common,@flyteorg/locale,@flyteorg/flyte-api,@flyteorg/components,@flyteorg/console}' run build", - "clean": "git clean -fxd .yarn node_modules packages website", + "build:pack": "yarn workspaces foreach -vit --include '{@flyteorg/flyteidl-types,@flyteorg/flyte-api,@flyteorg/ui-atoms,@flyteorg/common,@flyteorg/locale,@flyteorg/flyte-api,@flyteorg/components,@flyteorg/console}' run build", + "clean": "git clean -fxd --exclude script", "gen:ssl": "make generate_ssl", "start": "yarn workspace @flyteconsole/client-app start", "build": "yarn workspace @flyteconsole/client-app build", - "start:prod": "yarn workspace @flyteconsole/client-app start:prod", "build:prod": "yarn workspace @flyteconsole/client-app build:prod", + "start:prod": "yarn build:prod && yarn workspace @flyteconsole/client-app start:prod", "build:storybook": "build-storybook", "generate:package": "yarn workspace @flyteconsole/generator start", "lint": "eslint . --ext .js,.jsx,.ts,.tsx", @@ -68,9 +68,9 @@ "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-react": "^7.29.4", "eslint-plugin-react-hooks": "^4.3.0", - "express": "^4.14.0", - "express-static-gzip": "^0.3.2", - "fork-ts-checker-webpack-plugin": "^7.2.1", + "express": "^4.18.1", + "express-static-gzip": "^2.1.7", + "fork-ts-checker-webpack-plugin": "^7.2.11", "html-webpack-plugin": "^5.5.0", "husky": "^8.0.2", "lint-staged": "^13.1.0", @@ -85,12 +85,12 @@ "tslib": "^2.4.1", "typescript": "^4.9.4", "wait-on": "^6.0.1", - "webpack": "^5.68.0", - "webpack-cli": "^4.9.2", - "webpack-dev-server": "^4.8.1", + "webpack": "^5.74.0", + "webpack-cli": "^4.10.0", + "webpack-dev-server": "^4.7.4", "webpack-merge": "^5.8.0", "webpack-node-externals": "^3.0.0", - "webpack-stats-plugin": "^1.0.3" + "webpack-stats-plugin": "^1.1.1" }, "devDependencies": { "@babel/core": "~7.16.12", diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json index 76afe8d61..1e7ed8ed4 100644 --- a/packages/components/tsconfig.json +++ b/packages/components/tsconfig.json @@ -8,7 +8,7 @@ "composite": true, "paths": { - "@flyteorg/*": ["../packages/(locale|ui-atoms)/src"] + "@flyteorg/*": ["../packages/*/src"] } }, diff --git a/packages/console/package.json b/packages/console/package.json index d16f1d1bf..ad367786e 100644 --- a/packages/console/package.json +++ b/packages/console/package.json @@ -1,6 +1,6 @@ { "name": "@flyteorg/console", - "version": "0.0.3", + "version": "0.0.6", "description": "Flyteconsole main app module", "main": "./dist/index.js", "module": "./lib/index.js", @@ -33,9 +33,8 @@ "clean": "rm -rf dist && rm -rf lib && rm -rf **.tsbuildinfo || true", "build:watch": "run -T tsc-watch --noClear -p ./tsconfig.es.build.json --onSuccess \"yarn build\"", "build": "yarn clean && yarn build:esm && yarn build:cjs", - "build:esm": "run -T tsc --module esnext --outDir ./lib --project ./tsconfig.build.es.json && run -T tsc-alias -p ./tsconfig.build.es.json", - "build:cjs": "run -T tsc --project ./tsconfig.build.json && run -T tsc-alias -p ./tsconfig.build.json", - "build:cp": "run -T wait-on ./lib && cp -R ./src/assets ./lib && run -T wait-on ./dist && cp -R ./src/assets ./dist", + "build:esm": "mkdir lib && cp -R src/assets ./lib && run -T tsc --module esnext --outDir ./lib --project ./tsconfig.build.es.json && run -T tsc-alias -p ./tsconfig.build.es.json", + "build:cjs": "mkdir dist && cp -R src/assets ./dist && run -T wait-on ./dist/assets && run -T tsc --project ./tsconfig.build.json && run -T tsc-alias -p ./tsconfig.build.json", "test": "NODE_ENV=test jest" }, "installConfig": { @@ -53,12 +52,12 @@ "dependencies": { "@date-io/moment": "1.3.9", "@emotion/core": "10.1.1", - "@flyteorg/common": "^0.0.2", - "@flyteorg/components": "^0.0.2", - "@flyteorg/flyte-api": "^0.0.1", - "@flyteorg/flyteidl-types": "^0.0.2", - "@flyteorg/locale": "^0.0.1", - "@flyteorg/ui-atoms": "^0.0.2", + "@flyteorg/common": "^0.0.3", + "@flyteorg/components": "^0.0.3", + "@flyteorg/flyte-api": "^0.0.2", + "@flyteorg/flyteidl-types": "^0.0.3", + "@flyteorg/locale": "^0.0.2", + "@flyteorg/ui-atoms": "^0.0.3", "@material-ui/core": "^4.12.4", "@material-ui/icons": "^4.11.3", "@material-ui/pickers": "^3.2.2", diff --git a/packages/console/src/components/flytegraph/ReactFlow/customNodeComponents.tsx b/packages/console/src/components/flytegraph/ReactFlow/customNodeComponents.tsx index ec464da87..0928950ec 100644 --- a/packages/console/src/components/flytegraph/ReactFlow/customNodeComponents.tsx +++ b/packages/console/src/components/flytegraph/ReactFlow/customNodeComponents.tsx @@ -350,6 +350,9 @@ export const ReactFlowCustomTaskNode = ({ data }: RFNode) => { }; const handleNodeClick = _e => { + if (nodeExecutionStatus === NodeExecutionPhase.SKIPPED) { + return; + } setSelectedNode(true); setSelectedPhase(undefined); }; diff --git a/packages/console/tsconfig.json b/packages/console/tsconfig.json index 715495c76..3c65c09bc 100644 --- a/packages/console/tsconfig.json +++ b/packages/console/tsconfig.json @@ -14,9 +14,7 @@ "noImplicitOverride": false, "paths": { - "@flyteorg/*": [ - "../packages/(ui-atoms|locale|flyteidl-types|flyte-api|common|components)/src" - ] + "@flyteorg/*": ["../packages/*/src"] } }, diff --git a/tsconfig.json b/tsconfig.json index 977aaadf2..b64834cf6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,7 +18,7 @@ "module": "commonjs", "moduleResolution": "node", - // "esModuleInterop": true + "esModuleInterop": true, "isolatedModules": true, "declaration": true, @@ -39,11 +39,12 @@ "sourceMap": true, "composite": true, - "baseUrl": "." - // "paths": { - // "@flyteconsole/client-app": ["./website/src"], - // "@flyteorg/*": ["./packages/*/src"] - // } + "baseUrl": ".", + + "paths": { + "@flyteconsole/client-app": ["./website/src"], + "@flyteorg/*": ["./packages/*/src"] + } }, "exclude": ["**/node_modules", "**/dist", "**/lib"] } diff --git a/website/package.json b/website/package.json index 2f75ea3b2..304668ab3 100644 --- a/website/package.json +++ b/website/package.json @@ -1,6 +1,6 @@ { "name": "@flyteconsole/client-app", - "version": "0.0.0-develop", + "version": "2.0.0", "description": "The web UI for the Flyte platform", "private": true, "repository": { @@ -30,13 +30,14 @@ "author": "Lyft ", "license": "Apache-2.0", "peerDependencies": { + "@types/react": "^16.9.34", + "@types/react-dom": "^16.9.7", "react": "^16.13.1", "react-dom": "^16.13.1" }, "dependencies": { - "@flyteorg/common": "^0.0.2", - "@flyteorg/console": "^0.0.1", - "lodash": "^4.17.21", + "@flyteorg/common": "^0.0.3", + "@flyteorg/console": "^0.0.6", "long": "^4.0.0", "protobufjs": "~6.11.3", "react-ga4": "^1.4.1", @@ -45,14 +46,9 @@ "use-react-router": "^1.0.7" }, "devDependencies": { - "@types/long": "^3.0.32", - "@types/react": "^16.9.34", - "@types/react-dom": "^16.9.7", - "camelcase-keys": "^7.0.2", - "react-hot-loader": "^4.1.2" + "@types/long": "^3.0.32" }, "resolutions": { - "long": "^4.0.0", "protobufjs": "~6.11.3", "micromatch": "^4.0.0" } diff --git a/website/src/server/index.ts b/website/src/server/index.ts index a650b3300..c1ed3882f 100644 --- a/website/src/server/index.ts +++ b/website/src/server/index.ts @@ -41,7 +41,7 @@ app.use(env.BASE_URL, appRouter); const showEntryPointUrl = () => { console.log(chalk.magenta(`Express server ready!`)); - const url = `${env.ADMIN_API_USE_SSL}://${ + const url = `${env.ADMIN_API_USE_SSL}${ env.LOCAL_DEV_HOST || env.ADMIN_API_URL?.replace('https', '') }:${PORT}${env.BASE_URL}`; diff --git a/website/tsconfig.build.json b/website/tsconfig.build.json index 8ff98dd31..91ff36a6a 100644 --- a/website/tsconfig.build.json +++ b/website/tsconfig.build.json @@ -15,6 +15,10 @@ "references": [ { "path": "../packages/common/tsconfig.build.json" }, - { "path": "../packages/console/tsconfig.build.json" } + { "path": "../packages/console/tsconfig.build.json" }, + { "path": "../packages/flyte-api/tsconfig.build.json" }, + { "path": "../packages/flyteidl-types/tsconfig.build.json" }, + { "path": "../packages/locale/tsconfig.build.json" }, + { "path": "../packages/ui-atoms/tsconfig.build.json" } ] } diff --git a/website/tsconfig.json b/website/tsconfig.json index 69334a87d..5f8b1f13a 100644 --- a/website/tsconfig.json +++ b/website/tsconfig.json @@ -16,7 +16,7 @@ "noImplicitOverride": false }, - "include": ["src/**/*", "src/env.js", "./packages/*"], + "include": ["src/**/*", "env.js"], "references": [ { "path": "../packages/common" }, diff --git a/website/webpack.config.ts b/website/webpack.config.ts index 9d81de5ec..b2f5e3373 100644 --- a/website/webpack.config.ts +++ b/website/webpack.config.ts @@ -2,9 +2,7 @@ /* eslint-disable no-console */ import * as webpack from 'webpack'; import NodePolyfillPlugin from 'node-polyfill-webpack-plugin'; -import HTMLWebpackPlugin, { - Options as HtmlWebpackOptions, -} from 'html-webpack-plugin'; +import HTMLWebpackPlugin from 'html-webpack-plugin'; import { ASSETS_PATH as publicPath, processEnv } from './env'; import { @@ -17,7 +15,7 @@ import { getConfigFile, getDefinePlugin, statsWriterPlugin, - getResolveOptions, + resolveOptions, getModuleOptions, getShouldLoadReactFromCDN, logWebpackStats, @@ -38,18 +36,21 @@ module.exports = (_env: any, argv: { mode: Mode }) => { const webpackConfig = require(WEBPACK_PATHS[mode]); const shouldLoadReactFromCDN = getShouldLoadReactFromCDN(mode); - const htmlWebpackOptions: HtmlWebpackOptions = merge(DEFAULT_HTML_WPC_OPTS, { - ...webpackConfig.htmlWebpackOptions, - processEnv: JSON.stringify(processEnv), - ...(shouldLoadReactFromCDN - ? { - cdnSettings: { - cdnReact: CDN_REACT, - cdnReactDOM: CDN_REACT_DOM, - }, - } - : {}), - }); + const htmlWebpackOptions: HTMLWebpackPlugin.Options = merge( + DEFAULT_HTML_WPC_OPTS, + { + ...webpackConfig.htmlWebpackOptions, + processEnv: JSON.stringify(processEnv), + ...(shouldLoadReactFromCDN + ? { + cdnSettings: { + cdnReact: CDN_REACT, + cdnReactDOM: CDN_REACT_DOM, + }, + } + : {}), + }, + ); /** * Client configuration @@ -83,7 +84,7 @@ module.exports = (_env: any, argv: { mode: Mode }) => { } : {}), - resolve: getResolveOptions(mode), + resolve: resolveOptions, module: getModuleOptions(mode), @@ -160,7 +161,7 @@ module.exports = (_env: any, argv: { mode: Mode }) => { externals: [nodeExternals({ allowlist: /lyft/ })], externalsPresets: { node: true }, - resolve: getResolveOptions(mode), + resolve: resolveOptions, module: getModuleOptions(mode), diff --git a/website/webpack.dev.config.ts b/website/webpack.dev.config.ts index 70e98edb4..5ec3d25e4 100644 --- a/website/webpack.dev.config.ts +++ b/website/webpack.dev.config.ts @@ -19,7 +19,7 @@ export const htmlWebpackOptions: HtmlWebpackOptions = { minify: false, hash: false, showErrors: true, -} +}; /** * Client configuration @@ -28,7 +28,7 @@ export const htmlWebpackOptions: HtmlWebpackOptions = { */ export const clientConfig: ClientConfig = { mode: 'development', - devtool:'eval-source-map', + devtool: 'eval-source-map', output: { filename: '[name].js', }, @@ -66,32 +66,16 @@ export const clientConfig: ClientConfig = { serverSideRender: true, }, }, - plugins: [ - new webpack.HotModuleReplacementPlugin(), - // new HTMLWebpackPlugin({ - // template: './src/assets/index.html', - // publicPath, - // inject: 'body', - // minify: false, - // hash: false, - // showErrors: true, - // processEnv: JSON.stringify(processEnv), - // ...(shouldLoadReactFromCDN ? { - // cdnReact, - // cdnReactDOM - // } : {}) - // }), - ], - -} + plugins: [], +}; /** * Server configuration * * Server bundle is compiled as a CommonJS package that exports an Express middleware */ -export const serverConfig: webpack.Configuration ={ - devtool:'eval-source-map', +export const serverConfig: webpack.Configuration = { + devtool: 'eval-source-map', }; -export default {clientConfig, serverConfig}; +export default { clientConfig, serverConfig }; diff --git a/website/webpack.utilities.ts b/website/webpack.utilities.ts index 51c023624..6f32fcadd 100644 --- a/website/webpack.utilities.ts +++ b/website/webpack.utilities.ts @@ -1,7 +1,8 @@ /* eslint-disable no-console */ +import * as webpack from 'webpack'; import * as path from 'path'; import chalk from 'chalk'; -import webpack, { WebpackOptionsNormalized } from 'webpack'; +import { WebpackOptionsNormalized } from 'webpack'; import type { Configuration as DevServerConfiguration } from 'webpack-dev-server'; import { Options as HtmlWebpackOptions } from 'html-webpack-plugin'; @@ -69,8 +70,8 @@ export const WEBPACK_PATHS = { // Determines which config file to use based on current development mode. export const getConfigFile = (mode: Mode): string => mode === 'production' - ? path.resolve(__dirname, './tsconfig.prod.json') - : path.resolve(__dirname, './tsconfig.json'); + ? path.resolve(__dirname, './tsconfig.build.json') + : path.resolve(__dirname, './tsconfig.build.json'); // Determines whether to use CDN based on current development mode. export const getShouldLoadReactFromCDN = (mode: Mode) => @@ -197,7 +198,7 @@ const getDefinePluginOptions = (isServer: boolean) => ({ }, }); -export const getResolveOptions = (mode: Mode): webpack.ResolveOptions => ({ +export const resolveOptions = { /** Base directories that Webpack will look into resolve absolutely imported modules */ modules: ['src', 'node_modules'], /** Extension that are allowed to be omitted from import statements */ @@ -205,31 +206,19 @@ export const getResolveOptions = (mode: Mode): webpack.ResolveOptions => ({ /** "main" fields in package.json files to resolve a CommonJS module for */ mainFields: ['browser', 'module', 'main'], // when in production, only use published package versions - ...(mode !== 'production' - ? { - alias: { - '@flyteorg/locale': path.resolve(__dirname, '../packages/locale/src'), - '@flyteorg/flyte-api': path.resolve( - __dirname, - '../packages/flyte-api/src', - ), - '@flyteorg/flyteidl-types': path.resolve( - __dirname, - '../packages/flyteidl-types/src', - ), - '@flyteorg/ui-atoms': path.resolve( - __dirname, - '../packages/ui-atoms/src', - ), - '@flyteorg/components': path.resolve( - __dirname, - '../packages/components/src', - ), - '@flyteorg/console': path.resolve( - __dirname, - '../packages/console/src', - ), - }, - } - : {}), -}); + alias: { + '@flyteorg/locale': path.resolve(__dirname, '../packages/locale/src'), + '@flyteorg/flyte-api': path.resolve(__dirname, '../packages/flyte-api/src'), + '@flyteorg/flyteidl-types': path.resolve( + __dirname, + '../packages/flyteidl-types/src', + ), + '@flyteorg/ui-atoms': path.resolve(__dirname, '../packages/ui-atoms/src'), + '@flyteorg/components': path.resolve( + __dirname, + '../packages/components/src', + ), + '@flyteorg/common': path.resolve(__dirname, '../packages/common/src'), + '@flyteorg/console': path.resolve(__dirname, '../packages/console/src'), + }, +}; diff --git a/yarn.lock b/yarn.lock index 014e0a0c0..c716926e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1985,56 +1985,30 @@ __metadata: version: 0.0.0-use.local resolution: "@flyteconsole/client-app@workspace:website" dependencies: - "@flyteorg/common": ^0.0.2 - "@flyteorg/console": ^0.0.1 + "@flyteorg/common": ^0.0.3 + "@flyteorg/console": ^0.0.6 "@types/long": ^3.0.32 - "@types/react": ^16.9.34 - "@types/react-dom": ^16.9.7 - camelcase-keys: ^7.0.2 - lodash: ^4.17.21 long: ^4.0.0 protobufjs: ~6.11.3 react-ga4: ^1.4.1 - react-hot-loader: ^4.1.2 react-router: ^5.3.4 react-router-dom: ^5.3.4 use-react-router: ^1.0.7 peerDependencies: + "@types/react": ^16.9.34 + "@types/react-dom": ^16.9.7 react: ^16.13.1 react-dom: ^16.13.1 languageName: unknown linkType: soft -"@flyteorg/common@npm:0.0.2, @flyteorg/common@npm:^0.0.2": - version: 0.0.2 - resolution: "@flyteorg/common@npm:0.0.2" - checksum: 556958fdf15fee1c13c11db6ab9bf7d6341a91b4d67909f6350575b7824a1e4c62f37c48b78ec177104f6ba62b7cad4862e4c7e29e75088ea9410d72a97ba21a - languageName: node - linkType: hard - -"@flyteorg/common@workspace:packages/common": +"@flyteorg/common@^0.0.3, @flyteorg/common@workspace:packages/common": version: 0.0.0-use.local resolution: "@flyteorg/common@workspace:packages/common" languageName: unknown linkType: soft -"@flyteorg/components@npm:0.0.2, @flyteorg/components@npm:^0.0.2": - version: 0.0.2 - resolution: "@flyteorg/components@npm:0.0.2" - dependencies: - "@flyteorg/locale": 0.0.1 - "@flyteorg/ui-atoms": 0.0.2 - "@material-ui/core": ^4.0.0 - "@material-ui/icons": ^4.0.0 - classnames: ^2.3.1 - peerDependencies: - react: ^16.13.1 - react-dom: ^16.13.1 - checksum: 8c91d52e333edbcb0e21ccd99007977a869a8b8ccbde939b44f81149e86cd9bb70805118ecfe1f97f4bfa9b2fc9064f21adfb24686bb318e2b7340aeab7f5815 - languageName: node - linkType: hard - -"@flyteorg/components@workspace:packages/components": +"@flyteorg/components@^0.0.3, @flyteorg/components@workspace:packages/components": version: 0.0.0-use.local resolution: "@flyteorg/components@workspace:packages/components" dependencies: @@ -2051,88 +2025,18 @@ __metadata: languageName: unknown linkType: soft -"@flyteorg/console@npm:^0.0.1": - version: 0.0.1 - resolution: "@flyteorg/console@npm:0.0.1" - dependencies: - "@date-io/moment": 1.3.9 - "@emotion/core": 10.1.1 - "@flyteorg/common": 0.0.2 - "@flyteorg/components": 0.0.2 - "@flyteorg/flyte-api": 0.0.1 - "@flyteorg/flyteidl-types": 0.0.1 - "@flyteorg/locale": 0.0.1 - "@flyteorg/ui-atoms": 0.0.2 - "@material-ui/core": ^4.12.4 - "@material-ui/icons": ^4.11.3 - "@material-ui/pickers": ^3.2.2 - "@rjsf/core": 3.2.1 - "@rjsf/material-ui": 3.2.1 - "@rjsf/utils": ^5.0.0-beta.12 - "@rjsf/validator-ajv6": ^5.0.0-beta.12 - "@types/d3-shape": ^1.2.6 - "@xstate/react": ^1.0.0 - axios: ^0.27.2 - chart.js: 3.6.2 - chartjs-plugin-datalabels: 2.0.0 - classnames: ^2.3.1 - copy-to-clipboard: ^3.0.8 - cronstrue: ^1.31.0 - d3-dag: ^0.3.4 - d3-shape: ^1.2.2 - dagre: 0.8.5 - dagre-d3: ^0.6.4 - debug: 2.6.9 - dom-helpers: ^3.4.0 - fuzzysort: ^1.1.1 - intersection-observer: ^0.7.0 - js-yaml: ^3.13.1 - linkify-it: ^2.2.0 - lodash: ^4.17.21 - lossless-json: ^1.0.3 - memoize-one: ^5.0.0 - moment: ^2.29.4 - moment-timezone: ^0.5.28 - notistack: ^1.0.10 - object-hash: ^1.3.1 - prop-types: 15.6.0 - query-string: ^6.5.0 - react-chartjs-2: ^4.3.1 - react-flow-renderer: 10.3.8 - react-ga4: ^1.4.1 - react-intersection-observer: ^8.25.1 - react-json-view: ^1.21.3 - react-loading-skeleton: ^1.1.2 - react-query: 3.3.0 - react-query-devtools: 3.0.0-beta.1 - react-virtualized: ^9.21.1 - shallowequal: ^1.1.0 - url-search-params: ^0.10.0 - xstate: 4.33.6 - peerDependencies: - long: ^4.0.0 - protobufjs: ~6.11.3 - react: ^16.14.0 - react-dom: ^16.14.0 - react-router: ^5.3.4 - react-router-dom: ^5.3.4 - use-react-router: ^1.0.7 - checksum: 522a0bce3e8d7f8857f4b5d2a1f715d06fc04fe86a58fb73645c6cb1f3a2e81edc775cec87f7f534692c4789154116cbdff89c7050d65ecad16f2f91f9d32bfa - languageName: node - linkType: hard - -"@flyteorg/console@workspace:packages/console": +"@flyteorg/console@^0.0.6, @flyteorg/console@workspace:packages/console": version: 0.0.0-use.local resolution: "@flyteorg/console@workspace:packages/console" dependencies: "@date-io/moment": 1.3.9 "@emotion/core": 10.1.1 - "@flyteorg/common": ^0.0.2 - "@flyteorg/components": ^0.0.2 - "@flyteorg/flyte-api": ^0.0.1 - "@flyteorg/flyteidl-types": ^0.0.2 - "@flyteorg/locale": ^0.0.1 - "@flyteorg/ui-atoms": ^0.0.2 + "@flyteorg/common": ^0.0.3 + "@flyteorg/components": ^0.0.3 + "@flyteorg/flyte-api": ^0.0.2 + "@flyteorg/flyteidl-types": ^0.0.3 + "@flyteorg/locale": ^0.0.2 + "@flyteorg/ui-atoms": ^0.0.3 "@material-ui/core": ^4.12.4 "@material-ui/icons": ^4.11.3 "@material-ui/pickers": ^3.2.2 @@ -2207,21 +2111,7 @@ __metadata: languageName: unknown linkType: soft -"@flyteorg/flyte-api@npm:0.0.1, @flyteorg/flyte-api@npm:^0.0.1": - version: 0.0.1 - resolution: "@flyteorg/flyte-api@npm:0.0.1" - dependencies: - axios: ^0.27.2 - camelcase-keys: ^7.0.2 - snakecase-keys: ^5.4.2 - peerDependencies: - react: ^16.14.0 - react-dom: ^16.14.0 - checksum: e027dd77826cc4fc3bdfb8986e78ea8847718aaee299ce5635848ea09f12d33eb469bd2fb71f973a62faf9851b46e85bd2e88d0aca13e7d53ef43b3b50bd7242 - languageName: node - linkType: hard - -"@flyteorg/flyte-api@workspace:packages/flyte-api": +"@flyteorg/flyte-api@^0.0.2, @flyteorg/flyte-api@workspace:packages/flyte-api": version: 0.0.0-use.local resolution: "@flyteorg/flyte-api@workspace:packages/flyte-api" dependencies: @@ -2236,29 +2126,7 @@ __metadata: languageName: unknown linkType: soft -"@flyteorg/flyteidl-types@npm:0.0.1": - version: 0.0.1 - resolution: "@flyteorg/flyteidl-types@npm:0.0.1" - dependencies: - "@flyteorg/flyteidl": ^1.3.0 - peerDependencies: - protobufjs: ~6.11.3 - checksum: 530bff2602dd0047bdda68d1c148dca43a62047a4f78bc14dbaf8f1020707a1d32932bf88c4f6b7703bb11ecb6100d8fd922b46e77c3bd6e9234488cc385b143 - languageName: node - linkType: hard - -"@flyteorg/flyteidl-types@npm:^0.0.2": - version: 0.0.2 - resolution: "@flyteorg/flyteidl-types@npm:0.0.2" - dependencies: - "@flyteorg/flyteidl": ^1.3.0 - peerDependencies: - protobufjs: ~6.11.3 - checksum: 52daf4d88c6e48bd778d44aff21016b97a0941bd87f2d8236ae04a91e590d3e970541d2b18f2017248ff51dc9774a9110cd0e649051745415874a5744c335838 - languageName: node - linkType: hard - -"@flyteorg/flyteidl-types@workspace:packages/flyteidl-types": +"@flyteorg/flyteidl-types@^0.0.3, @flyteorg/flyteidl-types@workspace:packages/flyteidl-types": version: 0.0.0-use.local resolution: "@flyteorg/flyteidl-types@workspace:packages/flyteidl-types" dependencies: @@ -2284,13 +2152,6 @@ __metadata: languageName: unknown linkType: soft -"@flyteorg/locale@npm:0.0.1, @flyteorg/locale@npm:^0.0.1": - version: 0.0.1 - resolution: "@flyteorg/locale@npm:0.0.1" - checksum: 69c372b9e748850f5be3d6157cccd66dfb5acee43a22875f0d45155281e81928ed5bb849e663978b141facc128f92e466465a5d35f6f58558950dedda127faf5 - languageName: node - linkType: hard - "@flyteorg/ui-atoms@^0.0.3, @flyteorg/ui-atoms@workspace:packages/ui-atoms": version: 0.0.0-use.local resolution: "@flyteorg/ui-atoms@workspace:packages/ui-atoms" @@ -2307,21 +2168,6 @@ __metadata: languageName: unknown linkType: soft -"@flyteorg/ui-atoms@npm:0.0.2, @flyteorg/ui-atoms@npm:^0.0.2": - version: 0.0.2 - resolution: "@flyteorg/ui-atoms@npm:0.0.2" - dependencies: - "@emotion/core": 10.1.1 - "@material-ui/core": ^4.0.0 - "@material-ui/icons": ^4.0.0 - classnames: ^2.3.1 - peerDependencies: - react: ^16.13.1 - react-dom: ^16.13.1 - checksum: ce520d02c21f600328481f8022354c3c470ad304fa13ab236b712e1e358fd55392b3fd16ed476d83372d6e70266bcd389b663a0157fe9aeefa8cfcf7a1a93534 - languageName: node - linkType: hard - "@gar/promisify@npm:^1.0.1, @gar/promisify@npm:^1.1.3": version: 1.1.3 resolution: "@gar/promisify@npm:1.1.3" @@ -11170,16 +11016,16 @@ __metadata: languageName: node linkType: hard -"express-static-gzip@npm:^0.3.2": - version: 0.3.2 - resolution: "express-static-gzip@npm:0.3.2" +"express-static-gzip@npm:^2.1.7": + version: 2.1.7 + resolution: "express-static-gzip@npm:2.1.7" dependencies: - serve-static: ^1.12.3 - checksum: bb75c6e26d8fc24fd17caf0b0e803eecb245d96b9d83312abdf6848e43f2cb2266fde3645dc0950c089f1c526abe73b2e26fec17d7e236c9a1fd93991da2643c + serve-static: ^1.14.1 + checksum: 7415f5c44ae30c6dec7cd1028bc34e9d2f7fc263bcb97aca5b1b0be62ecf630757c27b864e3a5a8f413a52909de1ea81c6f104f1a578303cb8bdaeb293cafcd0 languageName: node linkType: hard -"express@npm:^4.14.0, express@npm:^4.17.1, express@npm:^4.17.3": +"express@npm:^4.17.1, express@npm:^4.17.3, express@npm:^4.18.1": version: 4.18.2 resolution: "express@npm:4.18.2" dependencies: @@ -11656,9 +11502,9 @@ __metadata: eslint-plugin-jsx-a11y: ^6.5.1 eslint-plugin-react: ^7.29.4 eslint-plugin-react-hooks: ^4.3.0 - express: ^4.14.0 - express-static-gzip: ^0.3.2 - fork-ts-checker-webpack-plugin: ^7.2.1 + express: ^4.18.1 + express-static-gzip: ^2.1.7 + fork-ts-checker-webpack-plugin: ^7.2.11 html-webpack-plugin: ^5.5.0 husky: ^8.0.2 jest: ^26.0.0 @@ -11679,12 +11525,12 @@ __metadata: tslib: ^2.4.1 typescript: ^4.9.4 wait-on: ^6.0.1 - webpack: ^5.68.0 - webpack-cli: ^4.9.2 - webpack-dev-server: ^4.8.1 + webpack: ^5.74.0 + webpack-cli: ^4.10.0 + webpack-dev-server: ^4.7.4 webpack-merge: ^5.8.0 webpack-node-externals: ^3.0.0 - webpack-stats-plugin: ^1.0.3 + webpack-stats-plugin: ^1.1.1 languageName: unknown linkType: soft @@ -11779,7 +11625,7 @@ __metadata: languageName: node linkType: hard -"fork-ts-checker-webpack-plugin@npm:^7.2.1": +"fork-ts-checker-webpack-plugin@npm:^7.2.11": version: 7.2.14 resolution: "fork-ts-checker-webpack-plugin@npm:7.2.14" dependencies: @@ -12242,7 +12088,7 @@ __metadata: languageName: node linkType: hard -"global@npm:^4.3.0, global@npm:^4.4.0": +"global@npm:^4.4.0": version: 4.4.0 resolution: "global@npm:4.4.0" dependencies: @@ -15274,7 +15120,7 @@ __metadata: languageName: node linkType: hard -"loader-utils@npm:^2.0.0, loader-utils@npm:^2.0.3, loader-utils@npm:^2.0.4": +"loader-utils@npm:^2.0.0, loader-utils@npm:^2.0.4": version: 2.0.4 resolution: "loader-utils@npm:2.0.4" dependencies: @@ -18213,7 +18059,7 @@ __metadata: languageName: node linkType: hard -"prop-types@npm:^15.0.0, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": +"prop-types@npm:^15.0.0, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": version: 15.8.1 resolution: "prop-types@npm:15.8.1" dependencies: @@ -18632,29 +18478,6 @@ __metadata: languageName: node linkType: hard -"react-hot-loader@npm:^4.1.2": - version: 4.13.1 - resolution: "react-hot-loader@npm:4.13.1" - dependencies: - fast-levenshtein: ^2.0.6 - global: ^4.3.0 - hoist-non-react-statics: ^3.3.0 - loader-utils: ^2.0.3 - prop-types: ^15.6.1 - react-lifecycles-compat: ^3.0.4 - shallowequal: ^1.1.0 - source-map: ^0.7.3 - peerDependencies: - "@types/react": ^15.0.0 || ^16.0.0 || ^17.0.0 - react: ^15.0.0 || ^16.0.0 || ^17.0.0 - react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0 - peerDependenciesMeta: - "@types/react": - optional: true - checksum: f90890d5160dcb2bfae4022cba065d8e5c26b86f34c4604cbbdd39f5e4dfd82c05c317bb05ef3d4da2aa0be7e8e205c905daea1af40d3a7ef0d07c3d289da11c - languageName: node - linkType: hard - "react-inspector@npm:^5.1.0": version: 5.1.1 resolution: "react-inspector@npm:5.1.1" @@ -19836,7 +19659,7 @@ __metadata: languageName: node linkType: hard -"serve-static@npm:1.15.0, serve-static@npm:^1.12.3": +"serve-static@npm:1.15.0, serve-static@npm:^1.12.3, serve-static@npm:^1.14.1": version: 1.15.0 resolution: "serve-static@npm:1.15.0" dependencies: @@ -22337,7 +22160,7 @@ __metadata: languageName: node linkType: hard -"webpack-cli@npm:^4.9.2": +"webpack-cli@npm:^4.10.0": version: 4.10.0 resolution: "webpack-cli@npm:4.10.0" dependencies: @@ -22416,7 +22239,7 @@ __metadata: languageName: node linkType: hard -"webpack-dev-server@npm:^4.8.1": +"webpack-dev-server@npm:^4.7.4": version: 4.11.1 resolution: "webpack-dev-server@npm:4.11.1" dependencies: @@ -22524,7 +22347,7 @@ __metadata: languageName: node linkType: hard -"webpack-stats-plugin@npm:^1.0.3": +"webpack-stats-plugin@npm:^1.1.1": version: 1.1.1 resolution: "webpack-stats-plugin@npm:1.1.1" checksum: aa553ccfb9389f2d8a2d04eb6289230bc323edb11b0cbdd676d41617dd790a7f0d0844c46b927a9465139b3edb9da2cc7a2ef664891920c052ef4fa5f2797230 @@ -22585,7 +22408,7 @@ __metadata: languageName: node linkType: hard -"webpack@npm:>=4.43.0 <6.0.0, webpack@npm:^5.68.0, webpack@npm:^5.9.0": +"webpack@npm:>=4.43.0 <6.0.0, webpack@npm:^5.74.0, webpack@npm:^5.9.0": version: 5.75.0 resolution: "webpack@npm:5.75.0" dependencies: