Skip to content

Commit

Permalink
Moves ./monorepo/ packages to packages/monorepo._ (#489)
Browse files Browse the repository at this point in the history
  • Loading branch information
ericanderson authored Jul 18, 2024
1 parent 4824449 commit 0fe90c5
Show file tree
Hide file tree
Showing 145 changed files with 640 additions and 427 deletions.
3 changes: 1 addition & 2 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"@osdk/examples.*",
"@osdk/tests.*",
"@osdk/version-updater",
"mytsup",
"tsconfig"
"@osdk/monorepo.*"
],
"bumpVersionsWithWorkspaceProtocolOnly": true,
"snapshot": {
Expand Down
2 changes: 2 additions & 0 deletions .changeset/gentle-hairs-decide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@osdk/examples.react": "0.0.0",
"@osdk/examples.tutorial-todo-app": "0.0.0",
"@osdk/examples.vue": "0.0.0",
"mytsup": "0.0.0",
"@osdk/monorepo.tsup": "0.0.0",
"tsconfig": "0.0.0",
"@osdk/api": "1.8.0",
"@osdk/cli": "0.21.0",
Expand Down
2 changes: 1 addition & 1 deletion .lintstagedrc.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import micromatch from "micromatch";
* @type {import("lint-staged").Config}
*/
export default {
"monorepo/**/*.{js,jsx,ts,tsx,mjs,cjs}": [
"packages/monorepo.*/**/*.{js,jsx,ts,tsx,mjs,cjs}": [
"dprint fmt",
],
"{packages,examples-extra/basic}/**/*.{js,jsx,ts,tsx,mjs,cjs}": (
Expand Down
23 changes: 15 additions & 8 deletions .monorepolint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,11 @@ const LATEST_TYPESCRIPT_DEP = "^5.5.2";

const DELETE_SCRIPT_ENTRY = { options: [undefined], fixValue: undefined };
const nonStandardPackages = [
"mytsup",
"tsconfig",
"@osdk/api-extractor",
"@osdk/examples.todoapp",
"@osdk/tests.*",
"@osdk/foundry-sdk-generator",
"@osdk/examples.*",
"@osdk/foundry-sdk-generator",
"@osdk/monorepo.*",
"@osdk/shared.client",
"@osdk/tests.*",
];

const legacyPackages = [
Expand Down Expand Up @@ -234,7 +231,7 @@ function standardPackageRules(shared, options) {
...shared,

options: getTsconfigOptions(
`${pathToWorkspaceRoot}/monorepo/tsconfig/tsconfig.base.json`,
`@osdk/monorepo.tsconfig/base.json`,
{
customTsconfigExcludes: options.customTsconfigExcludes,
skipTsconfigReferences: options.skipTsconfigReferences,
Expand Down Expand Up @@ -271,6 +268,16 @@ function standardPackageRules(shared, options) {
}),
]
: []),
requireDependency({
...shared,
options: {
devDependencies: {
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"@osdk/monorepo.api-extractor": "workspace:~",
},
},
}),
packageScript({
...shared,
options: {
Expand Down Expand Up @@ -365,7 +372,7 @@ function standardPackageRules(shared, options) {
import { defineConfig } from "tsup";
export default defineConfig(async (options) =>
(await import("mytsup")).default(options, {
(await import("@osdk/monorepo.tsup")).default(options, {
${options.legacy ? "cjsExtension: '.js'" : ""}
${options.esmOnly ? "esmOnly: true," : ""}
})
Expand Down
2 changes: 1 addition & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export default tseslint.config(
"**/src/generatedNoCheck2/",
"**/templates/",
"examples/**/*",
"monorepo/**",
"packages/monorepo.*/**",
"google-font-mocked-response.js",
".lintstagedrc.mjs",
"tests/",
Expand Down
3 changes: 3 additions & 0 deletions examples-extra/basic/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
},
"devDependencies": {
"@osdk/cli": "workspace:~",
"@osdk/monorepo.api-extractor": "workspace:~",
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"@types/node": "^18.0.0",
"ts-expect": "^1.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples-extra/basic/cli/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../monorepo/tsconfig/tsconfig.base.json",
"extends": "@osdk/monorepo.tsconfig/base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm"
Expand Down
2 changes: 1 addition & 1 deletion examples-extra/basic/cli/tsup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { defineConfig } from "tsup";

export default defineConfig(async (options) =>
(await import("mytsup")).default(options, {
(await import("@osdk/monorepo.tsup")).default(options, {
esmOnly: true,
})
);
3 changes: 3 additions & 0 deletions examples-extra/basic/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
"@osdk/api": "workspace:~",
"@osdk/cli.cmd.typescript": "workspace:~",
"@osdk/client.api": "workspace:~",
"@osdk/monorepo.api-extractor": "workspace:~",
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"tslib": "^2.6.2",
"typescript": "^5.4.5"
},
Expand Down
2 changes: 1 addition & 1 deletion examples-extra/basic/sdk/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../monorepo/tsconfig/tsconfig.base.json",
"extends": "@osdk/monorepo.tsconfig/base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm"
Expand Down
2 changes: 1 addition & 1 deletion examples-extra/basic/sdk/tsup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { defineConfig } from "tsup";

export default defineConfig(async (options) =>
(await import("mytsup")).default(options, {
(await import("@osdk/monorepo.tsup")).default(options, {
esmOnly: true,
})
);
3 changes: 3 additions & 0 deletions examples-extra/one_dot_one/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
"@osdk/api": "^1.9.0-beta.0",
"@osdk/cli.cmd.typescript": "workspace:~",
"@osdk/legacy-client": "^2.4.0-beta.1",
"@osdk/monorepo.api-extractor": "workspace:~",
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"@types/node": "^18.0.0",
"tslib": "^2.6.2",
"typescript": "^4.9.5"
Expand Down
2 changes: 1 addition & 1 deletion examples-extra/one_dot_one/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../monorepo/tsconfig/tsconfig.base.json",
"extends": "@osdk/monorepo.tsconfig/base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm"
Expand Down
2 changes: 1 addition & 1 deletion examples-extra/one_dot_one/tsup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
import { defineConfig } from "tsup";

export default defineConfig(async (options) =>
(await import("mytsup")).default(options, {})
(await import("@osdk/monorepo.tsup")).default(options, {})
);
1 change: 0 additions & 1 deletion monorepo/README.md

This file was deleted.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
"@monorepolint/config": "0.5.0-beta.10",
"@monorepolint/core": "0.5.0-beta.10",
"@monorepolint/rules": "0.5.0-beta.10",
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"@types/lint-staged": "^13.3.0",
"@typescript-eslint/parser": "^7.16.0",
"babel-plugin-dev-expression": "^0.2.3",
Expand All @@ -40,9 +42,7 @@
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"micromatch": "^4.0.7",
"mytsup": "workspace:~",
"tsc-absolute": "^1.0.1",
"tsconfig": "workspace:~",
"tsup": "^8.1.0",
"turbo": "^2.0.4",
"typescript": "^5.5.3",
Expand Down
3 changes: 3 additions & 0 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
"tiny-invariant": "^1.3.1"
},
"devDependencies": {
"@osdk/monorepo.api-extractor": "workspace:~",
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"ts-expect": "^1.3.0",
"typescript": "^5.5.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/api/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../monorepo/tsconfig/tsconfig.base.json",
"extends": "@osdk/monorepo.tsconfig/base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm",
Expand Down
2 changes: 1 addition & 1 deletion packages/api/tsup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { defineConfig } from "tsup";

export default defineConfig(async (options) =>
(await import("mytsup")).default(options, {
(await import("@osdk/monorepo.tsup")).default(options, {
cjsExtension: ".js",
})
);
3 changes: 3 additions & 0 deletions packages/cli.cmd.typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
"yargs": "^17.7.2"
},
"devDependencies": {
"@osdk/monorepo.api-extractor": "workspace:~",
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"@types/node": "^18.0.0",
"@types/yargs": "^17.0.29",
"typescript": "^5.5.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/cli.cmd.typescript/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../monorepo/tsconfig/tsconfig.base.json",
"extends": "@osdk/monorepo.tsconfig/base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm"
Expand Down
2 changes: 1 addition & 1 deletion packages/cli.cmd.typescript/tsup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { defineConfig } from "tsup";

export default defineConfig(async (options) =>
(await import("mytsup")).default(options, {
(await import("@osdk/monorepo.tsup")).default(options, {
esmOnly: true,
})
);
3 changes: 3 additions & 0 deletions packages/cli.common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
"yargs": "^17.7.2"
},
"devDependencies": {
"@osdk/monorepo.api-extractor": "workspace:~",
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"@types/node": "^18.0.0",
"@types/semver": "^7.5.8",
"@types/yargs": "^17.0.29",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli.common/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../monorepo/tsconfig/tsconfig.base.json",
"extends": "@osdk/monorepo.tsconfig/base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm"
Expand Down
2 changes: 1 addition & 1 deletion packages/cli.common/tsup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { defineConfig } from "tsup";

export default defineConfig(async (options) =>
(await import("mytsup")).default(options, {
(await import("@osdk/monorepo.tsup")).default(options, {
esmOnly: true,
})
);
3 changes: 3 additions & 0 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
"devDependencies": {
"@osdk/cli.cmd.typescript": "workspace:~",
"@osdk/cli.common": "workspace:~",
"@osdk/monorepo.api-extractor": "workspace:~",
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"@types/archiver": "^6.0.2",
"@types/ngeohash": "^0.6.8",
"@types/node": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../monorepo/tsconfig/tsconfig.base.json",
"extends": "@osdk/monorepo.tsconfig/base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm"
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/tsup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { defineConfig } from "tsup";

export default defineConfig(async (options) =>
(await import("mytsup")).default(options, {
(await import("@osdk/monorepo.tsup")).default(options, {
esmOnly: true,
})
);
2 changes: 1 addition & 1 deletion packages/client.api/api-extractor.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
"extends": "@osdk/api-extractor/base.json",
"extends": "@osdk/monorepo.api-extractor/base.json",
"mainEntryPointFilePath": "<projectFolder>/build/esm/index.d.ts"
}
4 changes: 3 additions & 1 deletion packages/client.api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@
"@microsoft/api-documenter": "^7.25.3",
"@microsoft/api-extractor": "^7.47.0",
"@osdk/api": "workspace:~",
"@osdk/api-extractor": "workspace:~",
"@osdk/internal.foundry": "workspace:~",
"@osdk/monorepo.api-extractor": "workspace:~",
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"@types/geojson": "^7946.0.14",
"type-fest": "^4.18.2",
"typescript": "^5.5.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/client.api/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../monorepo/tsconfig/tsconfig.base.json",
"extends": "@osdk/monorepo.tsconfig/base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm"
Expand Down
2 changes: 1 addition & 1 deletion packages/client.api/tsup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { defineConfig } from "tsup";

export default defineConfig(async (options) =>
(await import("mytsup")).default(options, {
(await import("@osdk/monorepo.tsup")).default(options, {
esmOnly: true,
})
);
3 changes: 3 additions & 0 deletions packages/client.test.ontology/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
"devDependencies": {
"@osdk/api": "workspace:~",
"@osdk/generator": "workspace:~",
"@osdk/monorepo.api-extractor": "workspace:~",
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"@osdk/shared.test": "workspace:~",
"typescript": "^5.5.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/client.test.ontology/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../monorepo/tsconfig/tsconfig.base.json",
"extends": "@osdk/monorepo.tsconfig/base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm"
Expand Down
2 changes: 1 addition & 1 deletion packages/client.test.ontology/tsup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { defineConfig } from "tsup";

export default defineConfig(async (options) =>
(await import("mytsup")).default(options, {
(await import("@osdk/monorepo.tsup")).default(options, {
esmOnly: true,
})
);
3 changes: 3 additions & 0 deletions packages/client.unstable.osw/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
"conjure-lite": "^0.4.4"
},
"devDependencies": {
"@osdk/monorepo.api-extractor": "workspace:~",
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"typescript": "^5.5.2"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/client.unstable.osw/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../monorepo/tsconfig/tsconfig.base.json",
"extends": "@osdk/monorepo.tsconfig/base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm"
Expand Down
2 changes: 1 addition & 1 deletion packages/client.unstable.osw/tsup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { defineConfig } from "tsup";

export default defineConfig(async (options) =>
(await import("mytsup")).default(options, {
(await import("@osdk/monorepo.tsup")).default(options, {
esmOnly: true,
})
);
3 changes: 3 additions & 0 deletions packages/client.unstable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
"conjure-lite": "^0.4.4"
},
"devDependencies": {
"@osdk/monorepo.api-extractor": "workspace:~",
"@osdk/monorepo.tsconfig": "workspace:~",
"@osdk/monorepo.tsup": "workspace:~",
"typescript": "^5.5.2"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/client.unstable/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../monorepo/tsconfig/tsconfig.base.json",
"extends": "@osdk/monorepo.tsconfig/base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm"
Expand Down
Loading

0 comments on commit 0fe90c5

Please sign in to comment.