Skip to content

Commit

Permalink
Merge pull request #15 from vtex/fix/deps
Browse files Browse the repository at this point in the history
Update deps tree
  • Loading branch information
vitorflg authored Oct 29, 2024
2 parents a6ddbd0 + 6277dea commit 8fbcfdc
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 348 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [1.2.0] - 2021-03-12
### Changed
- Improve conflict resolver on promote

Expand Down
50 changes: 25 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ $ npm install -g @vtex/cli-plugin-workspace
$ oclif-example COMMAND
running command...
$ oclif-example (-v|--version|version)
@vtex/cli-plugin-workspace/1.1.0 linux-x64 node-v12.22.12
@vtex/cli-plugin-workspace/1.2.0 linux-x64 node-v12.22.12
$ oclif-example --help [COMMAND]
USAGE
$ oclif-example COMMAND
Expand Down Expand Up @@ -59,17 +59,17 @@ ARGUMENTS
OPTIONS
-f, --force Deletes the specified workspace even if it is currently in use.
-h, --help show CLI help
-v, --verbose Show debug level logs
-h, --help Shows this help message.
-v, --verbose Shows debug level logs.
-y, --yes Answers yes to all prompts.
--trace Ensure all requests to VTEX IO are traced
--trace Ensures all requests to VTEX IO are traced.
EXAMPLES
vtex workspace delete workspaceName
vtex workspace delete workspaceName1 workspaceName2
```

_See code: [build/commands/workspace/delete.ts](https://github.com/vtex/cli-plugin-workspace/blob/v1.1.0/build/commands/workspace/delete.ts)_
_See code: [build/commands/workspace/delete.ts](https://github.com/vtex/cli-plugin-workspace/blob/v1.2.0/build/commands/workspace/delete.ts)_

## `oclif-example workspace:list`

Expand All @@ -80,9 +80,9 @@ USAGE
$ oclif-example workspace:list
OPTIONS
-h, --help show CLI help
-v, --verbose Show debug level logs
--trace Ensure all requests to VTEX IO are traced
-h, --help Shows this help message.
-v, --verbose Shows debug level logs.
--trace Ensures all requests to VTEX IO are traced.
ALIASES
$ oclif-example workspace:ls
Expand All @@ -92,7 +92,7 @@ EXAMPLES
vtex workspace ls
```

