Skip to content

Commit

Permalink
Merge branch 'master' into james/gate-node-reject
Browse files Browse the repository at this point in the history
  • Loading branch information
james-union committed Mar 27, 2023
2 parents 27b13c8 + 6816a5f commit 38512c8
Show file tree
Hide file tree
Showing 14 changed files with 80 additions and 63 deletions.
46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,27 @@
]
},
"dependencies": {
"@babel/core": "~7.16.12",
"@babel/preset-env": "~7.16.11",
"@commitlint/cli": "^17.3.0",
"@commitlint/config-conventional": "^17.3.0",
"@material-ui/core": "^4.2.0",
"@material-ui/icons": "^4.2.1",
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/commit-analyzer": "^8.0.1",
"@semantic-release/git": "^9.0.0",
"@semantic-release/github": "^7.0.5",
"@semantic-release/npm": "^7.0.5",
"@semantic-release/release-notes-generator": "^9.0.1",
"@testing-library/jest-dom": "^5.5.0",
"@testing-library/react": "^10.0.3",
"@testing-library/react-hooks": "^7.0.2",
"@types/morgan": "^1.9.4",
"@types/react": "^16.14.35",
"@types/react-dom": "^16.9.7",
"@typescript-eslint/eslint-plugin": "^5.48.2",
"@typescript-eslint/parser": "^5.48.2",
"babel-loader": "^8.2.5",
"chalk": "^4",
"compression-webpack-plugin": "^9.2.0",
"cookie-parser": "^1.4.3",
Expand All @@ -75,12 +91,18 @@
"fork-ts-checker-webpack-plugin": "^7.2.11",
"html-webpack-plugin": "^5.5.0",
"husky": "^8.0.2",
"jest": "^26.0.0",
"jest-transformer-svg": "^2.0.0",
"lint-staged": "^13.1.0",
"morgan": "^1.10.0",
"msw": "^0.24.1",
"node-polyfill-webpack-plugin": "^2.0.1",
"prettier": "^2.8.3",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"serve-static": "^1.12.3",
"source-map-loader": "^4.0.1",
"ts-jest": "^26.3.0",
"ts-loader": "^9.2.6",
"ts-node": "^8.0.2",
"tsc-alias": "^1.7.0",
Expand All @@ -95,36 +117,14 @@
"webpack-node-externals": "^3.0.0"
},
"devDependencies": {
"@babel/core": "~7.16.12",
"@babel/preset-env": "~7.16.11",
"@commitlint/cli": "^17.3.0",
"@commitlint/config-conventional": "^17.3.0",
"@material-ui/core": "^4.2.0",
"@material-ui/icons": "^4.2.1",
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/commit-analyzer": "^8.0.1",
"@semantic-release/git": "^9.0.0",
"@semantic-release/github": "^7.0.5",
"@semantic-release/npm": "^7.0.5",
"@semantic-release/release-notes-generator": "^9.0.1",
"@storybook/addon-actions": "^6.4.19",
"@storybook/addon-essentials": "^6.4.19",
"@storybook/addon-interactions": "^6.4.19",
"@storybook/addon-links": "^6.4.19",
"@storybook/builder-webpack5": "^6.4.19",
"@storybook/manager-webpack5": "^6.4.19",
"@storybook/react": "^6.4.19",
"@storybook/testing-library": "^0.0.9",
"@testing-library/jest-dom": "^5.5.0",
"@testing-library/react": "^10.0.3",
"@testing-library/react-hooks": "^7.0.2",
"babel-loader": "^8.2.5",
"jest": "^26.0.0",
"jest-transformer-svg": "^2.0.0",
"msw": "^0.24.1",
"serve-static": "^1.12.3",
"source-map-loader": "^3.0.1",
"ts-jest": "^26.3.0"
"@storybook/testing-library": "^0.0.9"
},
"resolutions": {
"@babel/cli": "~7.16.0",
Expand Down
5 changes: 4 additions & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@
},
"scripts": {
"clean": "rm -rf dist && rm -rf lib && rm -rf **.tsbuildinfo || true",
"build:watch": "run -T tsc-watch --noClear --signalEmittedFiles -p ./tsconfig.build.es.json --onSuccess \"yarn build:watch:success\"",
"build:watch:success": "yarn build:esm:alias && yalc push --force",
"build": "yarn clean && yarn build:esm && yarn build:cjs",
"build:esm": "run -T tsc --module esnext --project ./tsconfig.build.es.json && run -T tsc-alias -p ./tsconfig.build.es.json",
"build:esm": "run -T tsc --module esnext --project ./tsconfig.build.es.json && yarn build:esm:alias",
"build:esm:alias": "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:types": "run -T tsc --module esnext --project ./tsconfig.build.es.json --emitDeclarationOnly && run -T tsc-alias -p ./tsconfig.build.es.json",
"test": "NODE_ENV=test jest"
Expand Down
5 changes: 4 additions & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@
},
"scripts": {
"clean": "rm -rf dist && rm -rf lib && rm -rf **.tsbuildinfo || true",
"build:watch": "run -T tsc-watch --noClear --signalEmittedFiles -p ./tsconfig.build.es.json --onSuccess \"yarn build:watch:success\"",
"build:watch:success": "yarn build:esm:alias && yalc push --force",
"build": "yarn clean && yarn build:esm && yarn build:cjs",
"build:esm": "run -T tsc --module esnext --project ./tsconfig.build.es.json && run -T tsc-alias -p ./tsconfig.build.es.json",
"build:esm": "run -T tsc --module esnext --project ./tsconfig.build.es.json && yarn build:esm:alias",
"build:esm:alias": "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:types": "run -T tsc --module esnext --project ./tsconfig.build.es.json --emitDeclarationOnly && run -T tsc-alias -p ./tsconfig.build.es.json",
"test": "NODE_ENV=test jest"
Expand Down
4 changes: 2 additions & 2 deletions packages/console/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@flyteorg/console",
"version": "0.0.16",
"version": "0.0.17",
"description": "Flyteconsole main app module",
"main": "./dist/index.js",
"module": "./lib/index.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
"debug": "NM_DEBUG_LEVEL=2 yarn",
"clean": "rm -rf dist && rm -rf lib && rm -rf **.tsbuildinfo || true",
"build:watch": "run -T tsc-watch --noClear --signalEmittedFiles -p ./tsconfig.build.es.json --onSuccess \"yarn build:watch:success\"",
"build:watch:success": "yarn build:esm:alias && yalc push",
"build:watch:success": "yarn build:esm:alias && yalc push --force",
"build": "yarn clean && yarn build:esm && yarn build:cjs",
"build:esm": "mkdir lib && cp -R src/assets ./lib && run -T tsc --module esnext --project ./tsconfig.build.es.json && yarn build:esm:alias",
"build:esm:alias": "run -T tsc-alias -p ./tsconfig.build.es.json",
Expand Down
13 changes: 13 additions & 0 deletions packages/console/src/components/Executions/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export * from './types';
export { type ExecutionDetailsRouteParams } from './ExecutionDetails/ExecutionDetails';
export { ExecutionStatusBadge } from './ExecutionStatusBadge';
export { formatRetryAttempt } from './TaskExecutionsList/utils';
export { TaskExecutionDetails } from './TaskExecutionsList/TaskExecutionDetails';
export { makeTaskExecutionListQuery } from './taskExecutionQueries';
export { useWorkflowExecutionQuery } from './useWorkflowExecution';
export { NodeExecutionDetailsContextProvider } from './contextProvider/NodeExecutionDetails';
export { getNodeFrontendPhase } from './utils';
export { useWorkflowExecutionData } from './useWorkflowExecution';
export { useNodeExecutionContext } from './contextProvider/NodeExecutionDetails';
export { ExecutionDetailsActions } from './ExecutionDetails/ExecutionDetailsActions';
export { makeNodeExecutionQuery } from './nodeExecutionQueries';
1 change: 1 addition & 0 deletions packages/console/src/components/Navigation/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './UserInformation';
export { NavBarContent } from './NavBarContent';
2 changes: 2 additions & 0 deletions packages/console/src/components/hooks/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { useNodeExecution } from './useNodeExecution';
export { useConditionalQuery } from './useConditionalQuery';
23 changes: 4 additions & 19 deletions packages/console/src/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,7 @@
export * from './common';

export * from './Navigation';
export * from './App/App';
export * from './Navigation';

export { NavBarContent } from './Navigation/NavBarContent';
export { useNodeExecution } from './hooks/useNodeExecution';
export { useConditionalQuery } from './hooks/useConditionalQuery';
export * from './Executions';

export * from './Executions/types';
export { type ExecutionDetailsRouteParams } from './Executions/ExecutionDetails/ExecutionDetails';
export { ExecutionStatusBadge } from './Executions/ExecutionStatusBadge';
export { formatRetryAttempt } from './Executions/TaskExecutionsList/utils';
export { TaskExecutionDetails } from './Executions/TaskExecutionsList/TaskExecutionDetails';
export { makeTaskExecutionListQuery } from './Executions/taskExecutionQueries';
export { useWorkflowExecutionQuery } from './Executions/useWorkflowExecution';
export { NodeExecutionDetailsContextProvider } from './Executions/contextProvider/NodeExecutionDetails';
export { getNodeFrontendPhase } from './Executions/utils';
export { useWorkflowExecutionData } from './Executions/useWorkflowExecution';
export { useNodeExecutionContext } from './Executions/contextProvider/NodeExecutionDetails';
export { ExecutionDetailsActions } from './Executions/ExecutionDetails/ExecutionDetailsActions';
export { makeNodeExecutionQuery } from './Executions/nodeExecutionQueries';
export * from './hooks';
export * from './common';
5 changes: 4 additions & 1 deletion packages/flyte-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@
},
"scripts": {
"clean": "rm -rf dist && rm -rf lib && rm -rf **.tsbuildinfo || true",
"build:watch": "run -T tsc-watch --noClear --signalEmittedFiles -p ./tsconfig.build.es.json --onSuccess \"yarn build:watch:success\"",
"build:watch:success": "yarn build:esm:alias && yalc push --force",
"build": "yarn clean && yarn build:esm && yarn build:cjs",
"build:esm": "run -T tsc --module esnext --project ./tsconfig.build.es.json && run -T tsc-alias -p ./tsconfig.build.es.json",
"build:esm": "run -T tsc --module esnext --project ./tsconfig.build.es.json && yarn build:esm:alias",
"build:esm:alias": "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:types": "run -T tsc --module esnext --project ./tsconfig.build.es.json --emitDeclarationOnly && run -T tsc-alias -p ./tsconfig.build.es.json",
"push:update": "yarn clean && yarn build && yarn publish",
Expand Down
5 changes: 4 additions & 1 deletion packages/flyteidl-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@
},
"scripts": {
"clean": "rm -rf dist && rm -rf lib && rm -rf **.tsbuildinfo || true",
"build:watch": "run -T tsc-watch --noClear --signalEmittedFiles -p ./tsconfig.build.es.json --onSuccess \"yarn build:watch:success\"",
"build:watch:success": "yarn build:esm:alias && yalc push --force",
"build": "yarn clean && yarn build:esm && yarn build:cjs",
"build:esm": "run -T tsc --module esnext --project ./tsconfig.build.es.json && run -T tsc-alias -p ./tsconfig.build.es.json",
"build:esm": "run -T tsc --module esnext --project ./tsconfig.build.es.json && yarn build:esm:alias",
"build:esm:alias": "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:types": "run -T tsc --module esnext --project ./tsconfig.build.es.json --emitDeclarationOnly && run -T tsc-alias -p ./tsconfig.build.es.json",
"test": "NODE_ENV=test jest"
Expand Down
3 changes: 2 additions & 1 deletion packages/locale/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"scripts": {
"clean": "rm -rf dist && rm -rf lib && rm -rf node_modules && rm -rf tsconfig.build.tsbuildinfo",
"build": "yarn clean && yarn build:esm && yarn build:cjs",
"build:esm": "run -T tsc --module esnext --project ./tsconfig.build.es.json && run -T tsc-alias -p ./tsconfig.build.es.json",
"build:esm": "run -T tsc --module esnext --project ./tsconfig.build.es.json && yarn build:esm:alias",
"build:esm:alias": "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:types": "run -T tsc --module esnext --project ./tsconfig.build.es.json --emitDeclarationOnly && run -T tsc-alias -p ./tsconfig.build.es.json",
"test": "NODE_ENV=test jest"
Expand Down
5 changes: 4 additions & 1 deletion packages/ui-atoms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@
],
"scripts": {
"clean": "rm -rf dist && rm -rf lib && rm -rf **.tsbuildinfo || true",
"build:watch": "run -T tsc-watch --noClear --signalEmittedFiles -p ./tsconfig.build.es.json --onSuccess \"yarn build:watch:success\"",
"build:watch:success": "yarn build:esm:alias && yalc push --force",
"build": "yarn clean && yarn build:esm && yarn build:cjs",
"build:esm": "run -T tsc --module esnext --project ./tsconfig.build.es.json && run -T tsc-alias -p ./tsconfig.build.es.json",
"build:esm": "run -T tsc --module esnext --project ./tsconfig.build.es.json && yarn build:esm:alias",
"build:esm:alias": "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:types": "run -T tsc --module esnext --project ./tsconfig.build.es.json --emitDeclarationOnly && run -T tsc-alias -p ./tsconfig.build.es.json",
"test": "NODE_ENV=test jest"
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"dependencies": {
"@flyteorg/common": "^0.0.3",
"@flyteorg/console": "^0.0.16",
"@flyteorg/console": "^0.0.17",
"long": "^4.0.0",
"protobufjs": "~6.11.3",
"react-ga4": "^1.4.1",
Expand Down
24 changes: 12 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1995,7 +1995,7 @@ __metadata:
resolution: "@flyteconsole/client-app@workspace:website"
dependencies:
"@flyteorg/common": ^0.0.3
"@flyteorg/console": ^0.0.16
"@flyteorg/console": ^0.0.17
"@types/long": ^3.0.32
long: ^4.0.0
protobufjs: ~6.11.3
Expand Down Expand Up @@ -2034,7 +2034,7 @@ __metadata:
languageName: unknown
linkType: soft

"@flyteorg/console@^0.0.16, @flyteorg/console@workspace:packages/console":
"@flyteorg/console@^0.0.17, @flyteorg/console@workspace:packages/console":
version: 0.0.0-use.local
resolution: "@flyteorg/console@workspace:packages/console"
dependencies:
Expand Down Expand Up @@ -6217,7 +6217,7 @@ __metadata:
languageName: node
linkType: hard

"abab@npm:^2.0.3, abab@npm:^2.0.5":
"abab@npm:^2.0.3, abab@npm:^2.0.5, abab@npm:^2.0.6":
version: 2.0.6
resolution: "abab@npm:2.0.6"
checksum: 6ffc1af4ff315066c62600123990d87551ceb0aafa01e6539da77b0f5987ac7019466780bf480f1787576d4385e3690c81ccc37cfda12819bf510b8ab47e5a3e
Expand Down Expand Up @@ -11580,7 +11580,7 @@ __metadata:
react: ^16.13.1
react-dom: ^16.13.1
serve-static: ^1.12.3
source-map-loader: ^3.0.1
source-map-loader: ^4.0.1
ts-jest: ^26.3.0
ts-loader: ^9.2.6
ts-node: ^8.0.2
Expand Down Expand Up @@ -20065,23 +20065,23 @@ __metadata:
languageName: node
linkType: hard

"source-map-js@npm:^1.0.1, source-map-js@npm:^1.0.2":
"source-map-js@npm:^1.0.2":
version: 1.0.2
resolution: "source-map-js@npm:1.0.2"
checksum: c049a7fc4deb9a7e9b481ae3d424cc793cb4845daa690bc5a05d428bf41bf231ced49b4cf0c9e77f9d42fdb3d20d6187619fc586605f5eabe995a316da8d377c
languageName: node
linkType: hard

"source-map-loader@npm:^3.0.1":
version: 3.0.2
resolution: "source-map-loader@npm:3.0.2"
"source-map-loader@npm:^4.0.1":
version: 4.0.1
resolution: "source-map-loader@npm:4.0.1"
dependencies:
abab: ^2.0.5
abab: ^2.0.6
iconv-lite: ^0.6.3
source-map-js: ^1.0.1
source-map-js: ^1.0.2
peerDependencies:
webpack: ^5.0.0
checksum: d5a4e2ab190c93ae5cba68c247fbaa9fd560333c91060602b634c399a8a4b3205b8c07714c3bcdb0a11c6cc5476c06256bd8e824e71fbbb7981e8fad5cba4a00
webpack: ^5.72.1
checksum: 4ddca8b03dc61f406effd4bffe70de4b87fef48bae6f737017b2dabcbc7d609133325be1e73838e9265331de28039111d729fcbb8bce88a6018a816bef510eb1
languageName: node
linkType: hard

Expand Down

0 comments on commit 38512c8

Please sign in to comment.