From 2fb92625f597645b0c8509f08b5dedf0aba00b0e Mon Sep 17 00:00:00 2001 From: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> Date: Wed, 4 Sep 2024 02:16:52 +0100 Subject: [PATCH] restore workspace:* in package.json files --- lerna.json | 2 +- packages/api-server/package.json | 14 +++--- .../cli-packages/storybook-vite/package.json | 10 ++-- .../templates/js/api/src/lib/auth.js | 2 +- packages/storybook/package.json | 6 +-- yarn.lock | 50 +++++++++---------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/lerna.json b/lerna.json index 1471ed54b9cc..d75548e5e464 100644 --- a/lerna.json +++ b/lerna.json @@ -7,4 +7,4 @@ } }, "$schema": "node_modules/lerna/schemas/lerna-schema.json" -} \ No newline at end of file +} diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 5376087b7818..f730a33ec526 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -31,11 +31,11 @@ "dependencies": { "@fastify/multipart": "8.3.0", "@fastify/url-data": "5.4.0", - "@redwoodjs/context": "8.0.0", - "@redwoodjs/fastify-web": "8.0.0", - "@redwoodjs/internal": "8.0.0", - "@redwoodjs/project-config": "8.0.0", - "@redwoodjs/web-server": "8.0.0", + "@redwoodjs/context": "workspace:*", + "@redwoodjs/fastify-web": "workspace:*", + "@redwoodjs/internal": "workspace:*", + "@redwoodjs/project-config": "workspace:*", + "@redwoodjs/web-server": "workspace:*", "chalk": "4.1.2", "chokidar": "3.6.0", "dotenv-defaults": "5.0.2", @@ -51,7 +51,7 @@ "yargs": "17.7.2" }, "devDependencies": { - "@redwoodjs/framework-tools": "8.0.0", + "@redwoodjs/framework-tools": "workspace:*", "@types/aws-lambda": "8.10.143", "@types/lodash": "4.17.7", "@types/qs": "6.9.15", @@ -63,7 +63,7 @@ "vitest": "2.0.5" }, "peerDependencies": { - "@redwoodjs/graphql-server": "8.0.0" + "@redwoodjs/graphql-server": "workspace:*" }, "peerDependenciesMeta": { "@redwoodjs/graphql-server": { diff --git a/packages/cli-packages/storybook-vite/package.json b/packages/cli-packages/storybook-vite/package.json index 8281775ea57c..08bb10d17185 100644 --- a/packages/cli-packages/storybook-vite/package.json +++ b/packages/cli-packages/storybook-vite/package.json @@ -22,19 +22,19 @@ "test:unit": "vitest run" }, "dependencies": { - "@redwoodjs/cli-helpers": "8.0.0", - "@redwoodjs/project-config": "8.0.0", - "@redwoodjs/telemetry": "8.0.0", + "@redwoodjs/cli-helpers": "workspace:*", + "@redwoodjs/project-config": "workspace:*", + "@redwoodjs/telemetry": "workspace:*", "chalk": "4.1.2", "execa": "5.1.1", "storybook": "7.6.17", - "storybook-framework-redwoodjs-vite": "8.0.0", + "storybook-framework-redwoodjs-vite": "workspace:*", "terminal-link": "2.1.1", "vitest": "2.0.5", "yargs": "17.7.2" }, "devDependencies": { - "@redwoodjs/framework-tools": "8.0.0", + "@redwoodjs/framework-tools": "workspace:*", "@types/yargs": "17.0.33", "tsx": "4.17.0", "typescript": "5.5.4" diff --git a/packages/create-redwood-app/templates/js/api/src/lib/auth.js b/packages/create-redwood-app/templates/js/api/src/lib/auth.js index ef6d8c9d10d8..c55e5f7535e6 100644 --- a/packages/create-redwood-app/templates/js/api/src/lib/auth.js +++ b/packages/create-redwood-app/templates/js/api/src/lib/auth.js @@ -19,7 +19,7 @@ export const hasRole = ({ roles }) => { // in ./api/src/directives/requireAuth // Roles are passed in by the requireAuth directive if you have auth setup -// eslint-disable-next-line @typescript-eslint/no-unused-vars +// eslint-disable-next-line no-unused-vars export const requireAuth = ({ roles }) => { return isAuthenticated() } diff --git a/packages/storybook/package.json b/packages/storybook/package.json index 7ad844b7c2ec..accb20b1f070 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -49,7 +49,7 @@ }, "dependencies": { "@joshwooding/vite-plugin-react-docgen-typescript": "0.4.0", - "@redwoodjs/testing": "8.0.0", + "@redwoodjs/testing": "workspace:*", "@rollup/pluginutils": "5.1.0", "@storybook/addon-essentials": "7.6.17", "@storybook/builder-vite": "7.6.17", @@ -65,8 +65,8 @@ "vite": "5.4.1" }, "peerDependencies": { - "@redwoodjs/project-config": "8.0.0", - "@redwoodjs/router": "8.0.0", + "@redwoodjs/project-config": "workspace:*", + "@redwoodjs/router": "workspace:*", "react": "19.0.0-rc-8269d55d-20240802", "react-dom": "19.0.0-rc-8269d55d-20240802", "storybook": "7.6.17" diff --git a/yarn.lock b/yarn.lock index 32e08c82ae96..f5072efc348b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7224,12 +7224,12 @@ __metadata: dependencies: "@fastify/multipart": "npm:8.3.0" "@fastify/url-data": "npm:5.4.0" - "@redwoodjs/context": "npm:8.0.0" - "@redwoodjs/fastify-web": "npm:8.0.0" - "@redwoodjs/framework-tools": "npm:8.0.0" - "@redwoodjs/internal": "npm:8.0.0" - "@redwoodjs/project-config": "npm:8.0.0" - "@redwoodjs/web-server": "npm:8.0.0" + "@redwoodjs/context": "workspace:*" + "@redwoodjs/fastify-web": "workspace:*" + "@redwoodjs/framework-tools": "workspace:*" + "@redwoodjs/internal": "workspace:*" + "@redwoodjs/project-config": "workspace:*" + "@redwoodjs/web-server": "workspace:*" "@types/aws-lambda": "npm:8.10.143" "@types/lodash": "npm:4.17.7" "@types/qs": "npm:6.9.15" @@ -7253,7 +7253,7 @@ __metadata: vitest: "npm:2.0.5" yargs: "npm:17.7.2" peerDependencies: - "@redwoodjs/graphql-server": 8.0.0 + "@redwoodjs/graphql-server": "workspace:*" peerDependenciesMeta: "@redwoodjs/graphql-server": optional: true @@ -7884,7 +7884,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/cli-helpers@npm:8.0.0, @redwoodjs/cli-helpers@workspace:*, @redwoodjs/cli-helpers@workspace:packages/cli-helpers": +"@redwoodjs/cli-helpers@workspace:*, @redwoodjs/cli-helpers@workspace:packages/cli-helpers": version: 0.0.0-use.local resolution: "@redwoodjs/cli-helpers@workspace:packages/cli-helpers" dependencies: @@ -7922,15 +7922,15 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/cli-storybook-vite@workspace:packages/cli-packages/storybook-vite" dependencies: - "@redwoodjs/cli-helpers": "npm:8.0.0" - "@redwoodjs/framework-tools": "npm:8.0.0" - "@redwoodjs/project-config": "npm:8.0.0" - "@redwoodjs/telemetry": "npm:8.0.0" + "@redwoodjs/cli-helpers": "workspace:*" + "@redwoodjs/framework-tools": "workspace:*" + "@redwoodjs/project-config": "workspace:*" + "@redwoodjs/telemetry": "workspace:*" "@types/yargs": "npm:17.0.33" chalk: "npm:4.1.2" execa: "npm:5.1.1" storybook: "npm:7.6.17" - storybook-framework-redwoodjs-vite: "npm:8.0.0" + storybook-framework-redwoodjs-vite: "workspace:*" terminal-link: "npm:2.1.1" tsx: "npm:4.17.0" typescript: "npm:5.5.4" @@ -8053,7 +8053,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/context@npm:8.0.0, @redwoodjs/context@workspace:*, @redwoodjs/context@workspace:packages/context": +"@redwoodjs/context@workspace:*, @redwoodjs/context@workspace:packages/context": version: 0.0.0-use.local resolution: "@redwoodjs/context@workspace:packages/context" dependencies: @@ -8169,7 +8169,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/fastify-web@npm:8.0.0, @redwoodjs/fastify-web@workspace:*, @redwoodjs/fastify-web@workspace:packages/adapters/fastify/web": +"@redwoodjs/fastify-web@workspace:*, @redwoodjs/fastify-web@workspace:packages/adapters/fastify/web": version: 0.0.0-use.local resolution: "@redwoodjs/fastify-web@workspace:packages/adapters/fastify/web" dependencies: @@ -8214,7 +8214,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/framework-tools@npm:8.0.0, @redwoodjs/framework-tools@workspace:*, @redwoodjs/framework-tools@workspace:packages/framework-tools": +"@redwoodjs/framework-tools@workspace:*, @redwoodjs/framework-tools@workspace:packages/framework-tools": version: 0.0.0-use.local resolution: "@redwoodjs/framework-tools@workspace:packages/framework-tools" dependencies: @@ -8276,7 +8276,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/internal@npm:8.0.0, @redwoodjs/internal@workspace:*, @redwoodjs/internal@workspace:packages/internal": +"@redwoodjs/internal@workspace:*, @redwoodjs/internal@workspace:packages/internal": version: 0.0.0-use.local resolution: "@redwoodjs/internal@workspace:packages/internal" dependencies: @@ -8490,7 +8490,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/project-config@npm:8.0.0, @redwoodjs/project-config@workspace:*, @redwoodjs/project-config@workspace:packages/project-config": +"@redwoodjs/project-config@workspace:*, @redwoodjs/project-config@workspace:packages/project-config": version: 0.0.0-use.local resolution: "@redwoodjs/project-config@workspace:packages/project-config" dependencies: @@ -8661,7 +8661,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/telemetry@npm:8.0.0, @redwoodjs/telemetry@workspace:*, @redwoodjs/telemetry@workspace:packages/telemetry": +"@redwoodjs/telemetry@workspace:*, @redwoodjs/telemetry@workspace:packages/telemetry": version: 0.0.0-use.local resolution: "@redwoodjs/telemetry@workspace:packages/telemetry" dependencies: @@ -8682,7 +8682,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/testing@npm:8.0.0, @redwoodjs/testing@workspace:*, @redwoodjs/testing@workspace:packages/testing": +"@redwoodjs/testing@workspace:*, @redwoodjs/testing@workspace:packages/testing": version: 0.0.0-use.local resolution: "@redwoodjs/testing@workspace:packages/testing" dependencies: @@ -8798,7 +8798,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/web-server@npm:8.0.0, @redwoodjs/web-server@workspace:*, @redwoodjs/web-server@workspace:packages/web-server": +"@redwoodjs/web-server@workspace:*, @redwoodjs/web-server@workspace:packages/web-server": version: 0.0.0-use.local resolution: "@redwoodjs/web-server@workspace:packages/web-server" dependencies: @@ -27578,12 +27578,12 @@ __metadata: languageName: node linkType: hard -"storybook-framework-redwoodjs-vite@npm:8.0.0, storybook-framework-redwoodjs-vite@workspace:packages/storybook": +"storybook-framework-redwoodjs-vite@workspace:*, storybook-framework-redwoodjs-vite@workspace:packages/storybook": version: 0.0.0-use.local resolution: "storybook-framework-redwoodjs-vite@workspace:packages/storybook" dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": "npm:0.4.0" - "@redwoodjs/testing": "npm:8.0.0" + "@redwoodjs/testing": "workspace:*" "@rollup/pluginutils": "npm:5.1.0" "@storybook/addon-essentials": "npm:7.6.17" "@storybook/builder-vite": "npm:7.6.17" @@ -27596,8 +27596,8 @@ __metadata: unplugin-auto-import: "npm:0.18.2" vite: "npm:5.4.1" peerDependencies: - "@redwoodjs/project-config": 8.0.0 - "@redwoodjs/router": 8.0.0 + "@redwoodjs/project-config": "workspace:*" + "@redwoodjs/router": "workspace:*" react: 19.0.0-rc-8269d55d-20240802 react-dom: 19.0.0-rc-8269d55d-20240802 storybook: 7.6.17