_See code: [build/commands/workspace/list.ts](https://github.com/vtex/cli-plugin-workspace/blob/v1.1.0/build/commands/workspace/list.ts)_
_See code: [build/commands/workspace/list.ts](https://github.com/vtex/cli-plugin-workspace/blob/v1.2.0/build/commands/workspace/list.ts)_

## `oclif-example workspace:promote`

Expand All @@ -104,10 +104,10 @@ USAGE
OPTIONS
-h, --help
show CLI help
Shows this help message.
-v, --verbose
Show debug level logs
Shows debug level logs.
--conflict=master|mine|abort
[default: master] Defines how to handle data conflict between workspaces.
Expand All @@ -116,7 +116,7 @@ OPTIONS
- abort: Aborts the workspace promotion in case of data conflict.
--trace
Ensure all requests to VTEX IO are traced
Ensures all requests to VTEX IO are traced.
ALIASES
$ oclif-example promote
Expand All @@ -126,7 +126,7 @@ EXAMPLES
vtex promote
```

_See code: [build/commands/workspace/promote.ts](https://github.com/vtex/cli-plugin-workspace/blob/v1.1.0/build/commands/workspace/promote.ts)_
_See code: [build/commands/workspace/promote.ts](https://github.com/vtex/cli-plugin-workspace/blob/v1.2.0/build/commands/workspace/promote.ts)_

## `oclif-example workspace:reset [WORKSPACENAME]`

Expand All @@ -140,18 +140,18 @@ ARGUMENTS
WORKSPACENAME Name of the workspace to reset.
OPTIONS
-h, --help show CLI help
-h, --help Shows this help message.
-p, --production Recreates the workspace as a production one.
-v, --verbose Show debug level logs
-v, --verbose Shows debug level logs.
-y, --yes Answers yes to all prompts.
--trace Ensure all requests to VTEX IO are traced
--trace Ensures all requests to VTEX IO are traced.
EXAMPLES
vtex workspace reset
vtex workspace reset workspaceName
```

_See code: [build/commands/workspace/reset.ts](https://github.com/vtex/cli-plugin-workspace/blob/v1.1.0/build/commands/workspace/reset.ts)_
_See code: [build/commands/workspace/reset.ts](https://github.com/vtex/cli-plugin-workspace/blob/v1.2.0/build/commands/workspace/reset.ts)_

## `oclif-example workspace:status [WORKSPACENAME]`

Expand All @@ -165,15 +165,15 @@ ARGUMENTS
WORKSPACENAME Name of the workspace.
OPTIONS
-h, --help show CLI help
-v, --verbose Show debug level logs
--trace Ensure all requests to VTEX IO are traced
-h, --help Shows this help message.
-v, --verbose Shows debug level logs.
--trace Ensures all requests to VTEX IO are traced.
EXAMPLE
vtex workspace status
```

_See code: [build/commands/workspace/status.ts](https://github.com/vtex/cli-plugin-workspace/blob/v1.1.0/build/commands/workspace/status.ts)_
_See code: [build/commands/workspace/status.ts](https://github.com/vtex/cli-plugin-workspace/blob/v1.2.0/build/commands/workspace/status.ts)_

## `oclif-example workspace:use WORKSPACE`

Expand All @@ -187,11 +187,11 @@ ARGUMENTS
WORKSPACE Name of the workspace
OPTIONS
-h, --help show CLI help
-h, --help Shows this help message.
-p, --production Creates and/or switches to a production workspace.
-r, --reset Resets the workspace before switching to it.
-v, --verbose Show debug level logs
--trace Ensure all requests to VTEX IO are traced
-v, --verbose Shows debug level logs.
--trace Ensures all requests to VTEX IO are traced.
ALIASES
$ oclif-example use
Expand All @@ -201,5 +201,5 @@ EXAMPLES
vtex use workspaceName
```

_See code: [build/commands/workspace/use.ts](https://github.com/vtex/cli-plugin-workspace/blob/v1.1.0/build/commands/workspace/use.ts)_
_See code: [build/commands/workspace/use.ts](https://github.com/vtex/cli-plugin-workspace/blob/v1.2.0/build/commands/workspace/use.ts)_
<!-- commandsstop -->
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
{
"name": "@vtex/cli-plugin-workspace",
"description": "vtex plugin workspace",
"version": "1.1.0",
"version": "1.2.0",
"bugs": "https://github.com/vtex/cli-plugin-workspace/issues",
"dependencies": {
"@oclif/command": "^1",
"@oclif/command": "^1.8.0",
"@oclif/config": "^1",
"ramda": "^0.27.1",
"tslib": "^1"
"ora": "4.0.4",
"boxen": "4.2.0",
"tslib": "^1",
"@vtex/api": "npm:@vtex/[email protected]"
},
"devDependencies": {
"@oclif/dev-cli": "^1",
Expand All @@ -26,11 +29,9 @@
"nodemon-notifier-cli": "https://github.com/Slessi/nodemon-notifier-cli.git",
"prettier": "^2.0.1",
"ts-jest": "^25.2.1",
"vtex": "^4.2.0",
"ts-node": "^8",
"typescript": "^3.8.2",
"vtex-latest": "npm:[email protected]",
"vtex": "npm:[email protected]",
"@vtex/api": "npm:@vtex/[email protected]"
"typescript": "^3.8.2"
},
"engines": {
"node": ">=8.0.0"
Expand Down
2 changes: 1 addition & 1 deletion src/modules/promote.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import {
promptConfirm,
authUrl,
workspaceUse,
VBase,
COLORS,
} from 'vtex'

import { VBase } from 'vtex-latest'
import { MineWinsConflictsResolver } from '@vtex/api'

const vbase = VBase.createClient(undefined, {
Expand Down
Loading

0 comments on commit 8fbcfdc

Please sign in to comment.