From 36a4122ad8a8d037b38f5e9b66e65c0c7d9ad68d Mon Sep 17 00:00:00 2001 From: Nathan Rajlich Date: Wed, 26 Jun 2024 00:53:26 -0700 Subject: [PATCH] Update Turborepo to v2 and configure for `docs` --- docs/turbo.json | 15 +++++++++++++ package.json | 3 ++- packages/runtime/turbo.json | 2 +- pnpm-lock.yaml | 44 ++++++++++++++++++------------------- turbo.json | 36 ++++++++++++++++++++++-------- 5 files changed, 67 insertions(+), 33 deletions(-) create mode 100644 docs/turbo.json diff --git a/docs/turbo.json b/docs/turbo.json new file mode 100644 index 00000000..c2ebb98f --- /dev/null +++ b/docs/turbo.json @@ -0,0 +1,15 @@ +{ + "$schema": "https://turbo.build/schema.json", + "extends": ["//"], + "tasks": { + "build": { + "dependsOn": ["^build"], + "inputs": ["$TURBO_DEFAULT$", ".env*", "content/**", "app/**"], + "outputs": [".next/**", "!.next/cache/**"] + }, + "dev": { + "cache": false, + "persistent": true + } + } +} diff --git a/package.json b/package.json index 1de164bf..6481a231 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,5 @@ { + "name": "nx.js", "private": true, "packageManager": "pnpm@8.15.8", "scripts": { @@ -13,7 +14,7 @@ "@biomejs/biome": "^1.5.3", "@changesets/cli": "^2.27.1", "@svitejs/changesets-changelog-github-compact": "^1.1.0", - "turbo": "^1.12.5", + "turbo": "^2.0.4", "typedoc": "^0.26.0", "typedoc-plugin-markdown": "^4.1.0", "typedoc-plugin-mdn-links": "^3.1.6", diff --git a/packages/runtime/turbo.json b/packages/runtime/turbo.json index 5de92f04..3ae13159 100644 --- a/packages/runtime/turbo.json +++ b/packages/runtime/turbo.json @@ -1,7 +1,7 @@ { "$schema": "https://turborepo.org/schema.json", "extends": ["//"], - "pipeline": { + "tasks": { "bundle": { "inputs": ["src/**", "*.mjs"], "outputs": ["runtime.js"] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a6589f43..3fe3141f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: ^1.1.0 version: 1.1.0 turbo: - specifier: ^1.12.5 - version: 1.12.5 + specifier: ^2.0.4 + version: 2.0.4 typedoc: specifier: ^0.26.0 version: 0.26.0(typescript@5.5.2) @@ -7857,64 +7857,64 @@ packages: yargs: 17.7.2 dev: true - /turbo-darwin-64@1.12.5: - resolution: {integrity: sha512-0GZ8reftwNQgIQLHkHjHEXTc/Z1NJm+YjsrBP+qhM/7yIZ3TEy9gJhuogDt2U0xIWwFgisTyzbtU7xNaQydtoA==} + /turbo-darwin-64@2.0.4: + resolution: {integrity: sha512-x9mvmh4wudBstML8Z8IOmokLWglIhSfhQwnh2gBCSqabgVBKYvzl8Y+i+UCNPxheCGTgtsPepTcIaKBIyFIcvw==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.12.5: - resolution: {integrity: sha512-8WpOLNNzvH6kohQOjihD+gaWL+ZFNfjvBwhOF0rjEzvW+YR3Pa7KjhulrjWyeN2yMFqAPubTbZIGOz1EVXLuQA==} + /turbo-darwin-arm64@2.0.4: + resolution: {integrity: sha512-/B1Ih8zPRGVw5vw4SlclOf3C/woJ/2T6ieH6u54KT4wypoaVyaiyMqBcziIXycdObIYr7jQ+raHO7q3mhay9/A==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.12.5: - resolution: {integrity: sha512-INit73+bNUpwqGZCxgXCR3I+cQsdkQ3/LkfkgSOibkpg+oGqxJRzeXw3sp990d7SCoE8QOcs3iw+PtiFX/LDAA==} + /turbo-linux-64@2.0.4: + resolution: {integrity: sha512-6aG670e5zOWu6RczEYcB81nEl8EhiGJEvWhUrnAfNEUIMBEH1pR5SsMmG2ol5/m3PgiRM12r13dSqTxCLcHrVg==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.12.5: - resolution: {integrity: sha512-6lkRBvxtI/GQdGtaAec9LvVQUoRw6nXFp0kM+Eu+5PbZqq7yn6cMkgDJLI08zdeui36yXhone8XGI8pHg8bpUQ==} + /turbo-linux-arm64@2.0.4: + resolution: {integrity: sha512-AXfVOjst+mCtPDFT4tCu08Qrfv12Nj7NDd33AjGwV79NYN1Y1rcFY59UQ4nO3ij3rbcvV71Xc+TZJ4csEvRCSg==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.12.5: - resolution: {integrity: sha512-gQYbOhZg5Ww0bQ/bC0w/4W6yQRwBumUUnkB+QPo15VznwxZe2a7bo6JM+9Xy9dKLa/kn+p7zTqme4OEp6M3/Yg==} + /turbo-windows-64@2.0.4: + resolution: {integrity: sha512-QOnUR9hKl0T5gq5h1fAhVEqBSjpcBi/BbaO71YGQNgsr6pAnCQdbG8/r3MYXet53efM0KTdOhieWeO3KLNKybA==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.12.5: - resolution: {integrity: sha512-auvhZ9FrhnvQ4mgBlY9O68MT4dIfprYGvd2uPICba/mHUZZvVy5SGgbHJ0KbMwaJfnnFoPgLJO6M+3N2gDprKw==} + /turbo-windows-arm64@2.0.4: + resolution: {integrity: sha512-3v8WpdZy1AxZw0gha0q3caZmm+0gveBQ40OspD6mxDBIS+oBtO5CkxhIXkFJJW+jDKmDlM7wXDIGfMEq+QyNCQ==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.12.5: - resolution: {integrity: sha512-FATU5EnhrYG8RvQJYFJnDd18DpccDjyvd53hggw9T9JEg9BhWtIEoeaKtBjYbpXwOVrJQMDdXcIB4f2nD3QPPg==} + /turbo@2.0.4: + resolution: {integrity: sha512-Ilme/2Q5kYw0AeRr+aw3s02+WrEYaY7U8vPnqSZU/jaDG/qd6jHVN6nRWyd/9KXvJGYM69vE6JImoGoyNjLwaw==} hasBin: true optionalDependencies: - turbo-darwin-64: 1.12.5 - turbo-darwin-arm64: 1.12.5 - turbo-linux-64: 1.12.5 - turbo-linux-arm64: 1.12.5 - turbo-windows-64: 1.12.5 - turbo-windows-arm64: 1.12.5 + turbo-darwin-64: 2.0.4 + turbo-darwin-arm64: 2.0.4 + turbo-linux-64: 2.0.4 + turbo-linux-arm64: 2.0.4 + turbo-windows-64: 2.0.4 + turbo-windows-arm64: 2.0.4 dev: true /type-detect@4.0.8: diff --git a/turbo.json b/turbo.json index d3c8d15e..17191871 100644 --- a/turbo.json +++ b/turbo.json @@ -1,19 +1,37 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { - "dependsOn": ["^build"], - "inputs": ["src/**"], - "outputs": ["dist/**", "romfs/**"] + "dependsOn": [ + "^build" + ], + "inputs": [ + "src/**" + ], + "outputs": [ + "dist/**", + "romfs/**" + ] }, "docs-json": { - "inputs": ["src/**", "typedoc.json"], - "outputs": ["docs.json"] + "inputs": [ + "src/**", + "typedoc.json" + ], + "outputs": [ + "docs.json" + ] }, "nro": { - "dependsOn": ["build"], - "inputs": ["src/**"], - "outputs": ["*.nro"] + "dependsOn": [ + "build" + ], + "inputs": [ + "src/**" + ], + "outputs": [ + "*.nro" + ] } } }