From cd73dd30278d678be0078c632b726398dc908542 Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Wed, 19 Aug 2020 09:37:39 +0200 Subject: [PATCH 1/2] fix: Avoid lerna:restore unless we are on Netlify (closes #1926, #1996) --- .netlify/build-deploy-preview.sh | 1 + package.json | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.netlify/build-deploy-preview.sh b/.netlify/build-deploy-preview.sh index 2d1ccb715..0e6edc55a 100644 --- a/.netlify/build-deploy-preview.sh +++ b/.netlify/build-deploy-preview.sh @@ -11,6 +11,7 @@ node -v # Install build deps and all monorepo package dependencies. Yarn Workspaces # should also symlink all projects appropriately +yarn run lerna:restore yarn install --no-ignore-optional --pure-lockfile # Build && Move PWA Output diff --git a/package.json b/package.json index c9fdaa2f9..57692f95d 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "release": "yarn run lerna:version && yarn run lerna:publish", "lerna:cache": "[ $NETLIFY_RESTORE = 1 ] && ./netlify-lerna-cache.sh || :", "lerna:restore": "[ $NETLIFY_RESTORE = 1 ] && ./netlify-lerna-restore.sh || :", - "preinstall": "yarn lerna:restore", "lerna:version": "npx lerna version prerelease --force-publish", "lerna:publish": "lerna publish from-package --canary --dist-tag canary", "link-list": "npm ls --depth=0 --link=true" From 09745a0349c0f11e560059211b5d70ddfde3edbc Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Wed, 19 Aug 2020 10:41:58 +0200 Subject: [PATCH 2/2] wip --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 57692f95d..f4d58db33 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,8 @@ "see-changed": "lerna changed", "docs:publish": "chmod +x ./build-and-publish-docs.sh && ./build-and-publish-docs.sh", "release": "yarn run lerna:version && yarn run lerna:publish", - "lerna:cache": "[ $NETLIFY_RESTORE = 1 ] && ./netlify-lerna-cache.sh || :", - "lerna:restore": "[ $NETLIFY_RESTORE = 1 ] && ./netlify-lerna-restore.sh || :", + "lerna:cache": "./netlify-lerna-cache.sh", + "lerna:restore": "./netlify-lerna-restore.sh", "lerna:version": "npx lerna version prerelease --force-publish", "lerna:publish": "lerna publish from-package --canary --dist-tag canary", "link-list": "npm ls --depth=0 --link=true"