diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json index 42b0be8030..70e65cb221 100644 --- a/packages/catalog-client/package.json +++ b/packages/catalog-client/package.json @@ -36,6 +36,7 @@ }, "devDependencies": { "@backstage/cli": "^0.7.13", + "@types/jest": "^26.0.7", "msw": "^0.29.0" }, "files": [ diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json index 3c986b3292..e648606f48 100644 --- a/packages/catalog-model/package.json +++ b/packages/catalog-model/package.json @@ -42,6 +42,7 @@ }, "devDependencies": { "@backstage/cli": "^0.7.13", + "@types/jest": "^26.0.7", "@types/lodash": "^4.14.151", "yaml": "^1.9.2" }, diff --git a/packages/cli/src/lib/diff/handlers.ts b/packages/cli/src/lib/diff/handlers.ts index 4a17125e5a..904ed35e9a 100644 --- a/packages/cli/src/lib/diff/handlers.ts +++ b/packages/cli/src/lib/diff/handlers.ts @@ -85,6 +85,7 @@ class PackageJsonHandler { targetObj: any = this.targetPkg, prefix?: string, sort?: boolean, + optional?: boolean, ) { const fullFieldName = chalk.cyan( prefix ? `${prefix}[${fieldName}]` : fieldName, @@ -107,7 +108,7 @@ class PackageJsonHandler { } await this.write(); } - } else if (fieldName in obj) { + } else if (fieldName in obj && optional !== true) { if ( await this.prompt( `package.json is missing field ${fullFieldName}, set to ${coloredNewValue}?`, @@ -200,7 +201,7 @@ class PackageJsonHandler { continue; } - await this.syncField(key, pkgDeps, targetDeps, fieldName, true); + await this.syncField(key, pkgDeps, targetDeps, fieldName, true, true); } } diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json index 073a4e7745..75f65a950b 100644 --- a/plugins/catalog-graph/package.json +++ b/plugins/catalog-graph/package.json @@ -48,7 +48,8 @@ "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", - "@testing-library/react-hooks": "^3.4.2" + "@testing-library/react-hooks": "^3.4.2", + "@types/jest": "^26.0.7" }, "files": [ "dist" diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index cbd712369f..091ca286d6 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -62,6 +62,7 @@ "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^3.3.0", "@testing-library/user-event": "^13.1.8", + "@types/jest": "^26.0.7", "cross-fetch": "^3.0.6", "msw": "^0.29.0" }, diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json index acafd0da3d..156cb66de2 100644 --- a/plugins/catalog-react/package.json +++ b/plugins/catalog-react/package.json @@ -54,6 +54,7 @@ "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^3.3.0", "@testing-library/user-event": "^13.1.8", + "@types/jest": "^26.0.7", "@types/jwt-decode": "^3.1.0", "cross-fetch": "^3.0.6", "react-test-renderer": "^16.13.1" diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index 71f7e9dabf..d110bcf57f 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -57,6 +57,7 @@ "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", + "@types/jest": "^26.0.7", "cross-fetch": "^3.0.6" }, "files": [