From 8f3f6411818c71ad2e9cbfaa220ad1ae6a6f04a4 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Wed, 13 Jul 2022 10:51:46 +0530 Subject: [PATCH 01/10] ci: try webpack cache --- .github/workflows/testing.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 84fde7e4ad3e..25b481e8d9a2 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -57,6 +57,16 @@ jobs: cache: yarn - run: yarn + + - name: Enable webpack persistent caching + uses: actions/cache@v3 + id: build-webpack-persistent-cache + with: + path: node_modules/.cache/webpack + key: build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} + restore-keys: |- + build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} + build-${{ hashFiles('**/webpack.*.js') }}- - name: Build site run: yarn build From c3b5aed64c56200e37b28f0367c4d8d9f32d5195 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Wed, 13 Jul 2022 11:06:46 +0530 Subject: [PATCH 02/10] Update .github/workflows/testing.yml --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 25b481e8d9a2..ca5f23285e78 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -62,7 +62,7 @@ jobs: uses: actions/cache@v3 id: build-webpack-persistent-cache with: - path: node_modules/.cache/webpack + path: node_modules/.cache key: build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} restore-keys: |- build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} From ecc3a869d7a83c470faacd1d121ca2d4e8e6deb7 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Wed, 13 Jul 2022 11:19:35 +0530 Subject: [PATCH 03/10] Update webpack.prod.mjs --- webpack.prod.mjs | 1 + 1 file changed, 1 insertion(+) diff --git a/webpack.prod.mjs b/webpack.prod.mjs index 5c2103d8c1c3..23ca2f0f1314 100644 --- a/webpack.prod.mjs +++ b/webpack.prod.mjs @@ -19,6 +19,7 @@ export default (env) => buildDependencies: { config: [__filename], }, + cacheDirectory: path.resolve(__dirname, 'node_modules/.cache/webpack') }, entry: { index: { From c0e541df82761824d2d42fb82350b01c7fceb814 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Wed, 13 Jul 2022 11:38:44 +0530 Subject: [PATCH 04/10] Update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c8448aeeaca7..1e7923606d3b 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,8 @@ "cypress:open": "cypress open", "cypress:run": "cypress run", "prettier": "prettier --write '**/*.{js,json,jsx,css,scss,md,mdx}'", - "prepare": "husky install" + "prepare": "husky install", + "postinstall": "rimraf ./node_modules/.cache/webpack" }, "lint-staged": { "*.{js,jsx,md,mdx}": [ From aef54fd80e1b9a2c69ca031bb1c73651efdd54ec Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Fri, 15 Jul 2022 09:06:44 +0530 Subject: [PATCH 05/10] Update testing.yml --- .github/workflows/testing.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index ca5f23285e78..472190f0aa59 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -84,6 +84,16 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Enable webpack persistent caching + uses: actions/cache@v3 + id: build-webpack-persistent-cache + with: + path: node_modules/.cache + key: build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} + restore-keys: |- + build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} + build-${{ hashFiles('**/webpack.*.js') }}- + - name: Cypress run uses: cypress-io/github-action@v4 with: From c6426fb6f4d75c9e9c9be9f22ca2f843ac54a048 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Fri, 15 Jul 2022 09:07:23 +0530 Subject: [PATCH 06/10] Update deploy.yml --- .github/workflows/deploy.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5c24e62bfca2..eae119d484f2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,6 +23,16 @@ jobs: node-version: ${{ matrix.node-version }} cache: yarn + - name: Enable webpack persistent caching + uses: actions/cache@v3 + id: build-webpack-persistent-cache + with: + path: node_modules/.cache + key: build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} + restore-keys: |- + build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} + build-${{ hashFiles('**/webpack.*.js') }}- + - run: yarn --frozen-lockfile - name: Build site run: yarn build From 5b72ab84cd2c6126ec54977ca67875b84de09f1f Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Mon, 18 Jul 2022 10:25:18 +0530 Subject: [PATCH 07/10] fix: use `webpack.*.mjs` --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 472190f0aa59..e70b4c4e5a94 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -89,7 +89,7 @@ jobs: id: build-webpack-persistent-cache with: path: node_modules/.cache - key: build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} + key: build-${{ hashFiles('**/webpack.*.mjs') }}-${{ hashFiles('**/yarn.lock') }} restore-keys: |- build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} build-${{ hashFiles('**/webpack.*.js') }}- From ee0fc694f81174fa4e6c8d806ad3bff72d9cf1e3 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Tue, 19 Jul 2022 17:17:27 +0530 Subject: [PATCH 08/10] fix: cache key --- .github/workflows/testing.yml | 12 ++++++------ webpack.common.mjs | 2 +- webpack.prod.mjs | 6 ------ 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index e70b4c4e5a94..eafe631f7dfe 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -57,16 +57,16 @@ jobs: cache: yarn - run: yarn - + - name: Enable webpack persistent caching uses: actions/cache@v3 id: build-webpack-persistent-cache with: path: node_modules/.cache - key: build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} + key: build-${{ hashFiles('**/webpack.*.mjs') }}-${{ hashFiles('**/yarn.lock') }} restore-keys: |- - build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} - build-${{ hashFiles('**/webpack.*.js') }}- + build-${{ hashFiles('**/webpack.*.mjs') }}-${{ hashFiles('**/yarn.lock') }} + build-${{ hashFiles('**/webpack.*.mjs') }}- - name: Build site run: yarn build @@ -91,8 +91,8 @@ jobs: path: node_modules/.cache key: build-${{ hashFiles('**/webpack.*.mjs') }}-${{ hashFiles('**/yarn.lock') }} restore-keys: |- - build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} - build-${{ hashFiles('**/webpack.*.js') }}- + build-${{ hashFiles('**/webpack.*.mjs') }}-${{ hashFiles('**/yarn.lock') }} + build-${{ hashFiles('**/webpack.*.mjs') }}- - name: Cypress run uses: cypress-io/github-action@v4 diff --git a/webpack.common.mjs b/webpack.common.mjs index 8dd46af61d30..a9cc9d2399bf 100644 --- a/webpack.common.mjs +++ b/webpack.common.mjs @@ -55,7 +55,7 @@ export default ({ ssg = false }) => ({ buildDependencies: { config: [__filename], }, - cacheDirectory: path.resolve(__dirname, '.cache/webpack'), + cacheDirectory: path.resolve(__dirname, 'node_modules/.cache/webpack') }, resolve: { extensions: ['.js', '.jsx', '.scss'], diff --git a/webpack.prod.mjs b/webpack.prod.mjs index 23ca2f0f1314..70d260c75734 100644 --- a/webpack.prod.mjs +++ b/webpack.prod.mjs @@ -15,12 +15,6 @@ import ProdAssetsManifest from './src/ProdAssetsManifest.mjs'; export default (env) => merge(common(env), { mode: 'production', - cache: { - buildDependencies: { - config: [__filename], - }, - cacheDirectory: path.resolve(__dirname, 'node_modules/.cache/webpack') - }, entry: { index: { import: './index.jsx', From ccc004696788b5b45fb949821ef413fe07301459 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Tue, 19 Jul 2022 17:19:28 +0530 Subject: [PATCH 09/10] fix: use cache form common config --- webpack.ssg.mjs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/webpack.ssg.mjs b/webpack.ssg.mjs index 3d668a9fdd68..ec8fa8cc9ce2 100644 --- a/webpack.ssg.mjs +++ b/webpack.ssg.mjs @@ -24,11 +24,6 @@ export default (env) => name: 'ssg', mode: 'production', target: 'node', - cache: { - buildDependencies: { - config: [__filename], - }, - }, module: { parser: { javascript: { From 503eb496a71d6cc29a4d5943094111135d73c175 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Wed, 20 Jul 2022 10:43:19 +0530 Subject: [PATCH 10/10] Update deploy.yml --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index eae119d484f2..f1d83b9c9c42 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -28,10 +28,10 @@ jobs: id: build-webpack-persistent-cache with: path: node_modules/.cache - key: build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} + key: build-${{ hashFiles('**/webpack.*.mjs') }}-${{ hashFiles('**/yarn.lock') }} restore-keys: |- - build-${{ hashFiles('**/webpack.*.js') }}-${{ hashFiles('**/yarn.lock') }} - build-${{ hashFiles('**/webpack.*.js') }}- + build-${{ hashFiles('**/webpack.*.mjs') }}-${{ hashFiles('**/yarn.lock') }} + build-${{ hashFiles('**/webpack.*.mjs') }}- - run: yarn --frozen-lockfile - name: Build site