From bcc9be9651285de7e53587f63b1cc81bb7ebd5eb Mon Sep 17 00:00:00 2001 From: Tim Leung Date: Thu, 8 Feb 2024 10:08:07 +0000 Subject: [PATCH] Update create-app to use FOUNDRY_TOKEN in templates (#40) --- packages/create-app/changelog/@unreleased/pr-40.v2.yml | 5 +++++ .../expected-template-next-static-export/.npmrc | 2 +- .../src/__snapshots__/expected-template-react/.npmrc | 2 +- .../src/__snapshots__/expected-template-vue/.npmrc | 2 +- packages/create-app/src/cli.ts | 2 +- packages/create-app/src/generate/generateNpmRc.test.ts | 2 +- packages/create-app/src/generate/generateNpmRc.ts | 2 +- 7 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 packages/create-app/changelog/@unreleased/pr-40.v2.yml diff --git a/packages/create-app/changelog/@unreleased/pr-40.v2.yml b/packages/create-app/changelog/@unreleased/pr-40.v2.yml new file mode 100644 index 000000000..23d87d62f --- /dev/null +++ b/packages/create-app/changelog/@unreleased/pr-40.v2.yml @@ -0,0 +1,5 @@ +type: improvement +improvement: + description: Update create-app to use FOUNDRY_TOKEN in templates instead of FOUNDRY_SDK_AUTH_TOKEN + links: + - https://github.com/palantir/osdk-ts/pull/40 diff --git a/packages/create-app/src/__snapshots__/expected-template-next-static-export/.npmrc b/packages/create-app/src/__snapshots__/expected-template-next-static-export/.npmrc index 2256eef7c..eb6e12174 100644 --- a/packages/create-app/src/__snapshots__/expected-template-next-static-export/.npmrc +++ b/packages/create-app/src/__snapshots__/expected-template-next-static-export/.npmrc @@ -1,2 +1,2 @@ -//example.palantirfoundry.com/artifacts/api/repositories/ri.artifacts.main.repository.fake/contents/release/npm:_authToken=${FOUNDRY_SDK_AUTH_TOKEN} +//example.palantirfoundry.com/artifacts/api/repositories/ri.artifacts.main.repository.fake/contents/release/npm:_authToken=${FOUNDRY_TOKEN} @fake:registry=https://example.palantirfoundry.com/artifacts/api/repositories/ri.artifacts.main.repository.fake/contents/release/npm diff --git a/packages/create-app/src/__snapshots__/expected-template-react/.npmrc b/packages/create-app/src/__snapshots__/expected-template-react/.npmrc index 2256eef7c..eb6e12174 100644 --- a/packages/create-app/src/__snapshots__/expected-template-react/.npmrc +++ b/packages/create-app/src/__snapshots__/expected-template-react/.npmrc @@ -1,2 +1,2 @@ -//example.palantirfoundry.com/artifacts/api/repositories/ri.artifacts.main.repository.fake/contents/release/npm:_authToken=${FOUNDRY_SDK_AUTH_TOKEN} +//example.palantirfoundry.com/artifacts/api/repositories/ri.artifacts.main.repository.fake/contents/release/npm:_authToken=${FOUNDRY_TOKEN} @fake:registry=https://example.palantirfoundry.com/artifacts/api/repositories/ri.artifacts.main.repository.fake/contents/release/npm diff --git a/packages/create-app/src/__snapshots__/expected-template-vue/.npmrc b/packages/create-app/src/__snapshots__/expected-template-vue/.npmrc index 2256eef7c..eb6e12174 100644 --- a/packages/create-app/src/__snapshots__/expected-template-vue/.npmrc +++ b/packages/create-app/src/__snapshots__/expected-template-vue/.npmrc @@ -1,2 +1,2 @@ -//example.palantirfoundry.com/artifacts/api/repositories/ri.artifacts.main.repository.fake/contents/release/npm:_authToken=${FOUNDRY_SDK_AUTH_TOKEN} +//example.palantirfoundry.com/artifacts/api/repositories/ri.artifacts.main.repository.fake/contents/release/npm:_authToken=${FOUNDRY_TOKEN} @fake:registry=https://example.palantirfoundry.com/artifacts/api/repositories/ri.artifacts.main.repository.fake/contents/release/npm diff --git a/packages/create-app/src/cli.ts b/packages/create-app/src/cli.ts index 1db28479f..c6fc0b040 100644 --- a/packages/create-app/src/cli.ts +++ b/packages/create-app/src/cli.ts @@ -191,7 +191,7 @@ export async function cli(args: string[] = process.argv) { message: `Done! Run the following commands to get started:\n` + `\n` + ` \`cd ${cdRelative}\`\n` - + ` \`export FOUNDRY_SDK_AUTH_TOKEN=\`\n` + + ` \`export FOUNDRY_TOKEN=\`\n` + ` \`npm install\`\n` + ` \`npm run dev\``, style: { diff --git a/packages/create-app/src/generate/generateNpmRc.test.ts b/packages/create-app/src/generate/generateNpmRc.test.ts index 6a15c7196..c929e84cb 100644 --- a/packages/create-app/src/generate/generateNpmRc.test.ts +++ b/packages/create-app/src/generate/generateNpmRc.test.ts @@ -18,7 +18,7 @@ import { expect, test } from "vitest"; import { generateNpmRc } from "./generateNpmRc.js"; const expected = ` -//registry.com:_authToken=\${FOUNDRY_SDK_AUTH_TOKEN} +//registry.com:_authToken=\${FOUNDRY_TOKEN} @myapp:registry=https://registry.com `.trimStart(); diff --git a/packages/create-app/src/generate/generateNpmRc.ts b/packages/create-app/src/generate/generateNpmRc.ts index f3947ad26..1ad5ae9a2 100644 --- a/packages/create-app/src/generate/generateNpmRc.ts +++ b/packages/create-app/src/generate/generateNpmRc.ts @@ -22,6 +22,6 @@ export function generateNpmRc({ osdkRegistryUrl: string; }): string { const withoutProtocol = osdkRegistryUrl.replace(/^https:\/\//, ""); - return `//${withoutProtocol}:_authToken=\${FOUNDRY_SDK_AUTH_TOKEN}\n` + return `//${withoutProtocol}:_authToken=\${FOUNDRY_TOKEN}\n` + `${osdkPackage.split("/")[0]}:registry=${osdkRegistryUrl}\n`; }