From 15dbe190ba02e4581ab21bedd97194865f88c1e2 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 16 Jan 2024 15:41:03 +0100 Subject: [PATCH 1/2] meta: fix `yarn build:clean` --- package.json | 2 +- packages/@uppy/angular/.gitignore | 1 - packages/@uppy/companion/.gitignore | 4 ---- packages/@uppy/svelte/.gitignore | 2 -- packages/@uppy/vue/.gitignore | 1 - 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/package.json b/package.json index 26e7b45284..07eb52df8d 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "start:companion": "bash bin/companion.sh", "start:companion:with-loadbalancer": "e2e/start-companion-with-load-balancer.mjs", "build:bundle": "yarn node ./bin/build-bundle.mjs", - "build:clean": "git clean -e node_modules -Xfd packages e2e .parcel-cache coverage", + "build:clean": "cp .gitignore .gitignore.bak && grep -v 'node_modules' .gitignore.bak > .gitignore && echo '!**/node_modules/**/*' >> .gitignore; git clean -Xfd packages e2e .parcel-cache coverage; mv .gitignore.bak .gitignore", "build:companion": "yarn workspace @uppy/companion build", "build:css": "yarn node ./bin/build-css.js", "build:svelte": "yarn workspace @uppy/svelte build", diff --git a/packages/@uppy/angular/.gitignore b/packages/@uppy/angular/.gitignore index 0711527ef9..63dc87b027 100644 --- a/packages/@uppy/angular/.gitignore +++ b/packages/@uppy/angular/.gitignore @@ -7,7 +7,6 @@ /bazel-out # Node -/node_modules npm-debug.log yarn-error.log diff --git a/packages/@uppy/companion/.gitignore b/packages/@uppy/companion/.gitignore index abc16a6eab..cca665b287 100644 --- a/packages/@uppy/companion/.gitignore +++ b/packages/@uppy/companion/.gitignore @@ -22,10 +22,6 @@ coverage # Compiled binary addons (http://nodejs.org/api/addons.html) build/Release -# Dependency directory -# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git -node_modules - # oAuth Configuration config/auth.js diff --git a/packages/@uppy/svelte/.gitignore b/packages/@uppy/svelte/.gitignore index cb55d26b25..0aac31a3a0 100644 --- a/packages/@uppy/svelte/.gitignore +++ b/packages/@uppy/svelte/.gitignore @@ -1,5 +1,3 @@ .DS_Store -node_modules /dist/ /src/empty.* -package-lock.json diff --git a/packages/@uppy/vue/.gitignore b/packages/@uppy/vue/.gitignore index f7ad9495a3..18412da523 100644 --- a/packages/@uppy/vue/.gitignore +++ b/packages/@uppy/vue/.gitignore @@ -1,5 +1,4 @@ .DS_Store -node_modules /dist From 9371a7bdfde9933a55544da00a0c6c5f4c803822 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 16 Jan 2024 15:56:46 +0100 Subject: [PATCH 2/2] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 07eb52df8d..0df02ddba3 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "start:companion": "bash bin/companion.sh", "start:companion:with-loadbalancer": "e2e/start-companion-with-load-balancer.mjs", "build:bundle": "yarn node ./bin/build-bundle.mjs", - "build:clean": "cp .gitignore .gitignore.bak && grep -v 'node_modules' .gitignore.bak > .gitignore && echo '!**/node_modules/**/*' >> .gitignore; git clean -Xfd packages e2e .parcel-cache coverage; mv .gitignore.bak .gitignore", + "build:clean": "cp .gitignore .gitignore.bak && printf '!node_modules\n!**/node_modules/**/*\n' >> .gitignore; git clean -Xfd packages e2e .parcel-cache coverage; mv .gitignore.bak .gitignore", "build:companion": "yarn workspace @uppy/companion build", "build:css": "yarn node ./bin/build-css.js", "build:svelte": "yarn workspace @uppy/svelte build",