From 9caa408cf1e3e57aeec1a13594d47f96cbb0df74 Mon Sep 17 00:00:00 2001 From: Leanid Astrakou <lastrakou@rocketsoftware.com> Date: Thu, 29 Aug 2024 23:58:10 -0400 Subject: [PATCH 1/3] Packaging changes Signed-off-by: Leanid Astrakou <lastrakou@rocketsoftware.com> --- package-lock.json | 14 ++++++++++++++ package.json | 1 + 2 files changed, 15 insertions(+) diff --git a/package-lock.json b/package-lock.json index 7a3ce01..1e229d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,6 +61,7 @@ "mocha": "10.7.3", "mocha-jenkins-reporter": "0.4.8", "nock": "13.5.5", + "node-fetch-cjs": "3.2.1", "npm-run-all": "4.1.5", "nyc": "17.0.0", "redux-mock-store": "1.5.4", @@ -9372,6 +9373,19 @@ "node": ">= 10.13" } }, + "node_modules/node-fetch-cjs": { + "version": "3.2.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/node-fetch-cjs/-/node-fetch-cjs-3.2.1.tgz", + "integrity": "sha512-1ad5jgAp/oOWaSR/Gj7rfMTdZlJ62G+r5qm3BzFEcAE7jn8dJdQ6+8ZTfL9rMSdzjPgXmckLJIzC+lVt+nEuHg==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/node-fetch" + } + }, "node_modules/node-forge": { "version": "1.3.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/node-forge/-/node-forge-1.3.1.tgz", diff --git a/package.json b/package.json index 7ac41d6..abdf288 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "expect": "1.20.2", "explorer-fvt-utilities": "2.0.4", "file-loader": "6.2.0", + "node-fetch-cjs": "3.2.1", "html-webpack-plugin": "5.6.0", "mocha": "10.7.3", "mocha-jenkins-reporter": "0.4.8", From 7af2e6a5d0a90414f3c2bd9bf6824cbe46bd85d6 Mon Sep 17 00:00:00 2001 From: Leanid Astrakou <lastrakou@rocketsoftware.com> Date: Fri, 30 Aug 2024 00:06:38 -0400 Subject: [PATCH 2/3] Attempt fixing unit testing Signed-off-by: Leanid Astrakou <lastrakou@rocketsoftware.com> --- package-lock.json | 83 +++++++++++++++++++++++++++++++++++++++++++---- package.json | 8 ++--- 2 files changed, 81 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1e229d2..087e1d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", "immutable": "4.3.7", + "node-fetch": "^3.3.2", "orion-editor-component": "0.0.16", "prop-types": "15.8.1", "query-string": "9.1.0", @@ -61,7 +62,6 @@ "mocha": "10.7.3", "mocha-jenkins-reporter": "0.4.8", "nock": "13.5.5", - "node-fetch-cjs": "3.2.1", "npm-run-all": "4.1.5", "nyc": "17.0.0", "redux-mock-store": "1.5.4", @@ -4680,6 +4680,14 @@ "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", "dev": true }, + "node_modules/data-uri-to-buffer": { + "version": "4.0.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", + "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", + "engines": { + "node": ">= 12" + } + }, "node_modules/data-view-buffer": { "version": "1.0.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/data-view-buffer/-/data-view-buffer-1.0.1.tgz", @@ -6351,6 +6359,28 @@ "pend": "~1.2.0" } }, + "node_modules/fetch-blob": { + "version": "3.2.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/fetch-blob/-/fetch-blob-3.2.0.tgz", + "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "paypal", + "url": "https://paypal.me/jimmywarting" + } + ], + "dependencies": { + "node-domexception": "^1.0.0", + "web-streams-polyfill": "^3.0.3" + }, + "engines": { + "node": "^12.20 || >= 14.13" + } + }, "node_modules/file-entry-cache": { "version": "6.0.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -6568,6 +6598,17 @@ "samsam": "1.x" } }, + "node_modules/formdata-polyfill": { + "version": "4.0.10", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", + "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", + "dependencies": { + "fetch-blob": "^3.1.2" + }, + "engines": { + "node": ">=12.20.0" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/forwarded/-/forwarded-0.2.0.tgz", @@ -9373,11 +9414,33 @@ "node": ">= 10.13" } }, - "node_modules/node-fetch-cjs": { - "version": "3.2.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/node-fetch-cjs/-/node-fetch-cjs-3.2.1.tgz", - "integrity": "sha512-1ad5jgAp/oOWaSR/Gj7rfMTdZlJ62G+r5qm3BzFEcAE7jn8dJdQ6+8ZTfL9rMSdzjPgXmckLJIzC+lVt+nEuHg==", - "dev": true, + "node_modules/node-domexception": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/node-domexception/-/node-domexception-1.0.0.tgz", + "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "github", + "url": "https://paypal.me/jimmywarting" + } + ], + "engines": { + "node": ">=10.5.0" + } + }, + "node_modules/node-fetch": { + "version": "3.3.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/node-fetch/-/node-fetch-3.3.2.tgz", + "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", + "dependencies": { + "data-uri-to-buffer": "^4.0.0", + "fetch-blob": "^3.1.4", + "formdata-polyfill": "^4.0.10" + }, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, @@ -13036,6 +13099,14 @@ "minimalistic-assert": "^1.0.0" } }, + "node_modules/web-streams-polyfill": { + "version": "3.3.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", + "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", + "engines": { + "node": ">= 8" + } + }, "node_modules/webpack": { "version": "5.94.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/webpack/-/webpack-5.94.0.tgz", diff --git a/package.json b/package.json index abdf288..5cb196c 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", "immutable": "4.3.7", + "node-fetch": "^3.3.2", "orion-editor-component": "0.0.16", "prop-types": "15.8.1", "query-string": "9.1.0", @@ -25,9 +26,9 @@ "devDependencies": { "@babel/eslint-parser": "7.25.1", "@babel/plugin-proposal-decorators": "7.24.7", - "@babel/preset-stage-0": "7.8.3", "@babel/preset-env": "7.25.4", "@babel/preset-react": "7.24.7", + "@babel/preset-stage-0": "7.8.3", "@babel/register": "7.24.6", "@types/chai": "4.3.18", "@types/mocha": "10.0.7", @@ -53,7 +54,6 @@ "expect": "1.20.2", "explorer-fvt-utilities": "2.0.4", "file-loader": "6.2.0", - "node-fetch-cjs": "3.2.1", "html-webpack-plugin": "5.6.0", "mocha": "10.7.3", "mocha-jenkins-reporter": "0.4.8", @@ -113,9 +113,9 @@ "registry": "https://zowe.jfrog.io/zowe/api/npm/npm-local-release/" }, "browserslist": [ - "last 2 years" + "last 2 years" ], - "description": "MVS Explorer", + "description": "MVS Explorer", "author": "IBM", "license": "EPL-2.0", "proxy": { From 9a17cd922577a4c58e7806e953d68b10e6bcc986 Mon Sep 17 00:00:00 2001 From: James Struga <jstruga@rocketsoftware.com> Date: Tue, 24 Sep 2024 09:35:00 -0400 Subject: [PATCH 3/3] update manifest version Signed-off-by: James Struga <jstruga@rocketsoftware.com> --- manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.yaml b/manifest.yaml index 93e5dcb..94b5531 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -2,7 +2,7 @@ name: explorer-mvs # Component identifier. This identifier matches artifact path in Zowe Artifactory https://zowe.jfrog.io/. id: org.zowe.explorer-mvs -version: 2.0.7 +version: 3.0.0 # Component version is defined in gradle.properties for Gradle project # Human readable component name title: MVS Explorer