From f5c5b05dc7733e17f3395e35f71fa31648d1f846 Mon Sep 17 00:00:00 2001 From: David Sheldrick Date: Tue, 2 May 2023 13:25:26 +0100 Subject: [PATCH] [chore] update lazyrepo (#1211) --- .eslintignore | 3 +- .github/workflows/checks.yml | 8 +-- .husky/pre-commit | 2 +- apps/docs/package.json | 14 ++--- apps/examples/package.json | 2 +- apps/vscode/editor/package.json | 4 +- apps/vscode/extension/package.json | 4 +- config/package.json | 2 +- lazy.config.ts | 81 +++++++++++++++-------------- package.json | 18 +++---- packages/assets/package.json | 8 +-- packages/editor/package.json | 10 ++-- packages/file-format/package.json | 8 +-- packages/polyfills/package.json | 6 +-- packages/primitives/package.json | 8 +-- packages/tldraw/package.json | 8 +-- packages/tlschema/package.json | 8 +-- packages/tlstore/package.json | 8 +-- packages/tlsync-client/package.json | 8 +-- packages/tlvalidate/package.json | 8 +-- packages/ui/package.json | 8 +-- packages/utils/package.json | 8 +-- public-yarn.lock | 49 ++++++++--------- scripts/build-api.ts | 2 +- scripts/build-package.ts | 2 +- scripts/check-scripts.ts | 4 +- scripts/package.json | 2 +- scripts/prepack.ts | 2 +- 28 files changed, 149 insertions(+), 146 deletions(-) diff --git a/.eslintignore b/.eslintignore index b34ffd838..d61341e10 100644 --- a/.eslintignore +++ b/.eslintignore @@ -13,4 +13,5 @@ **/*.test.ts **/api/* !**/pages/api/* -**/*.json \ No newline at end of file +**/*.json +**/lazy.config.ts \ No newline at end of file diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 8f244fbf3..e11d183cc 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -36,7 +36,7 @@ jobs: run: yarn - name: Typecheck - run: yarn build:types + run: yarn build-types - name: Check scripts run: yarn check-scripts @@ -45,15 +45,15 @@ jobs: run: yarn lint - name: Check API declarations and docs work as intended - run: yarn api:check + run: yarn api-check - name: Pack public packages - run: yarn lazy pack-tarball + run: "yarn lazy pack-tarball | sed -E 's/^.*? ::/::/'" - name: Build all projects # the sed pipe makes sure that github annotations come through without # turbo's prefix - run: "yarn build | sed -E 's/^@[a-zA-Z-]+\\/[a-z-]+:[a-z-]+: ::/::/'" + run: "yarn build | sed -E 's/^.*? ::/::/'" - name: Test run: yarn test diff --git a/.husky/pre-commit b/.husky/pre-commit index 02ffda72d..f70b3ce60 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,6 +1,6 @@ #!/usr/bin/env sh . "$(dirname -- "$0")/_/husky.sh" -yarn lazy run build:api +yarn lazy run build-api git add packages/*/api-report.md yarn lint-staged diff --git a/apps/docs/package.json b/apps/docs/package.json index 5e985ec24..71c1ac8de 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -27,14 +27,14 @@ "infinite" ], "scripts": { - "dev": "lazy dev:docs", - "dev:docs": "next dev", - "build": "lazy build:docs", - "build:docs": "next build", + "dev": "lazy dev-docs", + "dev-docs": "next dev", + "build": "lazy build-docs", + "build-docs": "next build", "start": "next start", "lint": "yarn run -T tsx ../../scripts/lint.ts", - "docs:content": "ts-node --project tsconfig.content.json ./scripts/index.ts", - "content": "lazy docs:content" + "docs-content": "ts-node --project tsconfig.content.json ./scripts/index.ts", + "content": "lazy docs-content" }, "dependencies": { "@microsoft/tsdoc": "^0.14.2", @@ -69,7 +69,7 @@ "@tldraw/tlsync-client": "workspace:*", "@tldraw/tlvalidate": "workspace:*", "@tldraw/ui": "workspace:*", - "lazyrepo": "0.0.0-alpha.22", + "lazyrepo": "0.0.0-alpha.26", "rimraf": "^4.4.0", "ts-node": "^10.9.1" } diff --git a/apps/examples/package.json b/apps/examples/package.json index 547712b90..14a36d1b6 100755 --- a/apps/examples/package.json +++ b/apps/examples/package.json @@ -36,7 +36,7 @@ "concurrently": "^7.4.0", "esbuild": "^0.16.7", "ip": "^1.1.8", - "lazyrepo": "0.0.0-alpha.22", + "lazyrepo": "0.0.0-alpha.26", "node-forge": "^1.3.1", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/apps/vscode/editor/package.json b/apps/vscode/editor/package.json index f4bb174df..820431395 100644 --- a/apps/vscode/editor/package.json +++ b/apps/vscode/editor/package.json @@ -29,7 +29,7 @@ "scripts": { "build": "yarn run -T tsx scripts/build.ts", "build:vscode-editor": "yarn run -T tsx scripts/build.ts", - "dev:vscode": "yarn run -T tsx scripts/dev.ts", + "dev-vscode": "yarn run -T tsx scripts/dev.ts", "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist", "lint": "yarn run -T tsx ../../../scripts/lint.ts" }, @@ -51,7 +51,7 @@ "dotenv": "^16.0.3", "esbuild": "^0.16.7", "fs-extra": "^11.1.0", - "lazyrepo": "0.0.0-alpha.22", + "lazyrepo": "0.0.0-alpha.26", "nanoid": "^4.0.2", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/apps/vscode/extension/package.json b/apps/vscode/extension/package.json index 8481f1b7e..c5991f273 100644 --- a/apps/vscode/extension/package.json +++ b/apps/vscode/extension/package.json @@ -122,7 +122,7 @@ "dependencies": false }, "scripts": { - "dev:vscode": "tsx scripts/dev.ts", + "dev-vscode": "tsx scripts/dev.ts", "build": "cd ../editor && yarn build && cd ../extension && tsx scripts/build.ts", "web": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=.", "package": "yarn build && tsx scripts/package.ts", @@ -142,7 +142,7 @@ "assert": "^2.0.0", "esbuild": "^0.16.7", "fs-extra": "^11.1.0", - "lazyrepo": "0.0.0-alpha.22", + "lazyrepo": "0.0.0-alpha.26", "lodash": "^4.17.21", "mocha": "^9.1.1", "process": "^0.11.10", diff --git a/config/package.json b/config/package.json index b4ccf192e..f2837e39d 100644 --- a/config/package.json +++ b/config/package.json @@ -12,6 +12,6 @@ "eslint-plugin-react": "7.28.0" }, "devDependencies": { - "lazyrepo": "0.0.0-alpha.22" + "lazyrepo": "0.0.0-alpha.26" } } diff --git a/lazy.config.ts b/lazy.config.ts index 058d1dae2..6ab9f2ac3 100644 --- a/lazy.config.ts +++ b/lazy.config.ts @@ -1,9 +1,9 @@ import { LazyConfig } from 'lazyrepo' -export function generateSharedTasks(bublic: '' | '/bublic') { +export function generateSharedScripts(bublic: '' | '/bublic') { return { build: { - runsAfter: { 'build:package': {}, prebuild: {} }, + runsAfter: { 'build-package': {}, prebuild: {} }, }, 'build:vscode-editor': { runsAfter: { 'refresh-assets': {} }, @@ -13,22 +13,22 @@ export function generateSharedTasks(bublic: '' | '/bublic') { runsAfter: { 'refresh-assets': {} }, cache: 'none', }, - 'dev:vscode': { + 'dev-vscode': { runsAfter: { 'build:vscode-editor': {} }, }, test: { baseCommand: 'yarn run -T jest', runsAfter: { 'refresh-assets': {} }, }, - 'test:coverage': { + 'test-coverage': { baseCommand: 'yarn run -T jest --coverage', }, lint: { execution: 'independent', - runsAfter: { 'build:types': {} }, + runsAfter: { 'build-types': {} }, }, - 'build:package': { - runsAfter: { 'build:api': {}, prebuild: {} }, + 'build-package': { + runsAfter: { 'build-api': {}, prebuild: {} }, cache: { inputs: ['api/**/*', 'src/**/*'], }, @@ -43,43 +43,45 @@ export function generateSharedTasks(bublic: '' | '/bublic') { inputs: ['package.json', `${bublic}/scripts/refresh-assets.ts`, `${bublic}/assets/**/*`], }, }, - 'build:types': { + 'build-types': { execution: 'top-level', baseCommand: `tsx ${bublic}/scripts/typecheck.ts`, cache: { inputs: { - include: [ - '{,bublic/}packages/*/src/**/*.{ts,tsx}', - '{,bublic/}{apps,scripts,e2e}/**/*.{ts,tsx}', - '{,bublic/}{apps,packages}/*/tsconfig.json', - '{,bublic/}{scripts,e2e}/tsconfig.json', - ], - exclude: ['**/dist*/**/*.d.ts'], + include: ['/**/*.{ts,tsx}', '/tsconfig.json'], + exclude: ['/dist*/**/*', '/api/**/*'], }, + outputs: ['/*.tsbuildinfo', '/.tsbuild/**/*'], }, runsAfter: { 'refresh-assets': {}, 'maybe-clean-tsbuildinfo': {}, }, }, - 'build:api': { + 'build-api': { execution: 'independent', cache: { inputs: ['.tsbuild/**/*.d.ts', 'tsconfig.json'], + outputs: ['api/**/*'], + }, + runsAfter: { + 'build-types': { + // Because build-types is top level, if usesOutput were set to true every + // build-api task would depend on all the .tsbuild files in the whole + // repo. So we set this to false and configure it to use only the + // local .tsbuild files + usesOutput: false, + }, }, - runsAfter: { 'build:types': {} }, }, - 'build:docs': { - runsAfter: { 'docs:content': {} }, + 'build-docs': { + runsAfter: { 'docs-content': {} }, }, - 'dev:docs': { - runsAfter: { 'docs:content': {} }, + 'dev-docs': { + runsAfter: { 'docs-content': {} }, }, - 'app:build': { - runsAfter: { 'build:types': {} }, - }, - 'docs:content': { - runsAfter: { 'build:api': {} }, + 'docs-content': { + runsAfter: { 'build-api': {} }, cache: { inputs: [ 'content/**', @@ -89,36 +91,35 @@ export function generateSharedTasks(bublic: '' | '/bublic') { ], }, }, - 'api:check': { + 'api-check': { execution: 'top-level', baseCommand: `tsx ${bublic}/scripts/api-check.ts`, - runsAfter: { 'build:api': {} }, + runsAfter: { 'build-api': {} }, cache: { inputs: [`${bublic}/packages/*/api/public.d.ts`], }, }, - } satisfies LazyConfig['tasks'] + } satisfies LazyConfig['scripts'] } const config = { baseCacheConfig: { include: [ - '/package.json', - '/public-yarn.lock', - '/lazy.config.ts', - '/config/**/*', - '/scripts/**/*', + '/{,bublic/}package.json', + '/{,bublic/}public-yarn.lock', + '/{,bublic/}lazy.config.ts', + '/{,bublic/}config/**/*', + '/{,bublic/}scripts/**/*', ], exclude: [ - 'coverage/**/*', - 'dist*/**/*', + '/coverage/**/*', + '/dist*/**/*', '**/*.tsbuildinfo', - '/apps/app/bublic/*.{js,map}', - '/apps/docs/content/gen/**/*', + '/{,bublic/}apps/docs/content/gen/**/*', ], }, - tasks: { - ...generateSharedTasks(''), + scripts: { + ...generateSharedScripts(''), }, } satisfies LazyConfig diff --git a/package.json b/package.json index 2a6939a21..94be0c308 100644 --- a/package.json +++ b/package.json @@ -36,18 +36,18 @@ "postinstall": "yarn refresh-assets", "refresh-assets": "lazy refresh-assets", "build": "lazy build", - "build:docs": "lazy build:docs", - "dev": "lazy run dev --filter ./apps/examples --filter ./packages/tldraw", - "dev:docs": "lazy run dev:docs", - "dev:vscode": "code ./apps/vscode/extension && lazy run dev --filter './apps/vscode/{extension,editor}'", - "build:types": "lazy inherit", - "build:api": "lazy build:api", - "build:package": "lazy build:package", + "build-docs": "lazy build-docs", + "dev": "lazy run dev --filter='{,bublic/}apps/examples' --filter='{,bublic/}packages/tldraw'", + "dev-docs": "lazy run dev-docs", + "dev-vscode": "code ./apps/vscode/extension && lazy run dev --filter='{,bublic/}apps/vscode/{extension,editor}'", + "build-types": "lazy inherit", + "build-api": "lazy build-api", + "build-package": "lazy build-package", "lint": "lazy lint", "format": "prettier --write \"**/*.{ts,tsx}\"", "typecheck": "yarn refresh-assets && tsx scripts/typecheck.ts", "check-scripts": "tsx scripts/check-scripts.ts", - "api:check": "lazy api:check", + "api-check": "lazy api-check", "test": "lazy test", "prepare": "husky install" }, @@ -93,7 +93,7 @@ "auto": "^10.44.0", "fs-extra": "^11.1.0", "json5": "^2.2.3", - "lazyrepo": "0.0.0-alpha.22", + "lazyrepo": "0.0.0-alpha.26", "rimraf": "^4.4.0", "tsx": "^3.12.2", "vercel": "^28.16.15" diff --git a/packages/assets/package.json b/packages/assets/package.json index 7584120dc..7b99b5a71 100644 --- a/packages/assets/package.json +++ b/packages/assets/package.json @@ -36,9 +36,9 @@ ], "scripts": { "test": "lazy inherit --passWithNoTests", - "test:coverage": "lazy inherit --passWithNoTests", - "build:package": "yarn run -T tsx ../../scripts/build-package.ts", - "build:api": "yarn run -T tsx ../../scripts/build-api.ts", + "test-coverage": "lazy inherit --passWithNoTests", + "build-package": "yarn run -T tsx ../../scripts/build-package.ts", + "build-api": "yarn run -T tsx ../../scripts/build-api.ts", "prepack": "yarn run -T tsx ../../scripts/prepack.ts", "postpack": "../../scripts/postpack.sh", "pack-tarball": "yarn pack", @@ -48,7 +48,7 @@ "@tldraw/utils": "workspace:*" }, "devDependencies": { - "lazyrepo": "0.0.0-alpha.22", + "lazyrepo": "0.0.0-alpha.26", "ts-node-dev": "^1.1.8" }, "jest": { diff --git a/packages/editor/package.json b/packages/editor/package.json index 4796b5a88..8f551758a 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -36,10 +36,10 @@ "scripts": { "test": "lazy inherit", "benchmark": "yarn run -T tsx ./scripts/benchmark.ts", - "test:coverage": "lazy inherit", - "build": "lazy build:package", - "build:package": "yarn run -T tsx ../../scripts/build-package.ts", - "build:api": "yarn run -T tsx ../../scripts/build-api.ts", + "test-coverage": "lazy inherit", + "build": "lazy build-package", + "build-package": "yarn run -T tsx ../../scripts/build-package.ts", + "build-api": "yarn run -T tsx ../../scripts/build-api.ts", "prepack": "yarn run -T tsx ../../scripts/prepack.ts", "postpack": "../../scripts/postpack.sh", "pack-tarball": "yarn pack", @@ -82,7 +82,7 @@ "gzip-size": "^7.0.0", "jest-canvas-mock": "^2.4.0", "jest-environment-jsdom": "^29.4.3", - "lazyrepo": "0.0.0-alpha.22", + "lazyrepo": "0.0.0-alpha.26", "react-test-renderer": "^18.2.0", "resize-observer-polyfill": "^1.5.1" }, diff --git a/packages/file-format/package.json b/packages/file-format/package.json index 853696035..dc34d8983 100644 --- a/packages/file-format/package.json +++ b/packages/file-format/package.json @@ -32,9 +32,9 @@ "files": [], "scripts": { "test": "lazy inherit", - "test:coverage": "lazy inherit", - "build:package": "yarn run -T tsx ../../scripts/build-package.ts", - "build:api": "yarn run -T tsx ../../scripts/build-api.ts", + "test-coverage": "lazy inherit", + "build-package": "yarn run -T tsx ../../scripts/build-package.ts", + "build-api": "yarn run -T tsx ../../scripts/build-api.ts", "prepack": "yarn run -T tsx ../../scripts/prepack.ts", "postpack": "../../scripts/postpack.sh", "pack-tarball": "yarn pack", @@ -60,6 +60,6 @@ ] }, "devDependencies": { - "lazyrepo": "0.0.0-alpha.22" + "lazyrepo": "0.0.0-alpha.26" } } diff --git a/packages/polyfills/package.json b/packages/polyfills/package.json index a12dc07d8..b678dc800 100644 --- a/packages/polyfills/package.json +++ b/packages/polyfills/package.json @@ -31,8 +31,8 @@ "/* GOTCHA */": "files will include ./dist and index.d.ts by default, add any others you want to include in here", "files": [], "scripts": { - "build:package": "yarn run -T tsx ../../scripts/build-package.ts", - "build:api": "yarn run -T tsx ../../scripts/build-api.ts", + "build-package": "yarn run -T tsx ../../scripts/build-package.ts", + "build-api": "yarn run -T tsx ../../scripts/build-api.ts", "prepack": "yarn run -T tsx ../../scripts/prepack.ts", "postpack": "../../scripts/postpack.sh", "pack-tarball": "yarn pack", @@ -42,6 +42,6 @@ "core-js": "^3.27.2" }, "devDependencies": { - "lazyrepo": "0.0.0-alpha.22" + "lazyrepo": "0.0.0-alpha.26" } } diff --git a/packages/primitives/package.json b/packages/primitives/package.json index 6cfdffeb8..21f904c4e 100644 --- a/packages/primitives/package.json +++ b/packages/primitives/package.json @@ -32,9 +32,9 @@ "files": [], "scripts": { "test": "lazy inherit", - "test:coverage": "lazy inherit", - "build:package": "yarn run -T tsx ../../scripts/build-package.ts", - "build:api": "yarn run -T tsx ../../scripts/build-api.ts", + "test-coverage": "lazy inherit", + "build-package": "yarn run -T tsx ../../scripts/build-package.ts", + "build-api": "yarn run -T tsx ../../scripts/build-api.ts", "prepack": "yarn run -T tsx ../../scripts/prepack.ts", "postpack": "../../scripts/postpack.sh", "pack-tarball": "yarn pack", @@ -54,6 +54,6 @@ }, "devDependencies": { "benchmark": "^2.1.4", - "lazyrepo": "0.0.0-alpha.22" + "lazyrepo": "0.0.0-alpha.26" } } diff --git a/packages/tldraw/package.json b/packages/tldraw/package.json index f703c4531..047e3004c 100644 --- a/packages/tldraw/package.json +++ b/packages/tldraw/package.json @@ -30,11 +30,11 @@ "types": "./.tsbuild/index.d.ts", "scripts": { "test": "lazy inherit", - "test:coverage": "lazy inherit", + "test-coverage": "lazy inherit", "dev": "chokidar '../{editor,ui}/*.css' -c 'node ./scripts/copy-css-files.mjs' --initial", "prebuild": "node ./scripts/copy-css-files.mjs", - "build:package": "yarn run -T tsx ../../scripts/build-package.ts", - "build:api": "yarn run -T tsx ../../scripts/build-api.ts", + "build-package": "yarn run -T tsx ../../scripts/build-package.ts", + "build-api": "yarn run -T tsx ../../scripts/build-api.ts", "prepack": "yarn run -T tsx ../../scripts/prepack.ts", "postpack": "../../scripts/postpack.sh", "pack-tarball": "yarn pack", @@ -63,7 +63,7 @@ "gzip-size": "^7.0.0", "jest-canvas-mock": "^2.4.0", "jest-environment-jsdom": "^28.1.2", - "lazyrepo": "0.0.0-alpha.22", + "lazyrepo": "0.0.0-alpha.26", "resize-observer-polyfill": "^1.5.1" }, "jest": { diff --git a/packages/tlschema/package.json b/packages/tlschema/package.json index 47f009bbc..34a45a9c5 100644 --- a/packages/tlschema/package.json +++ b/packages/tlschema/package.json @@ -32,14 +32,14 @@ "files": [], "scripts": { "test": "lazy inherit", - "test:coverage": "lazy inherit", + "test-coverage": "lazy inherit", "new-record": "node ./scripts/new-record.js", "new-shape": "node ./scripts/new-shape.js", "new-asset": "node ./scripts/new-asset.js", "index": "node ./scripts/build-index.js && yarn format", "format": "yarn run -T prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md}\"", - "build:package": "yarn run -T tsx ../../scripts/build-package.ts", - "build:api": "yarn run -T tsx ../../scripts/build-api.ts", + "build-package": "yarn run -T tsx ../../scripts/build-package.ts", + "build-api": "yarn run -T tsx ../../scripts/build-api.ts", "prepack": "yarn run -T tsx ../../scripts/prepack.ts", "postpack": "../../scripts/postpack.sh", "pack-tarball": "yarn pack", @@ -47,7 +47,7 @@ }, "devDependencies": { "kleur": "^4.1.5", - "lazyrepo": "0.0.0-alpha.22" + "lazyrepo": "0.0.0-alpha.26" }, "jest": { "preset": "config/jest/node", diff --git a/packages/tlstore/package.json b/packages/tlstore/package.json index ac8b9589e..52391e2f9 100644 --- a/packages/tlstore/package.json +++ b/packages/tlstore/package.json @@ -32,9 +32,9 @@ "files": [], "scripts": { "test": "lazy inherit", - "test:coverage": "lazy inherit", - "build:package": "yarn run -T tsx ../../scripts/build-package.ts", - "build:api": "yarn run -T tsx ../../scripts/build-api.ts", + "test-coverage": "lazy inherit", + "build-package": "yarn run -T tsx ../../scripts/build-package.ts", + "build-api": "yarn run -T tsx ../../scripts/build-api.ts", "prepack": "yarn run -T tsx ../../scripts/prepack.ts", "postpack": "../../scripts/postpack.sh", "pack-tarball": "yarn pack", @@ -51,7 +51,7 @@ "devDependencies": { "@peculiar/webcrypto": "^1.4.0", "@types/lodash.isequal": "^4.5.6", - "lazyrepo": "0.0.0-alpha.22", + "lazyrepo": "0.0.0-alpha.26", "raf": "^3.4.1" }, "jest": { diff --git a/packages/tlsync-client/package.json b/packages/tlsync-client/package.json index 77bcbeaff..5862b2fa0 100644 --- a/packages/tlsync-client/package.json +++ b/packages/tlsync-client/package.json @@ -32,9 +32,9 @@ "files": [], "scripts": { "test": "lazy inherit", - "test:coverage": "lazy inherit", - "build:package": "yarn run -T tsx ../../scripts/build-package.ts", - "build:api": "yarn run -T tsx ../../scripts/build-api.ts", + "test-coverage": "lazy inherit", + "build-package": "yarn run -T tsx ../../scripts/build-package.ts", + "build-api": "yarn run -T tsx ../../scripts/build-api.ts", "prepack": "yarn run -T tsx ../../scripts/prepack.ts", "postpack": "../../scripts/postpack.sh", "pack-tarball": "yarn pack", @@ -43,7 +43,7 @@ "devDependencies": { "@types/react": "*", "@types/react-dom": "*", - "lazyrepo": "0.0.0-alpha.22", + "lazyrepo": "0.0.0-alpha.26", "ws": "^8.10.0" }, "optionalDependencies": { diff --git a/packages/tlvalidate/package.json b/packages/tlvalidate/package.json index 376833676..032af844a 100644 --- a/packages/tlvalidate/package.json +++ b/packages/tlvalidate/package.json @@ -32,9 +32,9 @@ "files": [], "scripts": { "test": "lazy inherit", - "test:coverage": "lazy inherit", - "build:package": "yarn run -T tsx ../../scripts/build-package.ts", - "build:api": "yarn run -T tsx ../../scripts/build-api.ts", + "test-coverage": "lazy inherit", + "build-package": "yarn run -T tsx ../../scripts/build-package.ts", + "build-api": "yarn run -T tsx ../../scripts/build-api.ts", "prepack": "yarn run -T tsx ../../scripts/prepack.ts", "postpack": "../../scripts/postpack.sh", "pack-tarball": "yarn pack", @@ -53,6 +53,6 @@ } }, "devDependencies": { - "lazyrepo": "0.0.0-alpha.22" + "lazyrepo": "0.0.0-alpha.26" } } diff --git a/packages/ui/package.json b/packages/ui/package.json index 84bd11be0..797e530a0 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -35,9 +35,9 @@ ], "scripts": { "test": "lazy inherit --passWithNoTests", - "test:coverage": "yarn run -T jest --passWithNoTests --coverage", - "build:package": "yarn run -T tsx ../../scripts/build-package.ts", - "build:api": "yarn run -T tsx ../../scripts/build-api.ts", + "test-coverage": "yarn run -T jest --passWithNoTests --coverage", + "build-package": "yarn run -T tsx ../../scripts/build-package.ts", + "build-api": "yarn run -T tsx ../../scripts/build-api.ts", "prepack": "yarn run -T tsx ../../scripts/prepack.ts", "postpack": "../../scripts/postpack.sh", "pack-tarball": "yarn pack", @@ -77,7 +77,7 @@ "gzip-size": "^7.0.0", "jest-canvas-mock": "^2.4.0", "jest-environment-jsdom": "^28.1.2", - "lazyrepo": "0.0.0-alpha.22", + "lazyrepo": "0.0.0-alpha.26", "resize-observer-polyfill": "^1.5.1" }, "jest": { diff --git a/packages/utils/package.json b/packages/utils/package.json index 3004ff65a..5e76a782a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -32,9 +32,9 @@ "files": [], "scripts": { "test": "lazy inherit", - "test:coverage": "lazy inherit", - "build:package": "yarn run -T tsx ../../scripts/build-package.ts", - "build:api": "yarn run -T tsx ../../scripts/build-api.ts", + "test-coverage": "lazy inherit", + "build-package": "yarn run -T tsx ../../scripts/build-package.ts", + "build-api": "yarn run -T tsx ../../scripts/build-api.ts", "prepack": "yarn run -T tsx ../../scripts/prepack.ts", "postpack": "../../scripts/postpack.sh", "pack-tarball": "yarn pack", @@ -50,6 +50,6 @@ } }, "devDependencies": { - "lazyrepo": "0.0.0-alpha.22" + "lazyrepo": "0.0.0-alpha.26" } } diff --git a/public-yarn.lock b/public-yarn.lock index da1502d38..ac6e229db 100644 --- a/public-yarn.lock +++ b/public-yarn.lock @@ -4275,7 +4275,7 @@ __metadata: resolution: "@tldraw/assets@workspace:packages/assets" dependencies: "@tldraw/utils": "workspace:*" - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 ts-node-dev: ^1.1.8 languageName: unknown linkType: soft @@ -4302,7 +4302,7 @@ __metadata: eslint: 8.36.0 eslint-config-next: 13.2.4 gray-matter: ^4.0.3 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 next: 13.2.4 next-mdx-remote: ^4.4.1 next-remote-watch: ^2.0.0 @@ -4349,7 +4349,7 @@ __metadata: is-plain-object: ^5.0.0 jest-canvas-mock: ^2.4.0 jest-environment-jsdom: ^29.4.3 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 lodash.throttle: ^4.1.1 lodash.uniq: ^4.5.0 nanoid: ^3.0.0 @@ -4372,7 +4372,7 @@ __metadata: "@tldraw/tlvalidate": "workspace:*" "@tldraw/ui": "workspace:*" "@tldraw/utils": "workspace:*" - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 languageName: unknown linkType: soft @@ -4405,7 +4405,7 @@ __metadata: inquirer: ^9.1.4 jest: ^28.1.1 json5: ^2.2.3 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 lint-staged: ">=10" open: ^8.4.0 prettier: ^2.8.6 @@ -4422,7 +4422,7 @@ __metadata: resolution: "@tldraw/polyfills@workspace:packages/polyfills" dependencies: core-js: ^3.27.2 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 languageName: unknown linkType: soft @@ -4432,7 +4432,7 @@ __metadata: dependencies: "@tldraw/tlschema": "workspace:*" benchmark: ^2.1.4 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 languageName: unknown linkType: soft @@ -4450,7 +4450,7 @@ __metadata: glob: ^8.0.3 is-ci: ^3.0.1 kleur: ^4.1.5 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 prettier: ^2.8.7 recast: ^0.22.0 rimraf: ^4.4.0 @@ -4476,7 +4476,7 @@ __metadata: gzip-size: ^7.0.0 jest-canvas-mock: ^2.4.0 jest-environment-jsdom: ^28.1.2 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 resize-observer-polyfill: ^1.5.1 peerDependencies: react: ^18 @@ -4492,7 +4492,7 @@ __metadata: "@tldraw/tlvalidate": "workspace:*" "@tldraw/utils": "workspace:*" kleur: ^4.1.5 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 nanoid: ^3.0.0 languageName: unknown linkType: soft @@ -4504,7 +4504,7 @@ __metadata: "@peculiar/webcrypto": ^1.4.0 "@tldraw/utils": "workspace:*" "@types/lodash.isequal": ^4.5.6 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 lodash.isequal: ^4.5.0 nanoid: ^3.0.0 raf: ^3.4.1 @@ -4523,7 +4523,7 @@ __metadata: "@types/react": "*" "@types/react-dom": "*" idb: ^7.1.0 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 react: "*" ws: ^8.10.0 peerDependencies: @@ -4540,7 +4540,7 @@ __metadata: resolution: "@tldraw/tlvalidate@workspace:packages/tlvalidate" dependencies: "@tldraw/utils": "workspace:*" - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 languageName: unknown linkType: soft @@ -4572,7 +4572,7 @@ __metadata: idb: ^7.1.1 jest-canvas-mock: ^2.4.0 jest-environment-jsdom: ^28.1.2 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 lz-string: ^1.4.4 resize-observer-polyfill: ^1.5.1 peerDependencies: @@ -4587,7 +4587,7 @@ __metadata: version: 0.0.0-use.local resolution: "@tldraw/utils@workspace:packages/utils" dependencies: - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 languageName: unknown linkType: soft @@ -4612,7 +4612,7 @@ __metadata: dotenv: ^16.0.3 esbuild: ^0.16.7 fs-extra: ^11.1.0 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 nanoid: ^4.0.2 react: ^18.2.0 react-dom: ^18.2.0 @@ -6974,7 +6974,7 @@ __metadata: languageName: node linkType: hard -"ci-info@npm:^3.1.0, ci-info@npm:^3.2.0": +"ci-info@npm:^3.1.0, ci-info@npm:^3.2.0, ci-info@npm:^3.8.0": version: 3.8.0 resolution: "ci-info@npm:3.8.0" checksum: d0a4d3160497cae54294974a7246202244fff031b0a6ea20dd57b10ec510aa17399c41a1b0982142c105f3255aff2173e5c0dd7302ee1b2f28ba3debda375098 @@ -7335,7 +7335,7 @@ __metadata: dependencies: eslint-config-prettier: ^8.3.0 eslint-plugin-react: 7.28.0 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 languageName: unknown linkType: soft @@ -9456,7 +9456,7 @@ __metadata: concurrently: ^7.4.0 esbuild: ^0.16.7 ip: ^1.1.8 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 node-forge: ^1.3.1 react: ^18.2.0 react-dom: ^18.2.0 @@ -12485,12 +12485,13 @@ __metadata: languageName: node linkType: hard -"lazyrepo@npm:0.0.0-alpha.22": - version: 0.0.0-alpha.22 - resolution: "lazyrepo@npm:0.0.0-alpha.22" +"lazyrepo@npm:0.0.0-alpha.26": + version: 0.0.0-alpha.26 + resolution: "lazyrepo@npm:0.0.0-alpha.26" dependencies: "@sindresorhus/slugify": ^2.2.0 cac: ^6.7.14 + ci-info: ^3.8.0 cross-spawn: ^7.0.3 esbuild: ^0.17.15 fast-glob: ^3.2.12 @@ -12506,7 +12507,7 @@ __metadata: zod-validation-error: ^1.3.0 bin: lazy: bin.js - checksum: b8c0390dd8086386fe46b6a1a3184288a9eeb26139b28893491f8eec418a4ea7560361b087363c1cd74a312af1913be68d4026a9071f73c4f381699c2573af39 + checksum: 47a874c49a004cf6afa04894f5cb3e9e72b623dd66484b7a879a649ea1efdbe39785cfbdfb609eec54fed66486a0a16c587f90650756a73e0bc5fc5f2d253fc1 languageName: node linkType: hard @@ -17469,7 +17470,7 @@ __metadata: assert: ^2.0.0 esbuild: ^0.16.7 fs-extra: ^11.1.0 - lazyrepo: 0.0.0-alpha.22 + lazyrepo: 0.0.0-alpha.26 lodash: ^4.17.21 mocha: ^9.1.1 nanoid: ^4.0.1 diff --git a/scripts/build-api.ts b/scripts/build-api.ts index 668043ba4..71f1dedbc 100644 --- a/scripts/build-api.ts +++ b/scripts/build-api.ts @@ -6,7 +6,7 @@ import { exec } from './lib/exec' import { sortUnions } from './lib/sort-unions' async function buildApi(sourcePackageDir: string) { - // this depends on `build:types` being run first, but we'll rely on turbo to + // this depends on `build-types` being run first, but we'll rely on turbo to // make that happen. const relativeSourcePackageDir = path.relative(path.resolve(__dirname, '../..'), sourcePackageDir) diff --git a/scripts/build-package.ts b/scripts/build-package.ts index 959e55c54..1c5318b5a 100644 --- a/scripts/build-package.ts +++ b/scripts/build-package.ts @@ -9,7 +9,7 @@ import { addJsExtensions } from './lib/add-extensions' /** Prepares the package for publishing. the tarball in case it will be written to disk. */ async function buildPackage({ sourcePackageDir }: { sourcePackageDir: string }) { - // this depends on `build:types` being run first, but we'll rely on turbo to + // this depends on `build-types` being run first, but we'll rely on turbo to // make that happen. if (!existsSync(path.join(sourcePackageDir, 'src/index.ts'))) { diff --git a/scripts/check-scripts.ts b/scripts/check-scripts.ts index b43c4205d..4d826af64 100644 --- a/scripts/check-scripts.ts +++ b/scripts/check-scripts.ts @@ -25,8 +25,8 @@ const expectedPackageScripts = { // published packages should have these scripts const expectedPublishedPackageScripts = { ...expectedPackageScripts, - 'build:package': tsScript('build-package.ts'), - 'build:api': tsScript('build-api.ts'), + 'build-package': tsScript('build-package.ts'), + 'build-api': tsScript('build-api.ts'), prepack: tsScript('prepack.ts'), postpack: (packageDir: string) => scriptPath(packageDir, 'postpack.sh'), 'pack-tarball': () => 'yarn pack', diff --git a/scripts/package.json b/scripts/package.json index 083487866..4e3f7174a 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -37,7 +37,7 @@ "glob": "^8.0.3", "is-ci": "^3.0.1", "kleur": "^4.1.5", - "lazyrepo": "0.0.0-alpha.22", + "lazyrepo": "0.0.0-alpha.26", "prettier": "^2.8.7", "recast": "^0.22.0", "rimraf": "^4.4.0", diff --git a/scripts/prepack.ts b/scripts/prepack.ts index 08d32023d..efe0170cc 100644 --- a/scripts/prepack.ts +++ b/scripts/prepack.ts @@ -12,7 +12,7 @@ export async function preparePackage({ sourcePackageDir }: { sourcePackageDir: s const manifest = JSON.parse(readFileSync(path.join(sourcePackageDir, 'package.json'), 'utf8')) - execSync('yarn run -T lazy build:package', { cwd: sourcePackageDir, stdio: 'inherit' }) + execSync('yarn run -T lazy build-package', { cwd: sourcePackageDir, stdio: 'inherit' }) // save package.json and reinstate it in postpack copyFileSync(