Merge branch 'main' into release

This commit is contained in:
Thomas E Lackey 2020-11-19 16:20:02 -06:00
commit 3fca456188
7 changed files with 8 additions and 8 deletions

View File

@ -1,5 +1,5 @@
{
"version": "1.2.1",
"version": "1.2.2-alpha.3",
"useWorkspaces": true,
"npmClient": "yarn"
}

View File

@ -1,6 +1,6 @@
{
"name": "@dxos/console",
"version": "1.2.1-alpha.0",
"version": "1.2.2-alpha.0",
"description": "Console",
"main": "index.js",
"private": true,

View File

@ -1,6 +1,6 @@
{
"name": "@dxos/console-app",
"version": "1.2.1",
"version": "1.2.2-alpha.3",
"description": "Kubenet Console Client",
"repository": "https://github.com/dxos/console",
"main": "dist/es/index.js",

View File

@ -154,7 +154,7 @@ function SignalServers () {
}}
/>
</Grid>
<Grid item xs>
<Grid item xs style={{ overflow: 'scroll' }}>
<TableContainer>
<Table>
<TableHead>

View File

@ -1,7 +1,7 @@
{
"build": {
"name": "@dxos/console-app",
"buildDate": "2020-11-19T21:35:33.334Z",
"buildDate": "2020-11-19T22:11:06.119Z",
"version": "1.2.1-alpha.1"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "@dxos/console-server",
"version": "1.2.1",
"version": "1.2.2-alpha.3",
"description": "Kubenet Console Server",
"main": "dist/es/index.js",
"bin": {
@ -31,7 +31,7 @@
"dependencies": {
"@babel/polyfill": "^7.8.7",
"@babel/runtime": "^7.8.7",
"@dxos/console-app": "^1.2.1",
"@dxos/console-app": "^1.2.2-alpha.3",
"@wirelineio/wns-schema": "^0.1.1",
"apollo-boost": "^0.4.9",
"apollo-server-express": "^2.13.1",

View File

@ -38,7 +38,7 @@ const getCliVersionInfo = () => {
const args = ['version'];
const child = spawnSync(command, args, { encoding: 'utf8' });
return { version: child.stdout };
return child.stdout;
};
/**