Skip to content

Commit

Permalink
Merge branch 'next' into dependency-cleanup-v3
Browse files Browse the repository at this point in the history
  • Loading branch information
zFernand0 authored Mar 4, 2024
2 parents e447ba2 + 8509ede commit 135b7c7
Show file tree
Hide file tree
Showing 10 changed files with 74 additions and 33 deletions.
8 changes: 8 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.github
.husky
.vscode
dist
lib
node_modules
scripts
package-lock.json
3 changes: 3 additions & 0 deletions .vscode/extension.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["esbenp.prettier-vscode"]
}
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
// Standardize on the Prettier formatter
"editor.defaultFormatter": "esbenp.prettier-vscode",
// Enforce prettier on save
"editor.formatOnSave": true,
"npm.packageManager": "npm",
"eslint.packageManager": "npm"
}
76 changes: 52 additions & 24 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@zowe/cics_monorepo",
"private": true,
"version": "6.0.0-next.202402271249",
"version": "6.0.0-next.202403021451",
"publishConfig": {
"registry": "https://zowe.jfrog.io/zowe/api/npm/npm-local-release/"
},
Expand Down Expand Up @@ -31,8 +31,8 @@
"@typescript-eslint/eslint-plugin": "^5.57.1",
"@typescript-eslint/parser": "^5.57.1",
"@zowe/cli-test-utils": "^8.0.0-next.202402021649",
"@zowe/imperative": "^8.0.0-next.202402261705",
"@zowe/zowe-explorer-api": "^3.0.0-next.202402142205",
"@zowe/imperative": "^8.0.0-next.202402271901",
"@zowe/zowe-explorer-api": "^3.0.0-next",
"chalk": "^4.1.2",
"eslint": "^8.37.0",
"eslint-config-prettier": "^8.6.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/cics-for-zowe-cli",
"version": "6.0.0-next.202402271249",
"version": "6.0.0-next.202403011419",
"author": "Zowe",
"license": "EPL-2.0",
"description": "IBM CICS Plug-in for Zowe CLI",
Expand Down Expand Up @@ -51,7 +51,7 @@
"configurationModule": "lib/imperative.js"
},
"dependencies": {
"@zowe/cics-for-zowe-sdk": "6.0.0-next.202402271249"
"@zowe/cics-for-zowe-sdk": "6.0.0-next.202403011419"
},
"peerDependencies": {
"@zowe/imperative": ">=8.0.0-next.0 <8.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/cics-for-zowe-sdk",
"version": "6.0.0-next.202402271249",
"version": "6.0.0-next.202403011419",
"author": "Zowe",
"license": "EPL-2.0",
"description": "IBM CICS for Zowe SDK",
Expand Down
2 changes: 1 addition & 1 deletion packages/vsce/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All notable changes to the "cics-extension-for-zowe" extension will be documented in this file.

## Recent Changes
## `3.0.0-next.202403011419`

- BugFix: Fixed icons not displaying.[#112](https://github.com/zowe/cics-for-zowe-client/issues/112)
- BugFix: Updated dependencies for technical currency
Expand Down
4 changes: 2 additions & 2 deletions packages/vsce/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "git",
"url": "https://github.com/zowe/cics-for-zowe-client.git"
},
"version": "3.0.0-next.202402271249",
"version": "3.0.0-next.202403011419",
"engines": {
"vscode": "^1.79.0"
},
Expand Down Expand Up @@ -891,7 +891,7 @@
"vsce": "^2.15.0"
},
"dependencies": {
"@zowe/cics-for-zowe-sdk": "6.0.0-next.202402271249",
"@zowe/cics-for-zowe-sdk": "6.0.0-next.202403011419",
"@zowe/core-for-zowe-sdk": "^8.0.0-next.202402021649",
"@zowe/zowe-explorer-api": "^3.0.0-next",
"axios": "^1.6.7",
Expand Down
1 change: 1 addition & 0 deletions prettier.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = { printWidth: 150 };

0 comments on commit 135b7c7

Please sign in to comment.