diff --git a/apps/design-system/README.md b/apps/design-system/README.md index 4708b9866f5..893f21e36e6 100644 --- a/apps/design-system/README.md +++ b/apps/design-system/README.md @@ -9,10 +9,10 @@ First, make a copy of _.env.local.example_ and name it _env.local_. Then install ```bash cd apps/design-system pnpm i -pnpm dev:full +pnpm dev ``` -The `dev:full` command runs both the Next.js development server and Contentlayer concurrently, which is recommended for most development workflows. +The `dev` command runs both the Next.js development server and Contentlayer concurrently, which is recommended for most development workflows. ### Alternative commands @@ -20,10 +20,10 @@ You can also run the development server and content watcher separately: ```bash # Run only the Next.js development server -pnpm dev +pnpm dev:next # Run only the content watcher (in a separate terminal shell) -pnpm content:dev +pnpm dev:content ``` Or run the development server from the root directory: @@ -39,14 +39,14 @@ To run both the development server and content watcher from the root directory, pnpm dev:design-system # Run the content watcher (in a separate terminal shell) -pnpm --filter=design-system content:dev +pnpm --filter=design-system dev:content ``` Open [http://localhost:3003](http://localhost:3003) in your browser to see the result. ### Watching for MDX changes -The `dev:full` command automatically watches for changes to MDX files with hot reload. If you're running the `pnpm dev` separately, you'll need to run `pnpm content:dev` in a separate terminal shell to watch for content changes. +The `dev` command automatically watches for changes to MDX files with hot reload. If you're running the `pnpm dev:next` separately, you'll need to run `pnpm dev:content` in a separate terminal shell to watch for content changes. ### Adding components diff --git a/apps/design-system/package.json b/apps/design-system/package.json index 089349e2223..bad4ec8c6be 100644 --- a/apps/design-system/package.json +++ b/apps/design-system/package.json @@ -5,13 +5,13 @@ "type": "module", "scripts": { "preinstall": "npx only-allow pnpm", - "dev": "next dev --turbopack --port 3003", - "dev:full": "concurrently \"pnpm dev\" \"pnpm content:dev\"", + "dev": "run-p --race dev:*", + "dev:next": "next dev --turbopack --port 3003", + "dev:content": "contentlayer2 dev", "build": "pnpm run content:build && pnpm run build:registry && next build --turbopack", "build:registry": "tsx ./scripts/build-registry.mts && prettier --log-level silent --write \"registry/**/*.{ts,tsx,mdx}\" --cache", "start": "next start", "lint": "eslint .", - "content:dev": "contentlayer2 dev", "content:build": "contentlayer2 build", "clean": "rimraf node_modules .next .turbo", "typecheck": "contentlayer2 build && tsc --noEmit -p tsconfig.json" @@ -57,9 +57,9 @@ "@types/lodash.template": "4.5.0", "@types/react": "catalog:", "@types/react-dom": "catalog:", - "concurrently": "^8.2.2", "config": "workspace:*", "mdast-util-toc": "^6.1.1", + "npm-run-all": "^4.1.5", "postcss": "catalog:", "rimraf": "^4.1.3", "shiki": "^1.1.7", diff --git a/apps/docs/package.json b/apps/docs/package.json index c4388bfc3c4..11a8b9a54ff 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -22,7 +22,8 @@ "codegen:references:legacy": "tsx features/docs/Reference.generated.script.ts", "codegen:references": "pnpm codegen:references:legacy && pnpm codegen:references:new", "codemod:frontmatter": "node ./scripts/codemod/mdx-meta.mjs && prettier --cache --write \"content/**/*.mdx\"", - "dev": "concurrently --kill-others \"next dev --port 3001\" \"pnpm run dev:watch:troubleshooting\"", + "dev": "run-p --race dev:next dev:watch:troubleshooting", + "dev:next": "next dev --port 3001", "dev:secrets:pull": "AWS_PROFILE=supa-dev node ../../scripts/getSecrets.js -n local/docs", "dev:watch:troubleshooting": "node ./scripts/troubleshooting/watch.mjs", "embeddings": "tsx --conditions=react-server scripts/search/generate-embeddings.ts", @@ -162,12 +163,12 @@ "api-types": "workspace:*", "cheerio": "^1.0.0-rc.12", "chokidar": "^4.0.3", - "concurrently": "^9.1.2", "config": "workspace:*", "dotenv": "^16.0.3", "ejs": "^3.1.10", "globby": "^13.2.2", "graphiql": "^4.0.2", + "npm-run-all": "^4.1.5", "openapi-types": "^12.1.3", "postcss": "catalog:", "shiki": "^3.2.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8685da507ad..cac46b981b0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -294,15 +294,15 @@ importers: '@types/react-dom': specifier: 'catalog:' version: 19.2.3(@types/react@19.2.14) - concurrently: - specifier: ^8.2.2 - version: 8.2.2 config: specifier: workspace:* version: link:../../packages/config mdast-util-toc: specifier: ^6.1.1 version: 6.1.1 + npm-run-all: + specifier: ^4.1.5 + version: 4.1.5 postcss: specifier: ^8.5.10 version: 8.5.10 @@ -649,9 +649,6 @@ importers: chokidar: specifier: ^4.0.3 version: 4.0.3 - concurrently: - specifier: ^9.1.2 - version: 9.1.2 dotenv: specifier: ^16.0.3 version: 16.3.1 @@ -664,6 +661,9 @@ importers: graphiql: specifier: ^4.0.2 version: 4.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6) + npm-run-all: + specifier: ^4.1.5 + version: 4.1.5 openapi-types: specifier: ^12.1.3 version: 12.1.3 @@ -9819,16 +9819,6 @@ packages: concat-with-sourcemaps@1.1.0: resolution: {integrity: sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==} - concurrently@8.2.2: - resolution: {integrity: sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==} - engines: {node: ^14.13.0 || >=16.0.0} - hasBin: true - - concurrently@9.1.2: - resolution: {integrity: sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==} - engines: {node: '>=18'} - hasBin: true - confbox@0.1.8: resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} @@ -15827,9 +15817,6 @@ packages: space-separated-tokens@2.0.2: resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==} - spawn-command@0.0.2: - resolution: {integrity: sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==} - spdx-correct@3.2.0: resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} @@ -16325,10 +16312,6 @@ packages: peerDependencies: tslib: '2' - tree-kill@1.2.2: - resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} - hasBin: true - trim-lines@3.0.1: resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==} @@ -25465,7 +25448,7 @@ snapshots: dependencies: ansi-align: 3.0.1 camelcase: 8.0.0 - chalk: 5.4.1 + chalk: 5.6.2 cli-boxes: 3.0.0 string-width: 7.2.0 type-fest: 4.30.0 @@ -25996,28 +25979,6 @@ snapshots: dependencies: source-map: 0.6.1 - concurrently@8.2.2: - dependencies: - chalk: 4.1.2 - date-fns: 2.30.0 - lodash: 4.18.1 - rxjs: 7.8.1 - shell-quote: 1.8.4 - spawn-command: 0.0.2 - supports-color: 8.1.1 - tree-kill: 1.2.2 - yargs: 17.7.2 - - concurrently@9.1.2: - dependencies: - chalk: 4.1.2 - lodash: 4.18.1 - rxjs: 7.8.1 - shell-quote: 1.8.4 - supports-color: 8.1.1 - tree-kill: 1.2.2 - yargs: 17.7.2 - confbox@0.1.8: {} confbox@0.2.4: {} @@ -26819,7 +26780,7 @@ snapshots: has-property-descriptors: 1.0.2 has-proto: 1.2.0 has-symbols: 1.1.0 - hasown: 2.0.2 + hasown: 2.0.4 internal-slot: 1.1.0 is-array-buffer: 3.0.5 is-callable: 1.2.7 @@ -26892,7 +26853,7 @@ snapshots: es-shim-unscopables@1.0.2: dependencies: - hasown: 2.0.2 + hasown: 2.0.4 es-to-primitive@1.3.0: dependencies: @@ -27113,7 +27074,7 @@ snapshots: eslint: 9.37.0(jiti@2.7.0)(supports-color@8.1.1) eslint-import-resolver-node: 0.3.9(supports-color@8.1.1) eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.48.0(eslint@9.37.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.2))(eslint-import-resolver-node@0.3.9(supports-color@8.1.1))(eslint-import-resolver-typescript@3.6.1)(eslint@9.37.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1) - hasown: 2.0.2 + hasown: 2.0.4 is-core-module: 2.16.1 is-glob: 4.0.3 minimatch: 3.1.4 @@ -27163,7 +27124,7 @@ snapshots: es-iterator-helpers: 1.2.1 eslint: 9.37.0(jiti@2.7.0)(supports-color@8.1.1) estraverse: 5.3.0 - hasown: 2.0.2 + hasown: 2.0.4 jsx-ast-utils: 3.3.5 minimatch: 3.1.4 object.entries: 1.1.9 @@ -27794,7 +27755,7 @@ snapshots: call-bound: 1.0.4 define-properties: 1.2.1 functions-have-names: 1.2.3 - hasown: 2.0.2 + hasown: 2.0.4 is-callable: 1.2.7 functions-have-names@1.2.3: {} @@ -28599,7 +28560,7 @@ snapshots: internal-slot@1.1.0: dependencies: es-errors: 1.3.0 - hasown: 2.0.2 + hasown: 2.0.4 side-channel: 1.1.0 internmap@1.0.1: {} @@ -28692,7 +28653,7 @@ snapshots: is-core-module@2.16.1: dependencies: - hasown: 2.0.2 + hasown: 2.0.4 is-data-view@1.0.2: dependencies: @@ -28806,7 +28767,7 @@ snapshots: call-bound: 1.0.4 gopd: 1.2.0 has-tostringtag: 1.0.2 - hasown: 2.0.2 + hasown: 2.0.4 is-regexp@3.1.0: {} @@ -29366,7 +29327,7 @@ snapshots: log-symbols@6.0.0: dependencies: - chalk: 5.4.1 + chalk: 5.6.2 is-unicode-supported: 1.3.0 log-update@4.0.0: @@ -31472,7 +31433,7 @@ snapshots: ora@8.2.0: dependencies: - chalk: 5.4.1 + chalk: 5.6.2 cli-cursor: 5.0.0 cli-spinners: 2.9.2 is-interactive: 2.0.0 @@ -33567,8 +33528,6 @@ snapshots: space-separated-tokens@2.0.2: {} - spawn-command@0.0.2: {} - spdx-correct@3.2.0: dependencies: spdx-expression-parse: 3.0.1 @@ -34083,8 +34042,6 @@ snapshots: dependencies: tslib: 2.8.1 - tree-kill@1.2.2: {} - trim-lines@3.0.1: {} trough@2.1.0: {}