Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/next' into v1-convert-for-ze
Browse files Browse the repository at this point in the history
Signed-off-by: Gene Johnston <[email protected]>
  • Loading branch information
gejohnston committed Jun 26, 2024
2 parents 87eb1f6 + 775dba5 commit 7f8c76f
Show file tree
Hide file tree
Showing 267 changed files with 1,450 additions and 1,008 deletions.
7 changes: 5 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ module.exports = {
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended"
"plugin:@typescript-eslint/recommended",
"plugin:deprecation/recommended"
],
"ignorePatterns": [
"**/*.js",
Expand Down Expand Up @@ -37,7 +38,8 @@ module.exports = {
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 12,
"sourceType": "module"
"sourceType": "module",
"project": ["./tsconfig.json", "./__tests__/tsconfig.json"]
},
"plugins": [
"@typescript-eslint",
Expand All @@ -47,6 +49,7 @@ module.exports = {
"rules": {
"max-len": ["warn", 150],
"no-console": "error",
"no-extra-parens": "error",
"no-multiple-empty-lines": "warn",
"no-trailing-spaces": "warn",
"@typescript-eslint/ban-types": "off",
Expand Down
7 changes: 7 additions & 0 deletions .madgerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"detectiveOptions": {
"ts": {
"skipTypeImports": true
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/* eslint-disable max-len */

describe("Imperative Secure Tests", () => {
require("./../../packages/imperative/__tests__/src/packages/imperative/__integration__/ConfigLoading.integration.subtest");
require("./../../packages/imperative/__tests__/src/packages/imperative/__integration__/PluginManagementFacility.integration.subtest");
require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/init/cli.imperative-test-cli.config.init.integration.subtest");
require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/auto-init/imperative.test.cli.config.auto-init.fruit.integration.subtest");
Expand Down
4 changes: 2 additions & 2 deletions __tests__/__packages__/cli-test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/cli-test-utils",
"version": "8.0.0-next.202406061600",
"version": "8.0.0-next.202406201950",
"description": "Test utilities package for Zowe CLI plug-ins",
"author": "Zowe",
"license": "EPL-2.0",
Expand Down Expand Up @@ -43,7 +43,7 @@
"devDependencies": {
"@types/js-yaml": "^4.0.9",
"@types/uuid": "^9.0.8",
"@zowe/imperative": "8.0.0-next.202406061600"
"@zowe/imperative": "8.0.0-next.202406201950"
},
"peerDependencies": {
"@zowe/imperative": "^8.0.0-next"
Expand Down
2 changes: 1 addition & 1 deletion __tests__/__packages__/cli-test-utils/src/TestUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export function mockHandlerParameters(params: PartialHandlerParameters): IHandle
arguments: {
$0: "zowe",
_: params.positionals || [],
...(params.arguments || {})
...params.arguments || {}
},
positionals: params.positionals || [],
profiles: params.profiles || new CommandProfiles(new Map()),
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "8.0.0-next.202406061600",
"version": "8.0.0-next.202406201950",
"command": {
"publish": {
"ignoreChanges": [
Expand Down
Loading

0 comments on commit 7f8c76f

Please sign in to comment.