diff --git a/.changeset/pre.json b/.changeset/pre.json index 887ecc366..36cf49a27 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -2,11 +2,11 @@ "mode": "pre", "tag": "beta", "initialVersions": { - "@osdk/examples.basic.cli": "0.0.0", - "@osdk/examples.basic.sdk": "0.0.0", + "@osdk/e2e.sandbox.catchall": "0.0.0", + "@osdk/e2e.generated.catchall": "0.0.0", "@osdk/examples.docs.example": "0.0.1", - "@osdk/examples.one.dot.one": "0.0.17", - "@osdk/examples.todoapp": "0.0.10", + "@osdk/e2e.generated.1.1.x": "0.0.17", + "@osdk/e2e.sandbox.todoappapp": "0.0.10", "@osdk/examples.next-static-export": "0.0.0", "@osdk/examples.react": "0.0.0", "@osdk/examples.tutorial-todo-app": "0.0.0", diff --git a/.changeset/weak-dragons-wonder.md b/.changeset/weak-dragons-wonder.md new file mode 100644 index 000000000..a845151cc --- /dev/null +++ b/.changeset/weak-dragons-wonder.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/.lintstagedrc.mjs b/.lintstagedrc.mjs index 0c7a259b5..bbfaf8424 100644 --- a/.lintstagedrc.mjs +++ b/.lintstagedrc.mjs @@ -15,12 +15,16 @@ export default { "packages/monorepo.*/**/*.{js,jsx,ts,tsx,mjs,cjs}": [ "dprint fmt", ], - "{packages,examples-extra/basic}/**/*.{js,jsx,ts,tsx,mjs,cjs}": ( + "packages/**/*.{js,jsx,ts,tsx,mjs,cjs}": ( files, ) => { const match = micromatch.not( files, - ["**/templates/**/*", "**/generatedNoCheck/**/*"], + [ + "**/templates/**/*", + "**/generatedNoCheck/**/*", + "**/generatedNoCheck2/**/*", + ], ); if (match.length === 0) return []; return [ diff --git a/.monorepolint.config.mjs b/.monorepolint.config.mjs index 9ecc0de13..18b2261ca 100644 --- a/.monorepolint.config.mjs +++ b/.monorepolint.config.mjs @@ -36,6 +36,8 @@ const nonStandardPackages = [ "@osdk/examples.*", "@osdk/foundry-sdk-generator", "@osdk/monorepo.*", + "@osdk/e2e.sandbox.*", // sandboxes for manual e2e testing + "@osdk/e2e.generated.*", // generated sdks for e2e testing "@osdk/shared.client", "@osdk/tests.*", ]; @@ -442,19 +444,22 @@ export default { ), ...standardPackageRules({ - includePackages: ["@osdk/examples.basic.**"], - excludePackages: ["@osdk/examples.one.dot.one"], + includePackages: [ + "@osdk/e2e.generated.catchall", + "@osdk/e2e.sandbox.catchall", + ], + excludePackages: ["@osdk/e2e.generated.1.1.x"], }, { esmOnly: true, legacy: false, - packageDepth: 3, + packageDepth: 2, type: "example", }), // most packages can use the newest typescript, but we enforce that @osdk/example.one.dot.one uses TS4.9 // so that we get build-time checking to make sure we don't regress v1.1 clients using an older Typescript. ...standardPackageRules({ - includePackages: ["@osdk/examples.one.dot.one"], + includePackages: ["@osdk/e2e.generated.1.1.x"], }, { legacy: false, packageDepth: 2, diff --git a/eslint.config.mjs b/eslint.config.mjs index db0fd41ce..69dc1cefb 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -106,6 +106,7 @@ export default tseslint.config( "**/bin/*.mjs", "**/bin/*.cjs", "examples-extra/**/*", + "packages/e2e.sandbox.*/**/*", ], rules: { "header/header": "off", @@ -120,6 +121,7 @@ export default tseslint.config( "**/*.test.ts", "**/test/*", "examples-extra/**/*", + "packages/e2e.sandbox.*/**/*", ], rules: { "no-console": "off", diff --git a/examples-extra/todoapp/src/main.tsx b/examples-extra/todoapp/src/main.tsx deleted file mode 100644 index 3d7150da8..000000000 --- a/examples-extra/todoapp/src/main.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import React from 'react' -import ReactDOM from 'react-dom/client' -import App from './App.tsx' -import './index.css' - -ReactDOM.createRoot(document.getElementById('root')!).render( - - - , -) diff --git a/examples/example-next-static-export/package.json b/examples/example-next-static-export/package.json index 8246bf121..c98721861 100644 --- a/examples/example-next-static-export/package.json +++ b/examples/example-next-static-export/package.json @@ -14,7 +14,7 @@ "start": "next start" }, "dependencies": { - "@osdk/examples.one.dot.one": "workspace:*", + "@osdk/e2e.generated.1.1.x": "workspace:*", "next": "14.2.3", "react": "^18", "react-dom": "^18" diff --git a/examples/example-next-static-export/src/app/page.tsx b/examples/example-next-static-export/src/app/page.tsx index 589cae4b0..100175c50 100644 --- a/examples/example-next-static-export/src/app/page.tsx +++ b/examples/example-next-static-export/src/app/page.tsx @@ -15,7 +15,7 @@ function Home() { return (
-

@osdk/examples.one.dot.one

+

@osdk/e2e.generated.1.1.x

Welcome to your Ontology SDK! Try using any of the following methods now. diff --git a/examples/example-next-static-export/src/lib/client.ts b/examples/example-next-static-export/src/lib/client.ts index cb69b4fee..24c84ab66 100644 --- a/examples/example-next-static-export/src/lib/client.ts +++ b/examples/example-next-static-export/src/lib/client.ts @@ -1,4 +1,4 @@ -import { FoundryClient, PublicClientAuth } from "@osdk/examples.one.dot.one"; +import { FoundryClient, PublicClientAuth } from "@osdk/e2e.generated.1.1.x"; const url = process.env.NEXT_PUBLIC_FOUNDRY_API_URL; const clientId = process.env.NEXT_PUBLIC_FOUNDRY_CLIENT_ID; diff --git a/examples/example-react/package.json b/examples/example-react/package.json index d22a43404..c4c92d5f0 100644 --- a/examples/example-react/package.json +++ b/examples/example-react/package.json @@ -14,7 +14,7 @@ "preview": "vite preview" }, "dependencies": { - "@osdk/examples.one.dot.one": "workspace:*", + "@osdk/e2e.generated.1.1.x": "workspace:*", "react": "^18", "react-dom": "^18", "react-router-dom": "^6.23.1" diff --git a/examples/example-react/src/Home.tsx b/examples/example-react/src/Home.tsx index 7fa2a8b85..5b4375dc8 100644 --- a/examples/example-react/src/Home.tsx +++ b/examples/example-react/src/Home.tsx @@ -9,7 +9,7 @@ function Home() { return ( -

@osdk/examples.one.dot.one

+

@osdk/e2e.generated.1.1.x

Welcome to your Ontology SDK! Try using any of the following methods now. diff --git a/examples/example-react/src/client.ts b/examples/example-react/src/client.ts index 6c54ec01d..83a1db626 100644 --- a/examples/example-react/src/client.ts +++ b/examples/example-react/src/client.ts @@ -1,4 +1,4 @@ -import { FoundryClient, PublicClientAuth } from "@osdk/examples.one.dot.one"; +import { FoundryClient, PublicClientAuth } from "@osdk/e2e.generated.1.1.x"; const url = import.meta.env.VITE_FOUNDRY_API_URL; const clientId = import.meta.env.VITE_FOUNDRY_CLIENT_ID; diff --git a/examples/example-tutorial-todo-aip-app/package.json b/examples/example-tutorial-todo-aip-app/package.json index 1f34c26fc..9d2e18782 100644 --- a/examples/example-tutorial-todo-aip-app/package.json +++ b/examples/example-tutorial-todo-aip-app/package.json @@ -14,7 +14,7 @@ "preview": "vite preview" }, "dependencies": { - "@osdk/examples.one.dot.one": "workspace:*", + "@osdk/e2e.generated.1.1.x": "workspace:*", "react": "^18", "react-dom": "^18", "react-router-dom": "^6.23.1", diff --git a/examples/example-tutorial-todo-aip-app/src/client.ts b/examples/example-tutorial-todo-aip-app/src/client.ts index 6c54ec01d..83a1db626 100644 --- a/examples/example-tutorial-todo-aip-app/src/client.ts +++ b/examples/example-tutorial-todo-aip-app/src/client.ts @@ -1,4 +1,4 @@ -import { FoundryClient, PublicClientAuth } from "@osdk/examples.one.dot.one"; +import { FoundryClient, PublicClientAuth } from "@osdk/e2e.generated.1.1.x"; const url = import.meta.env.VITE_FOUNDRY_API_URL; const clientId = import.meta.env.VITE_FOUNDRY_CLIENT_ID; diff --git a/examples/example-tutorial-todo-app/package.json b/examples/example-tutorial-todo-app/package.json index 3b1aebe5c..a723d4e69 100644 --- a/examples/example-tutorial-todo-app/package.json +++ b/examples/example-tutorial-todo-app/package.json @@ -14,7 +14,7 @@ "preview": "vite preview" }, "dependencies": { - "@osdk/examples.one.dot.one": "workspace:*", + "@osdk/e2e.generated.1.1.x": "workspace:*", "react": "^18", "react-dom": "^18", "react-router-dom": "^6.23.1", diff --git a/examples/example-tutorial-todo-app/src/client.ts b/examples/example-tutorial-todo-app/src/client.ts index 6c54ec01d..83a1db626 100644 --- a/examples/example-tutorial-todo-app/src/client.ts +++ b/examples/example-tutorial-todo-app/src/client.ts @@ -1,4 +1,4 @@ -import { FoundryClient, PublicClientAuth } from "@osdk/examples.one.dot.one"; +import { FoundryClient, PublicClientAuth } from "@osdk/e2e.generated.1.1.x"; const url = import.meta.env.VITE_FOUNDRY_API_URL; const clientId = import.meta.env.VITE_FOUNDRY_CLIENT_ID; diff --git a/examples/example-vue/package.json b/examples/example-vue/package.json index 81a9d3671..5d2593dd0 100644 --- a/examples/example-vue/package.json +++ b/examples/example-vue/package.json @@ -13,7 +13,7 @@ "preview": "vite preview" }, "dependencies": { - "@osdk/examples.one.dot.one": "workspace:*", + "@osdk/e2e.generated.1.1.x": "workspace:*", "vue": "^3.4.27", "vue-router": "^4.2.5" }, diff --git a/examples/example-vue/src/Home.vue b/examples/example-vue/src/Home.vue index 4b68a66f7..f9a368fed 100644 --- a/examples/example-vue/src/Home.vue +++ b/examples/example-vue/src/Home.vue @@ -7,7 +7,7 @@ const queryApiNames = Object.keys(client.ontology.queries);