Skip to content

Commit

Permalink
Merge pull request #2826 from zowe/ci/restore-node20
Browse files Browse the repository at this point in the history
Update @vscode/l10n-dev to support Node 20
  • Loading branch information
traeok authored Apr 10, 2024
2 parents 3a1f422 + 404bf9a commit 1e0c0a5
Show file tree
Hide file tree
Showing 9 changed files with 430 additions and 238 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/zowe-explorer-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# Continue to run tests on the other systems if one fails
fail-fast: false
matrix:
node-version: [18.x] # Add 20.x when vscode-l10n supports it
node-version: [18.x, 20.x]
# order operating systems from best to worst
os: [windows-latest, ubuntu-latest, macos-latest]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zowe-explorer-ftp-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# Continue to run tests on the other systems if one fails
fail-fast: false
matrix:
node-version: [18.x] # Add 20.x when vscode-l10n supports it
node-version: [18.x, 20.x]
# order operating systems from best to worst
os: [windows-latest, ubuntu-latest, macos-latest]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zowe-explorer-samples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
# Continue to run tests on the other systems if one fails
fail-fast: false
matrix:
node-version: [18.x] # Add 20.x when vscode-l10n supports it
node-version: [18.x, 20.x]

if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]')

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@types/vscode": "^1.73.0",
"@typescript-eslint/eslint-plugin": "^5.53.0",
"@typescript-eslint/parser": "^5.53.0",
"@vscode/l10n-dev": "^0.0.31",
"@vscode/l10n-dev": "^0.0.35",
"@vscode/test-electron": "^1.6.0",
"@vscode/vsce": "2.15.0",
"eslint": "^8.34.0",
Expand Down
18 changes: 9 additions & 9 deletions packages/zowe-explorer-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
},
"dependencies": {
"@types/vscode": "^1.53.2",
"@zowe/core-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/imperative": "8.0.0-next.202403132009",
"@zowe/secrets-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/core-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/imperative": "8.0.0-next.202404032038",
"@zowe/secrets-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202404032038",
"handlebars": "^4.7.7",
"semver": "^7.5.3"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/zowe-explorer-ftp-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
"vscode": "^1.79.0"
},
"dependencies": {
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/zos-ftp-for-zowe-cli": "2.1.8",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT",
"tmp": "0.2.1"
},
Expand All @@ -59,7 +59,7 @@
"concurrently": "^5.2.0"
},
"overrides": {
"@zowe/imperative": "8.0.0-next.202402132108"
"@zowe/imperative": "8.0.0-next.202404032038"
},
"jest": {
"moduleFileExtensions": [
Expand Down
3 changes: 1 addition & 2 deletions packages/zowe-explorer/l10n/bundle.l10n.json
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@
"Like Data Set name"
]
},
"allocateLike.inputBox.placeHolder": "allocateLike.inputBox.placeHolder",
"Enter a name for the new data set": "Enter a name for the new data set",
"Unable to create data set.": "Unable to create data set.",
"{0} was created like {1}./New Data Set nameLike Data Set name": {
"message": "{0} was created like {1}.",
Expand Down Expand Up @@ -877,7 +877,6 @@
"The data set member already exists.\nDo you want to replace it?": "The data set member already exists.\nDo you want to replace it?",
"The physical sequential (PS) data set already exists.\nDo you want to replace it?": "The physical sequential (PS) data set already exists.\nDo you want to replace it?",
"The partitioned (PO) data set already exists.\nDo you want to merge them while replacing any existing members?": "The partitioned (PO) data set already exists.\nDo you want to merge them while replacing any existing members?",
"Enter a name for the new data set": "Enter a name for the new data set",
"Unable to copy data set.": "Unable to copy data set.",
"Use the search button to display data sets": "Use the search button to display data sets",
"Cannot access member with control characters in the name: {0}/Data Set member": {
Expand Down
10 changes: 5 additions & 5 deletions packages/zowe-explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2090,11 +2090,11 @@
"sinon": "^6.1.0"
},
"dependencies": {
"@zowe/core-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/secrets-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202403132009",
"@zowe/core-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/secrets-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202404032038",
"@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT",
"dayjs": "^1.11.10",
"fs-extra": "8.0.1",
Expand Down
Loading

0 comments on commit 1e0c0a5

Please sign in to comment.