From fc65c6cd9eef760b0a9838866e060d2065f2e80e Mon Sep 17 00:00:00 2001 From: Johan Haals Date: Tue, 25 Jan 2022 16:39:50 +0100 Subject: [PATCH] Rename pkg, make isomorphic Signed-off-by: Johan Haals --- packages/cli/package.json | 2 +- packages/cli/src/commands/versions/bump.ts | 6 +++--- packages/release-manifest/CHANGELOG.md | 1 - .../{release-manifest => release-manifests}/.eslintrc.js | 0 packages/release-manifests/CHANGELOG.md | 1 + .../{release-manifest => release-manifests}/README.md | 0 .../api-report.md | 0 .../{release-manifest => release-manifests}/package.json | 9 +++++---- .../{release-manifest => release-manifests}/src/index.ts | 0 .../src/manifest.test.ts | 0 .../src/manifest.ts | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 packages/release-manifest/CHANGELOG.md rename packages/{release-manifest => release-manifests}/.eslintrc.js (100%) create mode 100644 packages/release-manifests/CHANGELOG.md rename packages/{release-manifest => release-manifests}/README.md (100%) rename packages/{release-manifest => release-manifests}/api-report.md (100%) rename packages/{release-manifest => release-manifests}/package.json (82%) rename packages/{release-manifest => release-manifests}/src/index.ts (100%) rename packages/{release-manifest => release-manifests}/src/manifest.test.ts (100%) rename packages/{release-manifest => release-manifests}/src/manifest.ts (98%) diff --git a/packages/cli/package.json b/packages/cli/package.json index dbcab6fbc7..9911c427a0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -32,7 +32,7 @@ "@backstage/config": "^0.1.13", "@backstage/config-loader": "^0.9.3", "@backstage/errors": "^0.2.0", - "@backstage/release-manifest": "^0.0.0", + "@backstage/release-manifests": "^0.0.0", "@backstage/types": "^0.1.1", "@hot-loader/react-dom": "^16.13.0", "@manypkg/get-packages": "^1.1.3", diff --git a/packages/cli/src/commands/versions/bump.ts b/packages/cli/src/commands/versions/bump.ts index a7ce942af7..46044bcca1 100644 --- a/packages/cli/src/commands/versions/bump.ts +++ b/packages/cli/src/commands/versions/bump.ts @@ -36,7 +36,7 @@ import { getByReleaseLine, getByVersion, ReleaseManifest, -} from '@backstage/release-manifest'; +} from '@backstage/release-manifests'; const DEP_TYPES = [ 'dependencies', @@ -321,7 +321,7 @@ export function createStrictVersionFinder(options: { export function createVersionFinder(options: { releaseLine?: string; packageInfoFetcher?: () => Promise; - releaseManifest: ReleaseManifest; + releaseManifest?: ReleaseManifest; }) { const { releaseLine = 'latest', @@ -332,7 +332,7 @@ export function createVersionFinder(options: { const distTag = releaseLine === 'main' ? 'latest' : releaseLine; const found = new Map(); const releasePackages = new Map( - releaseManifest.packages.map(p => [p.name, p.version]), + releaseManifest?.packages.map(p => [p.name, p.version]), ); return async function findTargetVersion(name: string) { const existing = found.get(name); diff --git a/packages/release-manifest/CHANGELOG.md b/packages/release-manifest/CHANGELOG.md deleted file mode 100644 index 28f83c41cd..0000000000 --- a/packages/release-manifest/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -# @backstage/release-manifest diff --git a/packages/release-manifest/.eslintrc.js b/packages/release-manifests/.eslintrc.js similarity index 100% rename from packages/release-manifest/.eslintrc.js rename to packages/release-manifests/.eslintrc.js diff --git a/packages/release-manifests/CHANGELOG.md b/packages/release-manifests/CHANGELOG.md new file mode 100644 index 0000000000..3aac6c8e6a --- /dev/null +++ b/packages/release-manifests/CHANGELOG.md @@ -0,0 +1 @@ +# @backstage/release-manifests diff --git a/packages/release-manifest/README.md b/packages/release-manifests/README.md similarity index 100% rename from packages/release-manifest/README.md rename to packages/release-manifests/README.md diff --git a/packages/release-manifest/api-report.md b/packages/release-manifests/api-report.md similarity index 100% rename from packages/release-manifest/api-report.md rename to packages/release-manifests/api-report.md diff --git a/packages/release-manifest/package.json b/packages/release-manifests/package.json similarity index 82% rename from packages/release-manifest/package.json rename to packages/release-manifests/package.json index ffa201ae4a..405896f50b 100644 --- a/packages/release-manifest/package.json +++ b/packages/release-manifests/package.json @@ -1,5 +1,5 @@ { - "name": "@backstage/release-manifest", + "name": "@backstage/release-manifests", "description": "Helper library for receiving release manifests", "version": "0.0.0", "private": false, @@ -8,20 +8,21 @@ "publishConfig": { "access": "public", "main": "dist/index.cjs.js", + "module": "dist/index.esm.js", "types": "dist/index.d.ts" }, "homepage": "https://backstage.io", "repository": { "type": "git", "url": "https://github.com/backstage/backstage", - "directory": "packages/release-manifest" + "directory": "packages/release-manifests" }, "keywords": [ "backstage" ], "license": "Apache-2.0", "scripts": { - "build": "backstage-cli build --outputs cjs,types", + "build": "backstage-cli build", "lint": "backstage-cli lint", "test": "backstage-cli test", "prepack": "backstage-cli prepack", @@ -29,7 +30,7 @@ "clean": "backstage-cli clean" }, "dependencies": { - "node-fetch": "^2.6.1" + "cross-fetch": "^3.0.6" }, "devDependencies": { "@backstage/test-utils": "^0.2.3", diff --git a/packages/release-manifest/src/index.ts b/packages/release-manifests/src/index.ts similarity index 100% rename from packages/release-manifest/src/index.ts rename to packages/release-manifests/src/index.ts diff --git a/packages/release-manifest/src/manifest.test.ts b/packages/release-manifests/src/manifest.test.ts similarity index 100% rename from packages/release-manifest/src/manifest.test.ts rename to packages/release-manifests/src/manifest.test.ts diff --git a/packages/release-manifest/src/manifest.ts b/packages/release-manifests/src/manifest.ts similarity index 98% rename from packages/release-manifest/src/manifest.ts rename to packages/release-manifests/src/manifest.ts index 564809fdee..ab2fa6c9fa 100644 --- a/packages/release-manifest/src/manifest.ts +++ b/packages/release-manifests/src/manifest.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import fetch from 'node-fetch'; +import fetch from 'cross-fetch'; const VERSIONS_DOMAIN = 'https://versions.backstage.io';