From 2f8b5b15836c0395efc6fdb21b9d11440562a89d Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Tue, 3 Sep 2024 11:44:37 +0200 Subject: [PATCH 01/19] chore: refactor clean scripts in all `package.json` --- chrome-extension/package.json | 6 ++++-- package.json | 11 ++++++++--- packages/dev-utils/package.json | 5 ++++- packages/hmr/package.json | 5 ++++- packages/i18n/package.json | 5 ++++- packages/shared/package.json | 5 ++++- packages/storage/package.json | 5 ++++- packages/ui/package.json | 5 ++++- packages/vite-config/package.json | 4 ++++ packages/zipper/package.json | 5 ++++- pages/content-runtime/package.json | 6 ++++-- pages/content-ui/package.json | 7 +++++-- pages/content/package.json | 6 ++++-- pages/devtools-panel/package.json | 6 ++++-- pages/devtools/package.json | 6 ++++-- pages/new-tab/package.json | 6 ++++-- pages/options/package.json | 6 ++++-- pages/popup/package.json | 6 ++++-- pages/side-panel/package.json | 6 ++++-- turbo.json | 13 +++++++++++++ 20 files changed, 94 insertions(+), 30 deletions(-) diff --git a/chrome-extension/package.json b/chrome-extension/package.json index 15cd16b39..4c557a765 100644 --- a/chrome-extension/package.json +++ b/chrome-extension/package.json @@ -2,9 +2,12 @@ "name": "chrome-extension", "version": "0.3.1", "description": "chrome extension", + "type": "module", "scripts": { - "clean": "rimraf ../../dist", "build": "tsc --noEmit && vite build", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build:firefox": "tsc --noEmit && cross-env __FIREFOX__=true vite build", "build:watch": "cross-env __DEV__=true vite build --mode development", "build:firefox:watch": "cross-env __DEV__=true __FIREFOX__=true vite build --mode development", @@ -16,7 +19,6 @@ "prettier": "prettier . --write --ignore-path ../.prettierignore", "type-check": "tsc --noEmit" }, - "type": "module", "dependencies": { "webextension-polyfill": "^0.12.0", "@extension/shared": "workspace:*", diff --git a/package.json b/package.json index 670d2593a..9a0db63d6 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,14 @@ "url": "https://github.com/Jonghakseo/chrome-extension-boilerplate-react-vite.git" }, "scripts": { - "clean:node_modules": "pnpx rimraf --glob **/node_modules", - "clean:turbo": "turbo clean && turbo daemon stop && rimraf dist && rimraf .turbo", - "clean": "pnpm clean:turbo && pnpm clean:node_modules", + "clean-root:bundle": "pnpx rimraf dist && pnpx rimraf dist-zip", + "clean-root:node_modules": "pnpx turbo daemon stop && pnpx rimraf node_modules", + "clean-root:turbo": "pnpx turbo daemon stop && pnpx rimraf .turbo", + "clean-root": "pnpm clean-root:bundle && pnpm clean-root:node_modules && pnpm clean-root:turbo", + "clean:node_modules": "pnpx turbo clean:node_modules && pnpm clean-root:node_modules", + "clean:turbo": "pnpx turbo clean:turbo && pnpm clean-root:turbo", + "clean:bundle": "pnpx turbo clean:bundle && pnpm clean-root:bundle", + "clean": "pnpx turbo clean && pnpm clean-root", "clean:install": "pnpm clean:node_modules && pnpm install --frozen-lockfile", "build": "turbo build", "build:firefox": "cross-env __FIREFOX__=true turbo build", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index af2dfd213..072a15f7e 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -11,7 +11,10 @@ "module": "dist/index.js", "types": "index.ts", "scripts": { - "clean": "rimraf ./dist && rimraf ./build", + "clean:bundle": "pnpx rimraf dist", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "ready": "tsc", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/packages/hmr/package.json b/packages/hmr/package.json index 170fd54f7..0bac345ad 100644 --- a/packages/hmr/package.json +++ b/packages/hmr/package.json @@ -11,7 +11,10 @@ "module": "dist/index.js", "types": "index.ts", "scripts": { - "clean": "rimraf ./dist && rimraf ./build", + "clean:bundle": "pnpx rimraf dist && pnpx rimraf build", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "build:tsc": "tsc -b tsconfig.build.json", "build:rollup": "rollup --config rollup.config.mjs", "ready": "pnpm run build:tsc && pnpm run build:rollup", diff --git a/packages/i18n/package.json b/packages/i18n/package.json index fa7292fde..41b3d15af 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -10,7 +10,10 @@ "types": "index.ts", "main": "./dist/index.js", "scripts": { - "clean": "rimraf ./dist", + "clean:bundle": "pnpx rimraf dist", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "genenrate-i8n": "node genenrate-i18n.mjs", "ready": "pnpm genenrate-i8n && node build.dev.mjs", "build": "pnpm genenrate-i8n && node build.prod.mjs", diff --git a/packages/shared/package.json b/packages/shared/package.json index db580f747..3e9a31b37 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -10,7 +10,10 @@ "types": "index.ts", "main": "./dist/index.js", "scripts": { - "clean": "rimraf ./dist", + "clean:bundle": "pnpx rimraf dist", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "ready": "node build.mjs", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/packages/storage/package.json b/packages/storage/package.json index d20b44735..6fd85a557 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -10,7 +10,10 @@ "main": "./dist/index.js", "types": "index.ts", "scripts": { - "clean": "rimraf ./dist", + "clean:bundle": "pnpx rimraf dist", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "ready": "node build.mjs", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/packages/ui/package.json b/packages/ui/package.json index 43defaa63..4ad4f63e1 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -12,7 +12,10 @@ "types": "index.ts", "main": "./dist/index.js", "scripts": { - "clean": "rimraf ./dist && rimraf .turbo", + "clean:bundle": "pnpx rimraf dist", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "ready": "node build.mjs", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/packages/vite-config/package.json b/packages/vite-config/package.json index c6f79cccc..03ed83ccb 100644 --- a/packages/vite-config/package.json +++ b/packages/vite-config/package.json @@ -5,6 +5,10 @@ "main": "index.mjs", "type": "module", "private": true, + "scripts": { + "clean:node_modules": "pnpx rimraf node_modules", + "clean": "pnpm clean:node_modules" + }, "devDependencies": { "@extension/hmr": "workspace:*", "@extension/tsconfig": "workspace:*", diff --git a/packages/zipper/package.json b/packages/zipper/package.json index 4e0e81200..1ff1311f3 100644 --- a/packages/zipper/package.json +++ b/packages/zipper/package.json @@ -11,7 +11,10 @@ "module": "dist/index.js", "types": "index.ts", "scripts": { - "clean": "rimraf ./dist && rimraf ./build", + "clean:bundle": "pnpx rimraf dist", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "zip": "tsx index.ts", "ready": "tsc", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/content-runtime/package.json b/pages/content-runtime/package.json index 67a83e1f5..77256e925 100644 --- a/pages/content-runtime/package.json +++ b/pages/content-runtime/package.json @@ -8,8 +8,10 @@ "dist/**" ], "scripts": { - "clean": "rimraf ./dist", - "build": "pnpm run clean && pnpm type-check && vite build", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", + "build": "pnpm type-check && vite build", "build:watch": "cross-env __DEV__=true vite build -w --mode development", "dev": "pnpm build:watch", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/content-ui/package.json b/pages/content-ui/package.json index ee37d57a2..be412afee 100644 --- a/pages/content-ui/package.json +++ b/pages/content-ui/package.json @@ -9,9 +9,12 @@ "dist/**" ], "scripts": { - "clean": "rimraf ./dist", + "clean:bundle": "pnpx rimraf dist", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "build:tailwindcss": "pnpm dlx tailwindcss -i ./src/tailwind-input.css -o ./dist/tailwind-output.css -m", - "build": "pnpm clean && pnpm type-check && pnpm build:tailwindcss && vite build", + "build": "pnpm clean:bundle && pnpm type-check && pnpm build:tailwindcss && vite build", "build:watch": "concurrently \"cross-env __DEV__=true vite build --mode development\" \"pnpm build:tailwindcss -- -w\"", "dev": "pnpm build:tailwindcss && pnpm build:watch", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/content/package.json b/pages/content/package.json index cb16f977d..0c8f17766 100644 --- a/pages/content/package.json +++ b/pages/content/package.json @@ -8,8 +8,10 @@ "dist/**" ], "scripts": { - "clean": "rimraf ./dist", - "build": "pnpm run clean&& pnpm type-check && vite build", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", + "build": "pnpm type-check && vite build", "build:watch": "cross-env __DEV__=true vite build --mode development", "dev": "pnpm build:watch", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/devtools-panel/package.json b/pages/devtools-panel/package.json index 8a7a1b340..77f8f23d7 100644 --- a/pages/devtools-panel/package.json +++ b/pages/devtools-panel/package.json @@ -8,8 +8,10 @@ "dist/**" ], "scripts": { - "clean": "rimraf ./dist", - "build": "pnpm run clean&& pnpm type-check && vite build", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", + "build": "pnpm type-check && vite build", "build:watch": "cross-env __DEV__=true vite build --mode development", "dev": "pnpm build:watch", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/devtools/package.json b/pages/devtools/package.json index 712475085..ccf734da7 100644 --- a/pages/devtools/package.json +++ b/pages/devtools/package.json @@ -8,8 +8,10 @@ "dist/**" ], "scripts": { - "clean": "rimraf ./dist", - "build": "pnpm run clean && pnpm type-check && vite build", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", + "build": "pnpm type-check && vite build", "build:watch": "cross-env __DEV__=true vite build --mode development", "dev": "pnpm build:watch", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/new-tab/package.json b/pages/new-tab/package.json index 1af01f0ec..497586c93 100644 --- a/pages/new-tab/package.json +++ b/pages/new-tab/package.json @@ -8,8 +8,10 @@ "dist/**" ], "scripts": { - "clean": "rimraf ./dist", - "build": "pnpm run clean&& pnpm type-check && vite build", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", + "build": "pnpm type-check && vite build", "build:watch": "cross-env __DEV__=true vite build --mode development", "dev": "pnpm build:watch", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/options/package.json b/pages/options/package.json index 656c062a2..483419e8f 100644 --- a/pages/options/package.json +++ b/pages/options/package.json @@ -8,8 +8,10 @@ "dist/**" ], "scripts": { - "clean": "rimraf ./dist", - "build": "pnpm run clean&& pnpm type-check && vite build", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", + "build": "pnpm type-check && vite build", "build:watch": "cross-env __DEV__=true vite build --mode development", "dev": "pnpm build:watch", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/popup/package.json b/pages/popup/package.json index 1d0ff684a..70e1fc8dd 100644 --- a/pages/popup/package.json +++ b/pages/popup/package.json @@ -8,8 +8,10 @@ "dist/**" ], "scripts": { - "clean": "rimraf ./dist", - "build": "pnpm run clean&& pnpm type-check && vite build", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", + "build": "pnpm type-check && vite build", "build:watch": "cross-env __DEV__=true vite build --mode development", "dev": "pnpm build:watch", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/side-panel/package.json b/pages/side-panel/package.json index cba1c0ae6..2c0543583 100644 --- a/pages/side-panel/package.json +++ b/pages/side-panel/package.json @@ -8,8 +8,10 @@ "dist/**" ], "scripts": { - "clean": "rimraf ./dist", - "build": "pnpm run clean&& pnpm type-check && vite build", + "clean:node_modules": "pnpx rimraf node_modules", + "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", + "build": "pnpm type-check && vite build", "build:watch": "cross-env __DEV__=true vite build --mode development", "dev": "pnpm build:watch", "lint": "eslint . --ext .ts,.tsx", diff --git a/turbo.json b/turbo.json index c25340795..836b72f91 100644 --- a/turbo.json +++ b/turbo.json @@ -56,7 +56,20 @@ ], "cache": false }, + "clean:node_modules": { + "dependsOn": ["^clean:node_modules"], + "cache": false + }, + "clean:turbo": { + "dependsOn": ["^clean:turbo"], + "cache": false + }, + "clean:bundle": { + "dependsOn": ["^clean:bundle"], + "cache": false + }, "clean": { + "dependsOn": ["clean:node_modules", "clean:turbo", "clean:bundle"], "cache": false } } From 6dfd6847ed110cd83ed2a86de7aca629e268d5a3 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Tue, 3 Sep 2024 14:58:22 +0200 Subject: [PATCH 02/19] chore: refactor build and dev scripts in all `package.json` --- chrome-extension/package.json | 11 ++--- chrome-extension/tsconfig.json | 2 +- package.json | 6 +-- packages/dev-utils/package.json | 1 - packages/hmr/package.json | 1 - packages/i18n/package.json | 1 - pages/content-runtime/package.json | 4 +- pages/content-ui/package.json | 6 ++- pages/content/package.json | 3 +- pages/devtools-panel/package.json | 3 +- pages/devtools/package.json | 3 +- pages/new-tab/package.json | 3 +- pages/options/package.json | 3 +- pages/popup/package.json | 6 +-- pages/side-panel/package.json | 3 +- pnpm-lock.yaml | 69 +++++++++++++++++++++++++----- turbo.json | 1 + 17 files changed, 81 insertions(+), 45 deletions(-) diff --git a/chrome-extension/package.json b/chrome-extension/package.json index 4c557a765..2543c87ef 100644 --- a/chrome-extension/package.json +++ b/chrome-extension/package.json @@ -4,15 +4,11 @@ "description": "chrome extension", "type": "module", "scripts": { - "build": "tsc --noEmit && vite build", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", "clean": "pnpm clean:node_modules && pnpm clean:turbo", - "build:firefox": "tsc --noEmit && cross-env __FIREFOX__=true vite build", - "build:watch": "cross-env __DEV__=true vite build --mode development", - "build:firefox:watch": "cross-env __DEV__=true __FIREFOX__=true vite build --mode development", - "dev": "pnpm build:watch", - "dev:firefox": "pnpm build:firefox:watch", + "build": "pnpm type-check && vite build", + "dev": "cross-env __DEV__=true vite build --mode development", "test": "vitest run", "lint": "eslint ./ --ext .ts,.js,.tsx,.jsx", "lint:fix": "pnpm lint --fix", @@ -33,6 +29,7 @@ "@types/ws": "^8.5.12", "magic-string": "^0.30.10", "ts-loader": "^9.5.1", - "deepmerge": "^4.3.1" + "deepmerge": "^4.3.1", + "cross-env": "^7.0.3" } } diff --git a/chrome-extension/tsconfig.json b/chrome-extension/tsconfig.json index 4af737f71..f7af16935 100644 --- a/chrome-extension/tsconfig.json +++ b/chrome-extension/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "@extension/tsconfig/app", "compilerOptions": { - "baseUrl": "./", + "baseUrl": ".", "types": ["vite/client", "node", "chrome"], "paths": { "@root/*": ["./*"], diff --git a/package.json b/package.json index 9a0db63d6..7b0482fac 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "type": "git", "url": "https://github.com/Jonghakseo/chrome-extension-boilerplate-react-vite.git" }, + "type": "module", "scripts": { "clean-root:bundle": "pnpx rimraf dist && pnpx rimraf dist-zip", "clean-root:node_modules": "pnpx turbo daemon stop && pnpx rimraf node_modules", @@ -22,8 +23,8 @@ "zip": "turbo zip", "zip:firefox": "cross-env __FIREFOX__=true turbo zip", "dev-server": "pnpm -F hmr ready && pnpm -F hmr dev", - "dev": "turbo ready && turbo watch dev --concurrency 20", - "dev:firefox": "turbo ready && cross-env __FIREFOX__=true turbo watch dev --concurrency 20", + "dev": "cross-env __DEV__=true turbo watch dev --concurrency 20", + "dev:firefox": "cross-env __DEV__=true __FIREFOX__=true turbo watch dev --concurrency 20", "test": "turbo test", "type-check": "turbo type-check", "lint": "turbo lint --continue -- --fix --cache --cache-location node_modules/.cache/.eslintcache", @@ -34,7 +35,6 @@ "update-version:win32": "bash update_version.sh", "update-version:default": "./update_version.sh" }, - "type": "module", "dependencies": { "react": "18.3.1", "react-dom": "18.3.1" diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 072a15f7e..195a92246 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -21,7 +21,6 @@ "prettier": "prettier . --write --ignore-path ../../.prettierignore", "type-check": "tsc --noEmit" }, - "dependencies": {}, "devDependencies": { "@extension/tsconfig": "workspace:*", "@extension/shared": "workspace:*" diff --git a/packages/hmr/package.json b/packages/hmr/package.json index 0bac345ad..06ad6a022 100644 --- a/packages/hmr/package.json +++ b/packages/hmr/package.json @@ -24,7 +24,6 @@ "prettier": "prettier . --write --ignore-path ../../.prettierignore", "type-check": "tsc --noEmit" }, - "dependencies": {}, "devDependencies": { "@extension/tsconfig": "workspace:*", "@rollup/plugin-sucrase": "^5.0.2", diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 41b3d15af..630b97d56 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -22,7 +22,6 @@ "prettier": "prettier . --write --ignore-path ../../.prettierignore", "type-check": "tsc --noEmit" }, - "dependencies": {}, "devDependencies": { "@extension/tsconfig": "workspace:*", "@extension/hmr": "workspace:*" diff --git a/pages/content-runtime/package.json b/pages/content-runtime/package.json index 77256e925..f95c34b1f 100644 --- a/pages/content-runtime/package.json +++ b/pages/content-runtime/package.json @@ -12,14 +12,12 @@ "clean:turbo": "pnpx rimraf .turbo", "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", - "build:watch": "cross-env __DEV__=true vite build -w --mode development", - "dev": "pnpm build:watch", + "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", "prettier": "prettier . --write --ignore-path ../../.prettierignore", "type-check": "tsc --noEmit" }, - "dependencies": {}, "devDependencies": { "@extension/tsconfig": "workspace:*", "@extension/hmr": "workspace:*", diff --git a/pages/content-ui/package.json b/pages/content-ui/package.json index be412afee..07fe920cb 100644 --- a/pages/content-ui/package.json +++ b/pages/content-ui/package.json @@ -15,8 +15,11 @@ "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "build:tailwindcss": "pnpm dlx tailwindcss -i ./src/tailwind-input.css -o ./dist/tailwind-output.css -m", "build": "pnpm clean:bundle && pnpm type-check && pnpm build:tailwindcss && vite build", + "build:firefox": "pnpm clean:bundle && pnpm type-check && pnpm build:tailwindcss && cross-env __FIREFOX__=true vite build", "build:watch": "concurrently \"cross-env __DEV__=true vite build --mode development\" \"pnpm build:tailwindcss -- -w\"", + "build:firefox:watch": "concurrently \"cross-env __DEV__=true __FIREFOX__=true vite build --mode development\" \"pnpm build:tailwindcss -- -w\"", "dev": "pnpm build:tailwindcss && pnpm build:watch", + "dev:firefox": "pnpm build:tailwindcss && pnpm build:firefox:watch", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", "prettier": "prettier . --write --ignore-path ../../.prettierignore", @@ -32,6 +35,7 @@ "@extension/tsconfig": "workspace:*", "@extension/hmr": "workspace:*", "@extension/vite-config": "workspace:*", - "concurrently": "^8.2.2" + "concurrently": "^8.2.2", + "cross-env": "^7.0.3" } } diff --git a/pages/content/package.json b/pages/content/package.json index 0c8f17766..821c14628 100644 --- a/pages/content/package.json +++ b/pages/content/package.json @@ -12,8 +12,7 @@ "clean:turbo": "pnpx rimraf .turbo", "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", - "build:watch": "cross-env __DEV__=true vite build --mode development", - "dev": "pnpm build:watch", + "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", "prettier": "prettier . --write --ignore-path ../../.prettierignore", diff --git a/pages/devtools-panel/package.json b/pages/devtools-panel/package.json index 77f8f23d7..9787bc6e7 100644 --- a/pages/devtools-panel/package.json +++ b/pages/devtools-panel/package.json @@ -12,8 +12,7 @@ "clean:turbo": "pnpx rimraf .turbo", "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", - "build:watch": "cross-env __DEV__=true vite build --mode development", - "dev": "pnpm build:watch", + "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", "prettier": "prettier . --write --ignore-path ../../.prettierignore", diff --git a/pages/devtools/package.json b/pages/devtools/package.json index ccf734da7..33969e20f 100644 --- a/pages/devtools/package.json +++ b/pages/devtools/package.json @@ -12,8 +12,7 @@ "clean:turbo": "pnpx rimraf .turbo", "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", - "build:watch": "cross-env __DEV__=true vite build --mode development", - "dev": "pnpm build:watch", + "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", "prettier": "prettier . --write --ignore-path ../../.prettierignore", diff --git a/pages/new-tab/package.json b/pages/new-tab/package.json index 497586c93..cdbe7f22a 100644 --- a/pages/new-tab/package.json +++ b/pages/new-tab/package.json @@ -12,8 +12,7 @@ "clean:turbo": "pnpx rimraf .turbo", "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", - "build:watch": "cross-env __DEV__=true vite build --mode development", - "dev": "pnpm build:watch", + "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", "prettier": "prettier . --write --ignore-path ../../.prettierignore", diff --git a/pages/options/package.json b/pages/options/package.json index 483419e8f..cbe271366 100644 --- a/pages/options/package.json +++ b/pages/options/package.json @@ -12,8 +12,7 @@ "clean:turbo": "pnpx rimraf .turbo", "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", - "build:watch": "cross-env __DEV__=true vite build --mode development", - "dev": "pnpm build:watch", + "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", "prettier": "prettier . --write --ignore-path ../../.prettierignore", diff --git a/pages/popup/package.json b/pages/popup/package.json index 70e1fc8dd..a6e1a658f 100644 --- a/pages/popup/package.json +++ b/pages/popup/package.json @@ -12,8 +12,7 @@ "clean:turbo": "pnpx rimraf .turbo", "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", - "build:watch": "cross-env __DEV__=true vite build --mode development", - "dev": "pnpm build:watch", + "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", "prettier": "prettier . --write --ignore-path ../../.prettierignore", @@ -22,8 +21,7 @@ "dependencies": { "@extension/shared": "workspace:*", "@extension/storage": "workspace:*", - "@extension/content-runtime-script": "workspace:*", - "@types/node": "^20.14.10" + "@extension/content-runtime-script": "workspace:*" }, "devDependencies": { "@extension/tailwindcss-config": "workspace:*", diff --git a/pages/side-panel/package.json b/pages/side-panel/package.json index 2c0543583..e7b46d0c9 100644 --- a/pages/side-panel/package.json +++ b/pages/side-panel/package.json @@ -12,8 +12,7 @@ "clean:turbo": "pnpx rimraf .turbo", "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", - "build:watch": "cross-env __DEV__=true vite build --mode development", - "dev": "pnpm build:watch", + "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", "prettier": "prettier . --write --ignore-path ../../.prettierignore", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 698d094ff..2f6f932d7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -126,10 +126,13 @@ importers: version: link:../packages/vite-config '@laynezh/vite-plugin-lib-assets': specifier: ^0.5.23 - version: 0.5.23(vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1)) + version: 0.5.23(vite@5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1)) '@types/ws': specifier: ^8.5.12 version: 8.5.12 + cross-env: + specifier: ^7.0.3 + version: 7.0.3 deepmerge: specifier: ^4.3.1 version: 4.3.1 @@ -171,7 +174,7 @@ importers: version: 4.20.0 ts-node: specifier: ^10.9.2 - version: 10.9.2(@swc/core@1.6.13)(@types/node@20.14.10)(typescript@5.5.4) + version: 10.9.2(@swc/core@1.6.13)(@types/node@22.5.2)(typescript@5.5.4) ws: specifier: 8.18.0 version: 8.18.0 @@ -230,7 +233,7 @@ importers: version: link:../tsconfig '@vitejs/plugin-react-swc': specifier: ^3.6.0 - version: 3.7.0(vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1)) + version: 3.7.0(vite@5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1)) deepmerge: specifier: ^4.3.1 version: 4.3.1 @@ -308,6 +311,9 @@ importers: concurrently: specifier: ^8.2.2 version: 8.2.2 + cross-env: + specifier: ^7.0.3 + version: 7.0.3 pages/devtools: dependencies: @@ -411,9 +417,6 @@ importers: '@extension/storage': specifier: workspace:* version: link:../../packages/storage - '@types/node': - specifier: ^20.14.10 - version: 20.14.10 devDependencies: '@extension/tailwindcss-config': specifier: workspace:* @@ -1045,6 +1048,9 @@ packages: '@types/node@20.14.10': resolution: {integrity: sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==} + '@types/node@22.5.2': + resolution: {integrity: sha512-acJsPTEqYqulZS/Yp/S3GgeE6GZ0qYODUR8aVr/DkhHQ8l9nd4j5x1/ZJy9/gHrRlFMqkO6i0I3E27Alu4jjPg==} + '@types/prop-types@15.7.12': resolution: {integrity: sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==} @@ -2888,6 +2894,9 @@ packages: undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + undici-types@6.19.8: + resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + update-browserslist-db@1.1.0: resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==} hasBin: true @@ -3255,13 +3264,13 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.4.15 - '@laynezh/vite-plugin-lib-assets@0.5.23(vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1))': + '@laynezh/vite-plugin-lib-assets@0.5.23(vite@5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1))': dependencies: escape-string-regexp: 4.0.0 loader-utils: 3.3.1 mrmime: 1.0.1 semver: 7.6.2 - vite: 5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1) + vite: 5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1) '@nodelib/fs.scandir@2.1.5': dependencies: @@ -3436,6 +3445,10 @@ snapshots: dependencies: undici-types: 5.26.5 + '@types/node@22.5.2': + dependencies: + undici-types: 6.19.8 + '@types/prop-types@15.7.12': {} '@types/react-dom@18.3.0': @@ -3449,7 +3462,7 @@ snapshots: '@types/ws@8.5.12': dependencies: - '@types/node': 20.14.10 + '@types/node': 22.5.2 '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)': dependencies: @@ -3534,10 +3547,10 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@vitejs/plugin-react-swc@3.7.0(vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1))': + '@vitejs/plugin-react-swc@3.7.0(vite@5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1))': dependencies: '@swc/core': 1.6.13 - vite: 5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1) + vite: 5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1) transitivePeerDependencies: - '@swc/helpers' @@ -5489,6 +5502,27 @@ snapshots: yn: 3.1.1 optionalDependencies: '@swc/core': 1.6.13 + optional: true + + ts-node@10.9.2(@swc/core@1.6.13)(@types/node@22.5.2)(typescript@5.5.4): + dependencies: + '@cspotcode/source-map-support': 0.8.1 + '@tsconfig/node10': 1.0.11 + '@tsconfig/node12': 1.0.11 + '@tsconfig/node14': 1.0.3 + '@tsconfig/node16': 1.0.4 + '@types/node': 22.5.2 + acorn: 8.12.1 + acorn-walk: 8.3.3 + arg: 4.1.3 + create-require: 1.1.1 + diff: 4.0.2 + make-error: 1.3.6 + typescript: 5.5.4 + v8-compile-cache-lib: 3.0.1 + yn: 3.1.1 + optionalDependencies: + '@swc/core': 1.6.13 tsconfig-paths@3.15.0: dependencies: @@ -5582,6 +5616,8 @@ snapshots: undici-types@5.26.5: {} + undici-types@6.19.8: {} + update-browserslist-db@1.1.0(browserslist@4.23.1): dependencies: browserslist: 4.23.1 @@ -5607,6 +5643,17 @@ snapshots: sass: 1.77.8 terser: 5.31.1 + vite@5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1): + dependencies: + esbuild: 0.21.5 + postcss: 8.4.41 + rollup: 4.20.0 + optionalDependencies: + '@types/node': 22.5.2 + fsevents: 2.3.3 + sass: 1.77.8 + terser: 5.31.1 + watchpack@2.4.1: dependencies: glob-to-regexp: 0.4.1 diff --git a/turbo.json b/turbo.json index 836b72f91..df6347177 100644 --- a/turbo.json +++ b/turbo.json @@ -4,6 +4,7 @@ "globalEnv": ["__FIREFOX__"], "tasks": { "ready": { + "dependsOn": ["^ready"], "outputs": [ "dist/**", "build/**" From e3d5f35ffc79532029439b86662bcee0ec18dcca Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Tue, 3 Sep 2024 15:53:14 +0200 Subject: [PATCH 03/19] fix: remove firefox things from `content-ui` package.json --- pages/content-ui/package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/pages/content-ui/package.json b/pages/content-ui/package.json index 07fe920cb..dc6bba6af 100644 --- a/pages/content-ui/package.json +++ b/pages/content-ui/package.json @@ -15,11 +15,8 @@ "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "build:tailwindcss": "pnpm dlx tailwindcss -i ./src/tailwind-input.css -o ./dist/tailwind-output.css -m", "build": "pnpm clean:bundle && pnpm type-check && pnpm build:tailwindcss && vite build", - "build:firefox": "pnpm clean:bundle && pnpm type-check && pnpm build:tailwindcss && cross-env __FIREFOX__=true vite build", "build:watch": "concurrently \"cross-env __DEV__=true vite build --mode development\" \"pnpm build:tailwindcss -- -w\"", - "build:firefox:watch": "concurrently \"cross-env __DEV__=true __FIREFOX__=true vite build --mode development\" \"pnpm build:tailwindcss -- -w\"", "dev": "pnpm build:tailwindcss && pnpm build:watch", - "dev:firefox": "pnpm build:tailwindcss && pnpm build:firefox:watch", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", "prettier": "prettier . --write --ignore-path ../../.prettierignore", From 1d596d453d52a23fd43056120d51b9b43e5e9c6a Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Tue, 3 Sep 2024 15:58:11 +0200 Subject: [PATCH 04/19] fix: add missing `cross-env` to packages --- pages/content/package.json | 3 ++- pages/devtools-panel/package.json | 3 ++- pages/devtools/package.json | 3 ++- pages/new-tab/package.json | 3 ++- pages/options/package.json | 3 ++- pages/popup/package.json | 3 ++- pages/side-panel/package.json | 3 ++- pnpm-lock.yaml | 21 +++++++++++++++++++++ 8 files changed, 35 insertions(+), 7 deletions(-) diff --git a/pages/content/package.json b/pages/content/package.json index 821c14628..f0185881b 100644 --- a/pages/content/package.json +++ b/pages/content/package.json @@ -25,6 +25,7 @@ "devDependencies": { "@extension/hmr": "workspace:*", "@extension/tsconfig": "workspace:*", - "@extension/vite-config": "workspace:*" + "@extension/vite-config": "workspace:*", + "cross-env": "^7.0.3" } } diff --git a/pages/devtools-panel/package.json b/pages/devtools-panel/package.json index 9787bc6e7..2c4b72e46 100644 --- a/pages/devtools-panel/package.json +++ b/pages/devtools-panel/package.json @@ -26,6 +26,7 @@ "@extension/tailwindcss-config": "workspace:*", "@extension/tsconfig": "workspace:*", "@extension/vite-config": "workspace:*", - "postcss-load-config": "^6.0.1" + "postcss-load-config": "^6.0.1", + "cross-env": "^7.0.3" } } diff --git a/pages/devtools/package.json b/pages/devtools/package.json index 33969e20f..b8016fde7 100644 --- a/pages/devtools/package.json +++ b/pages/devtools/package.json @@ -23,6 +23,7 @@ }, "devDependencies": { "@extension/tsconfig": "workspace:*", - "@extension/vite-config": "workspace:*" + "@extension/vite-config": "workspace:*", + "cross-env": "^7.0.3" } } diff --git a/pages/new-tab/package.json b/pages/new-tab/package.json index cdbe7f22a..72c2df1f7 100644 --- a/pages/new-tab/package.json +++ b/pages/new-tab/package.json @@ -29,6 +29,7 @@ "@extension/tsconfig": "workspace:*", "@extension/vite-config": "workspace:*", "sass": "1.77.8", - "postcss-load-config": "^6.0.1" + "postcss-load-config": "^6.0.1", + "cross-env": "^7.0.3" } } diff --git a/pages/options/package.json b/pages/options/package.json index cbe271366..3b5420596 100644 --- a/pages/options/package.json +++ b/pages/options/package.json @@ -27,6 +27,7 @@ "@extension/tailwindcss-config": "workspace:*", "@extension/tsconfig": "workspace:*", "@extension/vite-config": "workspace:*", - "postcss-load-config": "^6.0.1" + "postcss-load-config": "^6.0.1", + "cross-env": "^7.0.3" } } diff --git a/pages/popup/package.json b/pages/popup/package.json index a6e1a658f..a59ea957b 100644 --- a/pages/popup/package.json +++ b/pages/popup/package.json @@ -27,6 +27,7 @@ "@extension/tailwindcss-config": "workspace:*", "@extension/tsconfig": "workspace:*", "@extension/vite-config": "workspace:*", - "postcss-load-config": "^6.0.1" + "postcss-load-config": "^6.0.1", + "cross-env": "^7.0.3" } } diff --git a/pages/side-panel/package.json b/pages/side-panel/package.json index e7b46d0c9..48def2617 100644 --- a/pages/side-panel/package.json +++ b/pages/side-panel/package.json @@ -26,6 +26,7 @@ "@extension/tailwindcss-config": "workspace:*", "@extension/tsconfig": "workspace:*", "@extension/vite-config": "workspace:*", - "postcss-load-config": "^6.0.1" + "postcss-load-config": "^6.0.1", + "cross-env": "^7.0.3" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2f6f932d7..ba23b1368 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -271,6 +271,9 @@ importers: '@extension/vite-config': specifier: workspace:* version: link:../../packages/vite-config + cross-env: + specifier: ^7.0.3 + version: 7.0.3 pages/content-runtime: devDependencies: @@ -327,6 +330,9 @@ importers: '@extension/vite-config': specifier: workspace:* version: link:../../packages/vite-config + cross-env: + specifier: ^7.0.3 + version: 7.0.3 pages/devtools-panel: dependencies: @@ -346,6 +352,9 @@ importers: '@extension/vite-config': specifier: workspace:* version: link:../../packages/vite-config + cross-env: + specifier: ^7.0.3 + version: 7.0.3 postcss-load-config: specifier: ^6.0.1 version: 6.0.1(jiti@1.21.6)(postcss@8.4.41)(tsx@4.16.2)(yaml@2.4.5) @@ -374,6 +383,9 @@ importers: '@extension/vite-config': specifier: workspace:* version: link:../../packages/vite-config + cross-env: + specifier: ^7.0.3 + version: 7.0.3 postcss-load-config: specifier: ^6.0.1 version: 6.0.1(jiti@1.21.6)(postcss@8.4.41)(tsx@4.16.2)(yaml@2.4.5) @@ -402,6 +414,9 @@ importers: '@extension/vite-config': specifier: workspace:* version: link:../../packages/vite-config + cross-env: + specifier: ^7.0.3 + version: 7.0.3 postcss-load-config: specifier: ^6.0.1 version: 6.0.1(jiti@1.21.6)(postcss@8.4.41)(tsx@4.16.2)(yaml@2.4.5) @@ -427,6 +442,9 @@ importers: '@extension/vite-config': specifier: workspace:* version: link:../../packages/vite-config + cross-env: + specifier: ^7.0.3 + version: 7.0.3 postcss-load-config: specifier: ^6.0.1 version: 6.0.1(jiti@1.21.6)(postcss@8.4.41)(tsx@4.16.2)(yaml@2.4.5) @@ -449,6 +467,9 @@ importers: '@extension/vite-config': specifier: workspace:* version: link:../../packages/vite-config + cross-env: + specifier: ^7.0.3 + version: 7.0.3 postcss-load-config: specifier: ^6.0.1 version: 6.0.1(jiti@1.21.6)(postcss@8.4.41)(tsx@4.16.2)(yaml@2.4.5) From fcbffdfe4ad9a94498b3f8c43d55b043942b2735 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Tue, 3 Sep 2024 17:54:50 +0200 Subject: [PATCH 05/19] fix: `libAssetsPlugin` error, by add node version into `devDeps` --- chrome-extension/package.json | 3 +- pnpm-lock.yaml | 63 ++++++----------------------------- 2 files changed, 13 insertions(+), 53 deletions(-) diff --git a/chrome-extension/package.json b/chrome-extension/package.json index 2543c87ef..78c3a0470 100644 --- a/chrome-extension/package.json +++ b/chrome-extension/package.json @@ -30,6 +30,7 @@ "magic-string": "^0.30.10", "ts-loader": "^9.5.1", "deepmerge": "^4.3.1", - "cross-env": "^7.0.3" + "cross-env": "^7.0.3", + "@types/node": "^20.14.10" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ba23b1368..ac337d4ee 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -126,7 +126,10 @@ importers: version: link:../packages/vite-config '@laynezh/vite-plugin-lib-assets': specifier: ^0.5.23 - version: 0.5.23(vite@5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1)) + version: 0.5.23(vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1)) + '@types/node': + specifier: ^20.14.10 + version: 20.14.10 '@types/ws': specifier: ^8.5.12 version: 8.5.12 @@ -174,7 +177,7 @@ importers: version: 4.20.0 ts-node: specifier: ^10.9.2 - version: 10.9.2(@swc/core@1.6.13)(@types/node@22.5.2)(typescript@5.5.4) + version: 10.9.2(@swc/core@1.6.13)(@types/node@20.14.10)(typescript@5.5.4) ws: specifier: 8.18.0 version: 8.18.0 @@ -233,7 +236,7 @@ importers: version: link:../tsconfig '@vitejs/plugin-react-swc': specifier: ^3.6.0 - version: 3.7.0(vite@5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1)) + version: 3.7.0(vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1)) deepmerge: specifier: ^4.3.1 version: 4.3.1 @@ -1069,9 +1072,6 @@ packages: '@types/node@20.14.10': resolution: {integrity: sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==} - '@types/node@22.5.2': - resolution: {integrity: sha512-acJsPTEqYqulZS/Yp/S3GgeE6GZ0qYODUR8aVr/DkhHQ8l9nd4j5x1/ZJy9/gHrRlFMqkO6i0I3E27Alu4jjPg==} - '@types/prop-types@15.7.12': resolution: {integrity: sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==} @@ -2915,9 +2915,6 @@ packages: undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - undici-types@6.19.8: - resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} - update-browserslist-db@1.1.0: resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==} hasBin: true @@ -3285,13 +3282,13 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.4.15 - '@laynezh/vite-plugin-lib-assets@0.5.23(vite@5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1))': + '@laynezh/vite-plugin-lib-assets@0.5.23(vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1))': dependencies: escape-string-regexp: 4.0.0 loader-utils: 3.3.1 mrmime: 1.0.1 semver: 7.6.2 - vite: 5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1) + vite: 5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1) '@nodelib/fs.scandir@2.1.5': dependencies: @@ -3466,10 +3463,6 @@ snapshots: dependencies: undici-types: 5.26.5 - '@types/node@22.5.2': - dependencies: - undici-types: 6.19.8 - '@types/prop-types@15.7.12': {} '@types/react-dom@18.3.0': @@ -3483,7 +3476,7 @@ snapshots: '@types/ws@8.5.12': dependencies: - '@types/node': 22.5.2 + '@types/node': 20.14.10 '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)': dependencies: @@ -3568,10 +3561,10 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@vitejs/plugin-react-swc@3.7.0(vite@5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1))': + '@vitejs/plugin-react-swc@3.7.0(vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1))': dependencies: '@swc/core': 1.6.13 - vite: 5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1) + vite: 5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1) transitivePeerDependencies: - '@swc/helpers' @@ -5523,27 +5516,6 @@ snapshots: yn: 3.1.1 optionalDependencies: '@swc/core': 1.6.13 - optional: true - - ts-node@10.9.2(@swc/core@1.6.13)(@types/node@22.5.2)(typescript@5.5.4): - dependencies: - '@cspotcode/source-map-support': 0.8.1 - '@tsconfig/node10': 1.0.11 - '@tsconfig/node12': 1.0.11 - '@tsconfig/node14': 1.0.3 - '@tsconfig/node16': 1.0.4 - '@types/node': 22.5.2 - acorn: 8.12.1 - acorn-walk: 8.3.3 - arg: 4.1.3 - create-require: 1.1.1 - diff: 4.0.2 - make-error: 1.3.6 - typescript: 5.5.4 - v8-compile-cache-lib: 3.0.1 - yn: 3.1.1 - optionalDependencies: - '@swc/core': 1.6.13 tsconfig-paths@3.15.0: dependencies: @@ -5637,8 +5609,6 @@ snapshots: undici-types@5.26.5: {} - undici-types@6.19.8: {} - update-browserslist-db@1.1.0(browserslist@4.23.1): dependencies: browserslist: 4.23.1 @@ -5664,17 +5634,6 @@ snapshots: sass: 1.77.8 terser: 5.31.1 - vite@5.4.1(@types/node@22.5.2)(sass@1.77.8)(terser@5.31.1): - dependencies: - esbuild: 0.21.5 - postcss: 8.4.41 - rollup: 4.20.0 - optionalDependencies: - '@types/node': 22.5.2 - fsevents: 2.3.3 - sass: 1.77.8 - terser: 5.31.1 - watchpack@2.4.1: dependencies: glob-to-regexp: 0.4.1 From a0ce8f02edc66094eeb54a026f444302d38340e2 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Tue, 3 Sep 2024 17:56:56 +0200 Subject: [PATCH 06/19] style: re-range `turbo.json` --- turbo.json | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/turbo.json b/turbo.json index df6347177..1764f7e31 100644 --- a/turbo.json +++ b/turbo.json @@ -11,9 +11,7 @@ ] }, "dev": { - "dependsOn": [ - "ready" - ], + "dependsOn": ["ready"], "outputs": [ "dist/**", "build/**", @@ -22,10 +20,7 @@ "persistent": true }, "build": { - "dependsOn": [ - "^build", - "ready" - ], + "dependsOn": ["^build", "ready"], "outputs": [ "../../dist/**", "dist/**", @@ -33,9 +28,7 @@ ] }, "zip": { - "dependsOn": [ - "build" - ], + "dependsOn": ["build"], "cache": false }, "type-check": { @@ -51,10 +44,7 @@ "cache": false }, "test": { - "dependsOn": [ - "^test", - "^build" - ], + "dependsOn": ["^test", "^build"], "cache": false }, "clean:node_modules": { From 939b871b3ab07949a9c20ce8007e0fb42738a3e5 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Tue, 3 Sep 2024 18:04:01 +0200 Subject: [PATCH 07/19] chore: create more meaningful description for `chrome-extension` package --- chrome-extension/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome-extension/package.json b/chrome-extension/package.json index 78c3a0470..6222605ba 100644 --- a/chrome-extension/package.json +++ b/chrome-extension/package.json @@ -1,7 +1,7 @@ { "name": "chrome-extension", "version": "0.3.1", - "description": "chrome extension", + "description": "chrome extension - core settings", "type": "module", "scripts": { "clean:node_modules": "pnpx rimraf node_modules", From f39b8676ddbb2013060da308cba13c04263d1654 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Tue, 3 Sep 2024 18:32:31 +0200 Subject: [PATCH 08/19] chore: bump @types/node to 20.16.3 --- chrome-extension/package.json | 2 +- package.json | 2 +- pnpm-lock.yaml | 60 +++++++++++++++++------------------ 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/chrome-extension/package.json b/chrome-extension/package.json index 6222605ba..c1e615d51 100644 --- a/chrome-extension/package.json +++ b/chrome-extension/package.json @@ -31,6 +31,6 @@ "ts-loader": "^9.5.1", "deepmerge": "^4.3.1", "cross-env": "^7.0.3", - "@types/node": "^20.14.10" + "@types/node": "^20.16.3" } } diff --git a/package.json b/package.json index 7b0482fac..1119bb395 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ }, "devDependencies": { "@types/chrome": "^0.0.270", - "@types/node": "^20.14.10", + "@types/node": "^20.16.3", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", "@typescript-eslint/eslint-plugin": "^7.18.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ac337d4ee..716f84a09 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,8 +19,8 @@ importers: specifier: ^0.0.270 version: 0.0.270 '@types/node': - specifier: ^20.14.10 - version: 20.14.10 + specifier: ^20.16.3 + version: 20.16.3 '@types/react': specifier: ^18.3.3 version: 18.3.3 @@ -86,7 +86,7 @@ importers: version: 1.1.6 tailwindcss: specifier: ^3.4.6 - version: 3.4.6(ts-node@10.9.2(@swc/core@1.6.13)(@types/node@20.14.10)(typescript@5.5.4)) + version: 3.4.6(ts-node@10.9.2(@swc/core@1.6.13)(@types/node@20.16.3)(typescript@5.5.4)) tslib: specifier: ^2.6.3 version: 2.6.3 @@ -98,7 +98,7 @@ importers: version: 5.5.4 vite: specifier: 5.4.1 - version: 5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1) + version: 5.4.1(@types/node@20.16.3)(sass@1.77.8)(terser@5.31.1) chrome-extension: dependencies: @@ -126,10 +126,10 @@ importers: version: link:../packages/vite-config '@laynezh/vite-plugin-lib-assets': specifier: ^0.5.23 - version: 0.5.23(vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1)) + version: 0.5.23(vite@5.4.1(@types/node@20.16.3)(sass@1.77.8)(terser@5.31.1)) '@types/node': - specifier: ^20.14.10 - version: 20.14.10 + specifier: ^20.16.3 + version: 20.16.3 '@types/ws': specifier: ^8.5.12 version: 8.5.12 @@ -177,7 +177,7 @@ importers: version: 4.20.0 ts-node: specifier: ^10.9.2 - version: 10.9.2(@swc/core@1.6.13)(@types/node@20.14.10)(typescript@5.5.4) + version: 10.9.2(@swc/core@1.6.13)(@types/node@20.16.3)(typescript@5.5.4) ws: specifier: 8.18.0 version: 8.18.0 @@ -236,7 +236,7 @@ importers: version: link:../tsconfig '@vitejs/plugin-react-swc': specifier: ^3.6.0 - version: 3.7.0(vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1)) + version: 3.7.0(vite@5.4.1(@types/node@20.16.3)(sass@1.77.8)(terser@5.31.1)) deepmerge: specifier: ^4.3.1 version: 4.3.1 @@ -1069,8 +1069,8 @@ packages: '@types/json5@0.0.29': resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} - '@types/node@20.14.10': - resolution: {integrity: sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==} + '@types/node@20.16.3': + resolution: {integrity: sha512-/wdGiWRkMOm53gAsSyFMXFZHbVg7C6CbkrzHNpaHoYfsUWPg7m6ZRKtvQjgvQ9i8WT540a3ydRlRQbxjY30XxQ==} '@types/prop-types@15.7.12': resolution: {integrity: sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==} @@ -2912,8 +2912,8 @@ packages: unbox-primitive@1.0.2: resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} - undici-types@5.26.5: - resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + undici-types@6.19.8: + resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} update-browserslist-db@1.1.0: resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==} @@ -3282,13 +3282,13 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.4.15 - '@laynezh/vite-plugin-lib-assets@0.5.23(vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1))': + '@laynezh/vite-plugin-lib-assets@0.5.23(vite@5.4.1(@types/node@20.16.3)(sass@1.77.8)(terser@5.31.1))': dependencies: escape-string-regexp: 4.0.0 loader-utils: 3.3.1 mrmime: 1.0.1 semver: 7.6.2 - vite: 5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1) + vite: 5.4.1(@types/node@20.16.3)(sass@1.77.8)(terser@5.31.1) '@nodelib/fs.scandir@2.1.5': dependencies: @@ -3459,9 +3459,9 @@ snapshots: '@types/json5@0.0.29': {} - '@types/node@20.14.10': + '@types/node@20.16.3': dependencies: - undici-types: 5.26.5 + undici-types: 6.19.8 '@types/prop-types@15.7.12': {} @@ -3476,7 +3476,7 @@ snapshots: '@types/ws@8.5.12': dependencies: - '@types/node': 20.14.10 + '@types/node': 20.16.3 '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)': dependencies: @@ -3561,10 +3561,10 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@vitejs/plugin-react-swc@3.7.0(vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1))': + '@vitejs/plugin-react-swc@3.7.0(vite@5.4.1(@types/node@20.16.3)(sass@1.77.8)(terser@5.31.1))': dependencies: '@swc/core': 1.6.13 - vite: 5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1) + vite: 5.4.1(@types/node@20.16.3)(sass@1.77.8)(terser@5.31.1) transitivePeerDependencies: - '@swc/helpers' @@ -4740,7 +4740,7 @@ snapshots: jest-worker@27.5.1: dependencies: - '@types/node': 20.14.10 + '@types/node': 20.16.3 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -5039,13 +5039,13 @@ snapshots: camelcase-css: 2.0.1 postcss: 8.4.39 - postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@swc/core@1.6.13)(@types/node@20.14.10)(typescript@5.5.4)): + postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@swc/core@1.6.13)(@types/node@20.16.3)(typescript@5.5.4)): dependencies: lilconfig: 3.1.2 yaml: 2.4.5 optionalDependencies: postcss: 8.4.39 - ts-node: 10.9.2(@swc/core@1.6.13)(@types/node@20.14.10)(typescript@5.5.4) + ts-node: 10.9.2(@swc/core@1.6.13)(@types/node@20.16.3)(typescript@5.5.4) postcss-load-config@6.0.1(jiti@1.21.6)(postcss@8.4.41)(tsx@4.16.2)(yaml@2.4.5): dependencies: @@ -5417,7 +5417,7 @@ snapshots: tailwind-merge@2.4.0: {} - tailwindcss@3.4.6(ts-node@10.9.2(@swc/core@1.6.13)(@types/node@20.14.10)(typescript@5.5.4)): + tailwindcss@3.4.6(ts-node@10.9.2(@swc/core@1.6.13)(@types/node@20.16.3)(typescript@5.5.4)): dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 @@ -5436,7 +5436,7 @@ snapshots: postcss: 8.4.39 postcss-import: 15.1.0(postcss@8.4.39) postcss-js: 4.0.1(postcss@8.4.39) - postcss-load-config: 4.0.2(postcss@8.4.39)(ts-node@10.9.2(@swc/core@1.6.13)(@types/node@20.14.10)(typescript@5.5.4)) + postcss-load-config: 4.0.2(postcss@8.4.39)(ts-node@10.9.2(@swc/core@1.6.13)(@types/node@20.16.3)(typescript@5.5.4)) postcss-nested: 6.0.1(postcss@8.4.39) postcss-selector-parser: 6.1.0 resolve: 1.22.8 @@ -5497,14 +5497,14 @@ snapshots: typescript: 5.5.4 webpack: 5.92.1(@swc/core@1.6.13)(esbuild@0.23.0) - ts-node@10.9.2(@swc/core@1.6.13)(@types/node@20.14.10)(typescript@5.5.4): + ts-node@10.9.2(@swc/core@1.6.13)(@types/node@20.16.3)(typescript@5.5.4): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.11 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.14.10 + '@types/node': 20.16.3 acorn: 8.12.1 acorn-walk: 8.3.3 arg: 4.1.3 @@ -5607,7 +5607,7 @@ snapshots: has-symbols: 1.0.3 which-boxed-primitive: 1.0.2 - undici-types@5.26.5: {} + undici-types@6.19.8: {} update-browserslist-db@1.1.0(browserslist@4.23.1): dependencies: @@ -5623,13 +5623,13 @@ snapshots: v8-compile-cache-lib@3.0.1: {} - vite@5.4.1(@types/node@20.14.10)(sass@1.77.8)(terser@5.31.1): + vite@5.4.1(@types/node@20.16.3)(sass@1.77.8)(terser@5.31.1): dependencies: esbuild: 0.21.5 postcss: 8.4.41 rollup: 4.20.0 optionalDependencies: - '@types/node': 20.14.10 + '@types/node': 20.16.3 fsevents: 2.3.3 sass: 1.77.8 terser: 5.31.1 From bc21cf240ef4f621d8185d364222dbfa78b12f22 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Tue, 3 Sep 2024 18:50:30 +0200 Subject: [PATCH 09/19] style: rename a little description for all `package.json` --- packages/dev-utils/package.json | 2 +- packages/hmr/package.json | 2 +- packages/i18n/package.json | 2 +- packages/shared/package.json | 3 +-- packages/storage/package.json | 3 +-- packages/tailwind-config/package.json | 2 +- packages/tsconfig/package.json | 2 +- packages/ui/package.json | 2 +- packages/vite-config/package.json | 2 +- packages/zipper/package.json | 2 +- pages/content-runtime/package.json | 2 +- pages/content-ui/package.json | 2 +- pages/content/package.json | 2 +- pages/devtools-panel/package.json | 2 +- pages/devtools/package.json | 2 +- pages/new-tab/package.json | 2 +- pages/options/package.json | 2 +- pages/popup/package.json | 2 +- pages/side-panel/package.json | 2 +- 19 files changed, 19 insertions(+), 21 deletions(-) diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 195a92246..43bd9d6e1 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,7 +1,7 @@ { "name": "@extension/dev-utils", "version": "0.3.1", - "description": "chrome extension dev utils", + "description": "chrome extension - dev utils", "private": true, "sideEffects": false, "files": [ diff --git a/packages/hmr/package.json b/packages/hmr/package.json index 06ad6a022..22707ce06 100644 --- a/packages/hmr/package.json +++ b/packages/hmr/package.json @@ -1,7 +1,7 @@ { "name": "@extension/hmr", "version": "0.3.1", - "description": "chrome extension hot module reload or refresh", + "description": "chrome extension - hot module reload/refresh", "private": true, "sideEffects": true, "files": [ diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 630b97d56..e9587c801 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,7 +1,7 @@ { "name": "@extension/i18n", "version": "0.3.1", - "description": "chrome extension internationalization", + "description": "chrome extension - internationalization", "private": true, "sideEffects": false, "files": [ diff --git a/packages/shared/package.json b/packages/shared/package.json index 3e9a31b37..c8679a13f 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,7 +1,7 @@ { "name": "@extension/shared", "version": "0.3.1", - "description": "chrome extension shared code", + "description": "chrome extension - shared code", "private": true, "sideEffects": false, "files": [ @@ -20,7 +20,6 @@ "prettier": "prettier . --write --ignore-path ../../.prettierignore", "type-check": "tsc --noEmit" }, - "dependencies": {}, "devDependencies": { "@extension/storage": "workspace:*", "@extension/tsconfig": "workspace:*" diff --git a/packages/storage/package.json b/packages/storage/package.json index 6fd85a557..5f7bbaac4 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -1,7 +1,7 @@ { "name": "@extension/storage", "version": "0.3.1", - "description": "chrome extension storage", + "description": "chrome extension - storage", "private": true, "sideEffects": false, "files": [ @@ -20,7 +20,6 @@ "prettier": "prettier . --write --ignore-path ../../.prettierignore", "type-check": "tsc --noEmit" }, - "dependencies": {}, "devDependencies": { "@extension/tsconfig": "workspace:*" } diff --git a/packages/tailwind-config/package.json b/packages/tailwind-config/package.json index 2a2982d39..d69d4e06d 100644 --- a/packages/tailwind-config/package.json +++ b/packages/tailwind-config/package.json @@ -1,7 +1,7 @@ { "name": "@extension/tailwindcss-config", "version": "0.3.1", - "description": "Tailwind CSS configuration for boilerplate", + "description": "chrome extension - tailwindcss configuration", "main": "tailwind.config.ts", "private": true } diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json index 5e85ca8aa..3ad807197 100644 --- a/packages/tsconfig/package.json +++ b/packages/tsconfig/package.json @@ -1,6 +1,6 @@ { "name": "@extension/tsconfig", "version": "0.3.1", - "description": "tsconfig for chrome extension", + "description": "chrome extension - tsconfig", "private": true } diff --git a/packages/ui/package.json b/packages/ui/package.json index 4ad4f63e1..7cc5515a2 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,7 +1,7 @@ { "name": "@extension/ui", "version": "0.3.1", - "description": "chrome extension ui components", + "description": "chrome extension - ui components", "private": true, "sideEffects": false, "type": "module", diff --git a/packages/vite-config/package.json b/packages/vite-config/package.json index 03ed83ccb..d9124a751 100644 --- a/packages/vite-config/package.json +++ b/packages/vite-config/package.json @@ -1,7 +1,7 @@ { "name": "@extension/vite-config", "version": "0.3.1", - "description": "Vite base configuration", + "description": "chrome extension - vite base configuration", "main": "index.mjs", "type": "module", "private": true, diff --git a/packages/zipper/package.json b/packages/zipper/package.json index 1ff1311f3..88e1e7530 100644 --- a/packages/zipper/package.json +++ b/packages/zipper/package.json @@ -1,7 +1,7 @@ { "name": "@extension/zipper", "version": "0.3.1", - "description": "chrome extension zipper", + "description": "chrome extension - zipper", "private": true, "sideEffects": false, "files": [ diff --git a/pages/content-runtime/package.json b/pages/content-runtime/package.json index f95c34b1f..73f86f68c 100644 --- a/pages/content-runtime/package.json +++ b/pages/content-runtime/package.json @@ -1,7 +1,7 @@ { "name": "@extension/content-runtime-script", "version": "0.3.1", - "description": "chrome extension content runtime script", + "description": "chrome extension - content runtime script", "private": true, "sideEffects": true, "files": [ diff --git a/pages/content-ui/package.json b/pages/content-ui/package.json index dc6bba6af..f78eb349c 100644 --- a/pages/content-ui/package.json +++ b/pages/content-ui/package.json @@ -1,7 +1,7 @@ { "name": "@extension/content-ui", "version": "0.3.1", - "description": "chrome extension content ui", + "description": "chrome extension - content ui", "type": "module", "private": true, "sideEffects": true, diff --git a/pages/content/package.json b/pages/content/package.json index f0185881b..bd60bb97c 100644 --- a/pages/content/package.json +++ b/pages/content/package.json @@ -1,7 +1,7 @@ { "name": "@extension/content-script", "version": "0.3.1", - "description": "chrome extension content script", + "description": "chrome extension - content script", "private": true, "sideEffects": true, "files": [ diff --git a/pages/devtools-panel/package.json b/pages/devtools-panel/package.json index 2c4b72e46..996eee397 100644 --- a/pages/devtools-panel/package.json +++ b/pages/devtools-panel/package.json @@ -1,7 +1,7 @@ { "name": "@extension/devtools-panel", "version": "0.3.1", - "description": "chrome extension devtools panel", + "description": "chrome extension - devtools panel", "private": true, "sideEffects": true, "files": [ diff --git a/pages/devtools/package.json b/pages/devtools/package.json index b8016fde7..d01ee58a2 100644 --- a/pages/devtools/package.json +++ b/pages/devtools/package.json @@ -1,7 +1,7 @@ { "name": "@extension/devtools", "version": "0.3.1", - "description": "chrome extension devtools", + "description": "chrome extension - devtools", "private": true, "sideEffects": true, "files": [ diff --git a/pages/new-tab/package.json b/pages/new-tab/package.json index 72c2df1f7..f22216ec5 100644 --- a/pages/new-tab/package.json +++ b/pages/new-tab/package.json @@ -1,7 +1,7 @@ { "name": "@extension/new-tab", "version": "0.3.1", - "description": "chrome extension new tab", + "description": "chrome extension - new tab", "private": true, "sideEffects": true, "files": [ diff --git a/pages/options/package.json b/pages/options/package.json index 3b5420596..f14300d11 100644 --- a/pages/options/package.json +++ b/pages/options/package.json @@ -1,7 +1,7 @@ { "name": "@extension/options", "version": "0.3.1", - "description": "chrome extension options", + "description": "chrome extension - options", "private": true, "sideEffects": true, "files": [ diff --git a/pages/popup/package.json b/pages/popup/package.json index a59ea957b..dbcf254f9 100644 --- a/pages/popup/package.json +++ b/pages/popup/package.json @@ -1,7 +1,7 @@ { "name": "@extension/popup", "version": "0.3.1", - "description": "chrome extension popup", + "description": "chrome extension - popup", "private": true, "sideEffects": true, "files": [ diff --git a/pages/side-panel/package.json b/pages/side-panel/package.json index 48def2617..2a8bea0d6 100644 --- a/pages/side-panel/package.json +++ b/pages/side-panel/package.json @@ -1,7 +1,7 @@ { "name": "@extension/sidepanel", "version": "0.3.1", - "description": "chrome extension sidepanel", + "description": "chrome extension - side panel", "private": true, "sideEffects": true, "files": [ From 13e6d645582099b28df4ba889f197fded111fa49 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Tue, 3 Sep 2024 18:50:58 +0200 Subject: [PATCH 10/19] fix: change dependsOn for `build` from `turbo.json` --- turbo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/turbo.json b/turbo.json index 1764f7e31..ae47af971 100644 --- a/turbo.json +++ b/turbo.json @@ -20,7 +20,7 @@ "persistent": true }, "build": { - "dependsOn": ["^build", "ready"], + "dependsOn": ["^build", "^ready"], "outputs": [ "../../dist/**", "dist/**", From 3636c5b9beebf5770192111ea2b782571274c1cc Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Tue, 3 Sep 2024 18:55:14 +0200 Subject: [PATCH 11/19] fix: remove `clean` script from all `package.json` --- chrome-extension/package.json | 1 - packages/dev-utils/package.json | 1 - packages/hmr/package.json | 1 - packages/i18n/package.json | 1 - packages/shared/package.json | 1 - packages/storage/package.json | 1 - packages/ui/package.json | 1 - packages/vite-config/package.json | 3 +-- packages/zipper/package.json | 1 - pages/content-runtime/package.json | 1 - pages/content-ui/package.json | 1 - pages/content/package.json | 1 - pages/devtools-panel/package.json | 1 - pages/devtools/package.json | 1 - pages/new-tab/package.json | 1 - pages/options/package.json | 1 - pages/popup/package.json | 1 - pages/side-panel/package.json | 1 - 18 files changed, 1 insertion(+), 19 deletions(-) diff --git a/chrome-extension/package.json b/chrome-extension/package.json index c1e615d51..8080e53c6 100644 --- a/chrome-extension/package.json +++ b/chrome-extension/package.json @@ -6,7 +6,6 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", "dev": "cross-env __DEV__=true vite build --mode development", "test": "vitest run", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 43bd9d6e1..c958104f3 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -14,7 +14,6 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "ready": "tsc", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/packages/hmr/package.json b/packages/hmr/package.json index 22707ce06..bd2fc28e0 100644 --- a/packages/hmr/package.json +++ b/packages/hmr/package.json @@ -14,7 +14,6 @@ "clean:bundle": "pnpx rimraf dist && pnpx rimraf build", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "build:tsc": "tsc -b tsconfig.build.json", "build:rollup": "rollup --config rollup.config.mjs", "ready": "pnpm run build:tsc && pnpm run build:rollup", diff --git a/packages/i18n/package.json b/packages/i18n/package.json index e9587c801..0c9c87f2c 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -13,7 +13,6 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "genenrate-i8n": "node genenrate-i18n.mjs", "ready": "pnpm genenrate-i8n && node build.dev.mjs", "build": "pnpm genenrate-i8n && node build.prod.mjs", diff --git a/packages/shared/package.json b/packages/shared/package.json index c8679a13f..eb351293f 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -13,7 +13,6 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "ready": "node build.mjs", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/packages/storage/package.json b/packages/storage/package.json index 5f7bbaac4..0972f5c13 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -13,7 +13,6 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "ready": "node build.mjs", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/packages/ui/package.json b/packages/ui/package.json index 7cc5515a2..89ecbe6b8 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -15,7 +15,6 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "ready": "node build.mjs", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/packages/vite-config/package.json b/packages/vite-config/package.json index d9124a751..31e2deb63 100644 --- a/packages/vite-config/package.json +++ b/packages/vite-config/package.json @@ -6,8 +6,7 @@ "type": "module", "private": true, "scripts": { - "clean:node_modules": "pnpx rimraf node_modules", - "clean": "pnpm clean:node_modules" + "clean:node_modules": "pnpx rimraf node_modules" }, "devDependencies": { "@extension/hmr": "workspace:*", diff --git a/packages/zipper/package.json b/packages/zipper/package.json index 88e1e7530..93f23ad2f 100644 --- a/packages/zipper/package.json +++ b/packages/zipper/package.json @@ -14,7 +14,6 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "zip": "tsx index.ts", "ready": "tsc", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/content-runtime/package.json b/pages/content-runtime/package.json index 73f86f68c..deed83148 100644 --- a/pages/content-runtime/package.json +++ b/pages/content-runtime/package.json @@ -10,7 +10,6 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/content-ui/package.json b/pages/content-ui/package.json index f78eb349c..db89210d6 100644 --- a/pages/content-ui/package.json +++ b/pages/content-ui/package.json @@ -12,7 +12,6 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "build:tailwindcss": "pnpm dlx tailwindcss -i ./src/tailwind-input.css -o ./dist/tailwind-output.css -m", "build": "pnpm clean:bundle && pnpm type-check && pnpm build:tailwindcss && vite build", "build:watch": "concurrently \"cross-env __DEV__=true vite build --mode development\" \"pnpm build:tailwindcss -- -w\"", diff --git a/pages/content/package.json b/pages/content/package.json index bd60bb97c..596190712 100644 --- a/pages/content/package.json +++ b/pages/content/package.json @@ -10,7 +10,6 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/devtools-panel/package.json b/pages/devtools-panel/package.json index 996eee397..70d15723a 100644 --- a/pages/devtools-panel/package.json +++ b/pages/devtools-panel/package.json @@ -10,7 +10,6 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/devtools/package.json b/pages/devtools/package.json index d01ee58a2..99b7566f7 100644 --- a/pages/devtools/package.json +++ b/pages/devtools/package.json @@ -10,7 +10,6 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/new-tab/package.json b/pages/new-tab/package.json index f22216ec5..c705f1195 100644 --- a/pages/new-tab/package.json +++ b/pages/new-tab/package.json @@ -10,7 +10,6 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/options/package.json b/pages/options/package.json index f14300d11..79d5e1a86 100644 --- a/pages/options/package.json +++ b/pages/options/package.json @@ -10,7 +10,6 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/popup/package.json b/pages/popup/package.json index dbcf254f9..be84f73b4 100644 --- a/pages/popup/package.json +++ b/pages/popup/package.json @@ -10,7 +10,6 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/side-panel/package.json b/pages/side-panel/package.json index 2a8bea0d6..f09cc9345 100644 --- a/pages/side-panel/package.json +++ b/pages/side-panel/package.json @@ -10,7 +10,6 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "pnpm type-check && vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", From 40c6f3a7f263e0bbcd21031ca902f9e2ea48cf8f Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Tue, 3 Sep 2024 19:20:16 +0200 Subject: [PATCH 12/19] chore: move responsibility of running commands before `build` to `turbo.json dependsOn` --- chrome-extension/package.json | 2 +- pages/content-runtime/package.json | 2 +- pages/content-ui/package.json | 2 +- pages/content/package.json | 2 +- pages/devtools-panel/package.json | 2 +- pages/devtools/package.json | 2 +- pages/new-tab/package.json | 2 +- pages/options/package.json | 2 +- pages/popup/package.json | 2 +- pages/side-panel/package.json | 2 +- turbo.json | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/chrome-extension/package.json b/chrome-extension/package.json index 8080e53c6..c0f061c26 100644 --- a/chrome-extension/package.json +++ b/chrome-extension/package.json @@ -6,7 +6,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "build": "pnpm type-check && vite build", + "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "test": "vitest run", "lint": "eslint ./ --ext .ts,.js,.tsx,.jsx", diff --git a/pages/content-runtime/package.json b/pages/content-runtime/package.json index deed83148..27ad6a414 100644 --- a/pages/content-runtime/package.json +++ b/pages/content-runtime/package.json @@ -10,7 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "build": "pnpm type-check && vite build", + "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/pages/content-ui/package.json b/pages/content-ui/package.json index db89210d6..ac0d548cf 100644 --- a/pages/content-ui/package.json +++ b/pages/content-ui/package.json @@ -13,7 +13,7 @@ "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", "build:tailwindcss": "pnpm dlx tailwindcss -i ./src/tailwind-input.css -o ./dist/tailwind-output.css -m", - "build": "pnpm clean:bundle && pnpm type-check && pnpm build:tailwindcss && vite build", + "build": "pnpm build:tailwindcss && vite build", "build:watch": "concurrently \"cross-env __DEV__=true vite build --mode development\" \"pnpm build:tailwindcss -- -w\"", "dev": "pnpm build:tailwindcss && pnpm build:watch", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/content/package.json b/pages/content/package.json index 596190712..f1d0aa0a5 100644 --- a/pages/content/package.json +++ b/pages/content/package.json @@ -10,7 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "build": "pnpm type-check && vite build", + "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/pages/devtools-panel/package.json b/pages/devtools-panel/package.json index 70d15723a..37bfcea9b 100644 --- a/pages/devtools-panel/package.json +++ b/pages/devtools-panel/package.json @@ -10,7 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "build": "pnpm type-check && vite build", + "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/pages/devtools/package.json b/pages/devtools/package.json index 99b7566f7..ce31447a8 100644 --- a/pages/devtools/package.json +++ b/pages/devtools/package.json @@ -10,7 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "build": "pnpm type-check && vite build", + "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/pages/new-tab/package.json b/pages/new-tab/package.json index c705f1195..b7c8c18c6 100644 --- a/pages/new-tab/package.json +++ b/pages/new-tab/package.json @@ -10,7 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "build": "pnpm type-check && vite build", + "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/pages/options/package.json b/pages/options/package.json index 79d5e1a86..f18fc8968 100644 --- a/pages/options/package.json +++ b/pages/options/package.json @@ -10,7 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "build": "pnpm type-check && vite build", + "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/pages/popup/package.json b/pages/popup/package.json index be84f73b4..de1e54d72 100644 --- a/pages/popup/package.json +++ b/pages/popup/package.json @@ -10,7 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "build": "pnpm type-check && vite build", + "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/pages/side-panel/package.json b/pages/side-panel/package.json index f09cc9345..eaffcadc1 100644 --- a/pages/side-panel/package.json +++ b/pages/side-panel/package.json @@ -10,7 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", - "build": "pnpm type-check && vite build", + "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/turbo.json b/turbo.json index ae47af971..c0b8d554d 100644 --- a/turbo.json +++ b/turbo.json @@ -20,7 +20,7 @@ "persistent": true }, "build": { - "dependsOn": ["^build", "^ready"], + "dependsOn": ["clean:bundle", "type-check", "ready", "^build"], "outputs": [ "../../dist/**", "dist/**", @@ -44,7 +44,7 @@ "cache": false }, "test": { - "dependsOn": ["^test", "^build"], + "dependsOn": ["build", "^test"], "cache": false }, "clean:node_modules": { From 8a140ef48d9c5f1f7274c0e4e862348a534b0c8e Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Wed, 4 Sep 2024 12:52:37 +0200 Subject: [PATCH 13/19] chore: remove `dev-server` script from root `package.json` --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 1119bb395..01225abac 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "build:firefox": "cross-env __FIREFOX__=true turbo build", "zip": "turbo zip", "zip:firefox": "cross-env __FIREFOX__=true turbo zip", - "dev-server": "pnpm -F hmr ready && pnpm -F hmr dev", "dev": "cross-env __DEV__=true turbo watch dev --concurrency 20", "dev:firefox": "cross-env __DEV__=true __FIREFOX__=true turbo watch dev --concurrency 20", "test": "turbo test", From 6321cc41b1a08f8f246606572553bf510de8bfa4 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Wed, 4 Sep 2024 13:15:12 +0200 Subject: [PATCH 14/19] chore: remove `zip` from `turbo.json` and do it only with `package.json` --- package.json | 4 ++-- turbo.json | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 01225abac..333065f50 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "clean:install": "pnpm clean:node_modules && pnpm install --frozen-lockfile", "build": "turbo build", "build:firefox": "cross-env __FIREFOX__=true turbo build", - "zip": "turbo zip", - "zip:firefox": "cross-env __FIREFOX__=true turbo zip", + "zip": "turbo build && pnpm -F zipper zip", + "zip:firefox": "turbo build && cross-env __FIREFOX__=true pnpm -F zipper zip", "dev": "cross-env __DEV__=true turbo watch dev --concurrency 20", "dev:firefox": "cross-env __DEV__=true __FIREFOX__=true turbo watch dev --concurrency 20", "test": "turbo test", diff --git a/turbo.json b/turbo.json index c0b8d554d..188ceb4b2 100644 --- a/turbo.json +++ b/turbo.json @@ -27,10 +27,6 @@ "build/**" ] }, - "zip": { - "dependsOn": ["build"], - "cache": false - }, "type-check": { "cache": false }, From efe7bf6afdce0368a41755259c9c19e2f5cc0223 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Wed, 4 Sep 2024 13:22:10 +0200 Subject: [PATCH 15/19] fix: remove unnecessary `test` script --- package.json | 1 - turbo.json | 4 ---- 2 files changed, 5 deletions(-) diff --git a/package.json b/package.json index 333065f50..01698faf5 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "zip:firefox": "turbo build && cross-env __FIREFOX__=true pnpm -F zipper zip", "dev": "cross-env __DEV__=true turbo watch dev --concurrency 20", "dev:firefox": "cross-env __DEV__=true __FIREFOX__=true turbo watch dev --concurrency 20", - "test": "turbo test", "type-check": "turbo type-check", "lint": "turbo lint --continue -- --fix --cache --cache-location node_modules/.cache/.eslintcache", "lint:fix": "turbo lint:fix --continue -- --fix --cache --cache-location node_modules/.cache/.eslintcache", diff --git a/turbo.json b/turbo.json index 188ceb4b2..abb1fa1ba 100644 --- a/turbo.json +++ b/turbo.json @@ -39,10 +39,6 @@ "prettier": { "cache": false }, - "test": { - "dependsOn": ["build", "^test"], - "cache": false - }, "clean:node_modules": { "dependsOn": ["^clean:node_modules"], "cache": false From 2586b495411f7572efbe637c8496cbf147aa96a3 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Wed, 4 Sep 2024 13:42:09 +0200 Subject: [PATCH 16/19] fix: back to live `clean` script in all `package.json` and remove deps from `turbo.json clean` --- chrome-extension/package.json | 1 + packages/dev-utils/package.json | 1 + packages/hmr/package.json | 1 + packages/i18n/package.json | 1 + packages/shared/package.json | 1 + packages/storage/package.json | 1 + packages/ui/package.json | 1 + packages/vite-config/package.json | 3 ++- packages/zipper/package.json | 1 + pages/content-runtime/package.json | 1 + pages/content-ui/package.json | 1 + pages/content/package.json | 1 + pages/devtools-panel/package.json | 1 + pages/devtools/package.json | 1 + pages/new-tab/package.json | 1 + pages/options/package.json | 1 + pages/popup/package.json | 1 + pages/side-panel/package.json | 1 + turbo.json | 2 +- 19 files changed, 20 insertions(+), 2 deletions(-) diff --git a/chrome-extension/package.json b/chrome-extension/package.json index c0f061c26..4f244877d 100644 --- a/chrome-extension/package.json +++ b/chrome-extension/package.json @@ -6,6 +6,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "test": "vitest run", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index c958104f3..43bd9d6e1 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -14,6 +14,7 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "ready": "tsc", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/packages/hmr/package.json b/packages/hmr/package.json index bd2fc28e0..22707ce06 100644 --- a/packages/hmr/package.json +++ b/packages/hmr/package.json @@ -14,6 +14,7 @@ "clean:bundle": "pnpx rimraf dist && pnpx rimraf build", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "build:tsc": "tsc -b tsconfig.build.json", "build:rollup": "rollup --config rollup.config.mjs", "ready": "pnpm run build:tsc && pnpm run build:rollup", diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 0c9c87f2c..e9587c801 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -13,6 +13,7 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "genenrate-i8n": "node genenrate-i18n.mjs", "ready": "pnpm genenrate-i8n && node build.dev.mjs", "build": "pnpm genenrate-i8n && node build.prod.mjs", diff --git a/packages/shared/package.json b/packages/shared/package.json index eb351293f..c8679a13f 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -13,6 +13,7 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "ready": "node build.mjs", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/packages/storage/package.json b/packages/storage/package.json index 0972f5c13..5f7bbaac4 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -13,6 +13,7 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "ready": "node build.mjs", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/packages/ui/package.json b/packages/ui/package.json index 89ecbe6b8..7cc5515a2 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -15,6 +15,7 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "ready": "node build.mjs", "lint": "eslint . --ext .ts,.tsx", "lint:fix": "pnpm lint --fix", diff --git a/packages/vite-config/package.json b/packages/vite-config/package.json index 31e2deb63..d9124a751 100644 --- a/packages/vite-config/package.json +++ b/packages/vite-config/package.json @@ -6,7 +6,8 @@ "type": "module", "private": true, "scripts": { - "clean:node_modules": "pnpx rimraf node_modules" + "clean:node_modules": "pnpx rimraf node_modules", + "clean": "pnpm clean:node_modules" }, "devDependencies": { "@extension/hmr": "workspace:*", diff --git a/packages/zipper/package.json b/packages/zipper/package.json index 93f23ad2f..88e1e7530 100644 --- a/packages/zipper/package.json +++ b/packages/zipper/package.json @@ -14,6 +14,7 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "zip": "tsx index.ts", "ready": "tsc", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/content-runtime/package.json b/pages/content-runtime/package.json index 27ad6a414..4ff31bbce 100644 --- a/pages/content-runtime/package.json +++ b/pages/content-runtime/package.json @@ -10,6 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/content-ui/package.json b/pages/content-ui/package.json index ac0d548cf..4560d0271 100644 --- a/pages/content-ui/package.json +++ b/pages/content-ui/package.json @@ -12,6 +12,7 @@ "clean:bundle": "pnpx rimraf dist", "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "build:tailwindcss": "pnpm dlx tailwindcss -i ./src/tailwind-input.css -o ./dist/tailwind-output.css -m", "build": "pnpm build:tailwindcss && vite build", "build:watch": "concurrently \"cross-env __DEV__=true vite build --mode development\" \"pnpm build:tailwindcss -- -w\"", diff --git a/pages/content/package.json b/pages/content/package.json index f1d0aa0a5..661c9114f 100644 --- a/pages/content/package.json +++ b/pages/content/package.json @@ -10,6 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/devtools-panel/package.json b/pages/devtools-panel/package.json index 37bfcea9b..6bf6f4821 100644 --- a/pages/devtools-panel/package.json +++ b/pages/devtools-panel/package.json @@ -10,6 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/devtools/package.json b/pages/devtools/package.json index ce31447a8..1946b896d 100644 --- a/pages/devtools/package.json +++ b/pages/devtools/package.json @@ -10,6 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/new-tab/package.json b/pages/new-tab/package.json index b7c8c18c6..1ae0c9612 100644 --- a/pages/new-tab/package.json +++ b/pages/new-tab/package.json @@ -10,6 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/options/package.json b/pages/options/package.json index f18fc8968..5f42d0bec 100644 --- a/pages/options/package.json +++ b/pages/options/package.json @@ -10,6 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/popup/package.json b/pages/popup/package.json index de1e54d72..40543b085 100644 --- a/pages/popup/package.json +++ b/pages/popup/package.json @@ -10,6 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/pages/side-panel/package.json b/pages/side-panel/package.json index eaffcadc1..63cf5472d 100644 --- a/pages/side-panel/package.json +++ b/pages/side-panel/package.json @@ -10,6 +10,7 @@ "scripts": { "clean:node_modules": "pnpx rimraf node_modules", "clean:turbo": "pnpx rimraf .turbo", + "clean": "pnpm clean:node_modules && pnpm clean:turbo", "build": "vite build", "dev": "cross-env __DEV__=true vite build --mode development", "lint": "eslint . --ext .ts,.tsx", diff --git a/turbo.json b/turbo.json index abb1fa1ba..18ea8a768 100644 --- a/turbo.json +++ b/turbo.json @@ -52,7 +52,7 @@ "cache": false }, "clean": { - "dependsOn": ["clean:node_modules", "clean:turbo", "clean:bundle"], + "dependsOn": ["^clean"], "cache": false } } From 5dcf6c042d82931109bb59e9b2d89693c96a1b28 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Wed, 4 Sep 2024 13:43:30 +0200 Subject: [PATCH 17/19] chore: add command chain to `build` and `build:firefox` instead of `turbo.json dependsOn` --- package.json | 4 ++-- turbo.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 01698faf5..ba3d85c84 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,8 @@ "clean:bundle": "pnpx turbo clean:bundle && pnpm clean-root:bundle", "clean": "pnpx turbo clean && pnpm clean-root", "clean:install": "pnpm clean:node_modules && pnpm install --frozen-lockfile", - "build": "turbo build", - "build:firefox": "cross-env __FIREFOX__=true turbo build", + "build": "pnpm clean:bundle && turbo ready && pnpm type-check && turbo build", + "build:firefox": "pnpm clean:bundle && turbo ready && pnpm type-check && cross-env __FIREFOX__=true turbo build", "zip": "turbo build && pnpm -F zipper zip", "zip:firefox": "turbo build && cross-env __FIREFOX__=true pnpm -F zipper zip", "dev": "cross-env __DEV__=true turbo watch dev --concurrency 20", diff --git a/turbo.json b/turbo.json index 18ea8a768..b534f34f1 100644 --- a/turbo.json +++ b/turbo.json @@ -20,7 +20,7 @@ "persistent": true }, "build": { - "dependsOn": ["clean:bundle", "type-check", "ready", "^build"], + "dependsOn": ["^build"], "outputs": [ "../../dist/**", "dist/**", From 328c7e1352bede4bbd48a80e5136e446428a5311 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Wed, 4 Sep 2024 13:55:11 +0200 Subject: [PATCH 18/19] chore: disable `cache` for rest `turbo.json tasks` --- turbo.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/turbo.json b/turbo.json index b534f34f1..7820d3b8f 100644 --- a/turbo.json +++ b/turbo.json @@ -8,7 +8,8 @@ "outputs": [ "dist/**", "build/**" - ] + ], + "cache": false }, "dev": { "dependsOn": ["ready"], @@ -17,6 +18,7 @@ "build/**", "i18n/locales/**" ], + "cache": false, "persistent": true }, "build": { @@ -25,7 +27,8 @@ "../../dist/**", "dist/**", "build/**" - ] + ], + "cache": false }, "type-check": { "cache": false From 2743f9b12cc04801bd04c2bf280880ad6c65f587 Mon Sep 17 00:00:00 2001 From: PatrykKuniczak Date: Thu, 5 Sep 2024 08:51:51 +0200 Subject: [PATCH 19/19] fix: remove `-root` script from root `package.json` --- package.json | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index ba3d85c84..516200d74 100644 --- a/package.json +++ b/package.json @@ -9,14 +9,10 @@ }, "type": "module", "scripts": { - "clean-root:bundle": "pnpx rimraf dist && pnpx rimraf dist-zip", - "clean-root:node_modules": "pnpx turbo daemon stop && pnpx rimraf node_modules", - "clean-root:turbo": "pnpx turbo daemon stop && pnpx rimraf .turbo", - "clean-root": "pnpm clean-root:bundle && pnpm clean-root:node_modules && pnpm clean-root:turbo", - "clean:node_modules": "pnpx turbo clean:node_modules && pnpm clean-root:node_modules", - "clean:turbo": "pnpx turbo clean:turbo && pnpm clean-root:turbo", - "clean:bundle": "pnpx turbo clean:bundle && pnpm clean-root:bundle", - "clean": "pnpx turbo clean && pnpm clean-root", + "clean:bundle": "pnpx rimraf dist && pnpx rimraf dist-zip && pnpx turbo clean:bundle", + "clean:node_modules": "pnpx turbo daemon stop && pnpx rimraf node_modules && pnpx turbo clean:node_modules", + "clean:turbo": "pnpx turbo daemon stop && pnpx rimraf .turbo && pnpx turbo clean:turbo", + "clean": "pnpm clean:bundle && pnpm clean:node_modules && pnpm clean:turbo", "clean:install": "pnpm clean:node_modules && pnpm install --frozen-lockfile", "build": "pnpm clean:bundle && turbo ready && pnpm type-check && turbo build", "build:firefox": "pnpm clean:bundle && turbo ready && pnpm type-check && cross-env __FIREFOX__=true turbo build",