From 97c1bfb68f52868556988301f12d12011fa33308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Fern=C3=A1ndez=20de=20Alba?= Date: Tue, 30 Jan 2024 20:36:16 +0100 Subject: [PATCH] Remove turbo from monorepo commands until it's really necessary (#5715) --- Makefile | 2 +- package.json | 16 ++++++++-------- packages/volto/news/5715.bugfix | 1 + packages/volto/package.json | 4 +++- pnpm-lock.yaml | 6 ++++++ 5 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 packages/volto/news/5715.bugfix diff --git a/Makefile b/Makefile index 76388d00f9..3ee758c4d0 100644 --- a/Makefile +++ b/Makefile @@ -170,7 +170,7 @@ cypress-install: .PHONY: build-deps build-deps: - pnpm build:deps + if [ ! -d $$(pwd)/registry/dist ]; then (pnpm build:deps); fi ##### Release diff --git a/package.json b/package.json index 34f9c4ae0b..4b3027b33f 100644 --- a/package.json +++ b/package.json @@ -6,15 +6,15 @@ "postinstall": "make setup", "watch": "turbo run watch", "build:deps": "turbo run build --filter @plone/registry --filter @plone/client", - "build:registry": "turbo run build --filter @plone/registry", - "build": "pnpm build:registry && pnpm --filter @plone/volto build", - "start": "pnpm build:registry && pnpm --filter @plone/volto start", - "start:project": "turbo run start --filter plone", + "build:registry": "pnpm --filter @plone/registry run build", + "build": "pnpm build:deps && pnpm --filter @plone/volto build", + "start": "pnpm build:deps && pnpm --filter @plone/volto start", + "start:project": "pnpm --filter plone run start", "lint": "pnpm build:deps && eslint --max-warnings=0 '{apps,packages}/**/*.{js,jsx,ts,tsx}'", - "lint:volto": "turbo run lint --filter @plone/volto", - "test": "turbo run test:ci --filter @plone/volto", - "i18n": "turbo run i18n --filter @plone/volto", - "i18n:ci": "turbo run i18n:ci --filter @plone/volto", + "lint:volto": "pnpm --filter @plone/volto run lint", + "test": "pnpm --filter @plone/volto run test:ci", + "i18n": "pnpm --filter @plone/volto run i18n", + "i18n:ci": "pnpm --filter @plone/volto i18n:ci", "prettier": "prettier --check '{apps,packages}/**/*.{js,jsx,ts,tsx}'", "prettier:fix": "prettier --write '{apps,packages}/**/*.{js,jsx,ts,tsx}' ", "format": "prettier --write \"**/*.{ts,tsx,md}\"", diff --git a/packages/volto/news/5715.bugfix b/packages/volto/news/5715.bugfix new file mode 100644 index 0000000000..df39ed3ef2 --- /dev/null +++ b/packages/volto/news/5715.bugfix @@ -0,0 +1 @@ +Remove turbo from monorepo commands until it's really necessary @sneridagh diff --git a/packages/volto/package.json b/packages/volto/package.json index 996173e77f..78db6d427f 100644 --- a/packages/volto/package.json +++ b/packages/volto/package.json @@ -340,17 +340,19 @@ "use-deep-compare-effect": "1.8.1", "uuid": "^8.3.2", "webpack": "5.76.1", + "webpack-bundle-analyzer": "4.10.1", "webpack-dev-server": "4.11.1", "webpack-node-externals": "3.0.0", - "webpack-bundle-analyzer": "4.10.1", "xmlrpc": "1.3.2", "yarnhook": "0.5.1" }, "devDependencies": { "@jest/globals": "^29.7.0", "@plone/volto-coresandbox": "workspace:*", + "@sinonjs/fake-timers": "^6.0.1", "@storybook/addon-actions": "^6.5.15", "@storybook/addon-controls": "6.5.15", + "@storybook/addon-docs": "^6.5.15", "@storybook/addon-essentials": "^6.5.15", "@storybook/addon-links": "^6.5.15", "@storybook/builder-webpack5": "^6.5.15", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6465946915..4d0b351c98 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1710,12 +1710,18 @@ importers: '@plone/volto-coresandbox': specifier: workspace:* version: link:../coresandbox + '@sinonjs/fake-timers': + specifier: ^6.0.1 + version: 6.0.1 '@storybook/addon-actions': specifier: ^6.5.15 version: 6.5.16(react-dom@17.0.2)(react@17.0.2) '@storybook/addon-controls': specifier: 6.5.15 version: 6.5.15(eslint@8.49.0)(react-dom@17.0.2)(react@17.0.2)(typescript@5.2.2) + '@storybook/addon-docs': + specifier: ^6.5.15 + version: 6.5.16(@babel/core@7.23.3)(eslint@8.49.0)(react-dom@17.0.2)(react@17.0.2)(typescript@5.2.2)(webpack@5.76.1) '@storybook/addon-essentials': specifier: ^6.5.15 version: 6.5.16(@babel/core@7.23.3)(@storybook/builder-webpack5@6.5.16)(eslint@8.49.0)(react-dom@17.0.2)(react@17.0.2)(typescript@5.2.2)(webpack@5.76.1)