diff --git a/.github/workflows/build-examples.yml b/.github/workflows/build-examples.yml
index b52a1462..6bfd083f 100644
--- a/.github/workflows/build-examples.yml
+++ b/.github/workflows/build-examples.yml
@@ -16,7 +16,7 @@ jobs:
       TURBO_REMOTE_ONLY: true
     strategy:
       matrix:
-        node-version: ["16.x"]
+        node-version: ["18.x"]
         pnpm-version: ["7.x"]
         os: [ubuntu-latest]
     steps:
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index 1abe9784..00d008fc 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -10,7 +10,7 @@ jobs:
       TURBO_REMOTE_ONLY: true
     strategy:
       matrix:
-        node-version: ["16.x"]
+        node-version: ["18.x"]
         pnpm-version: ["7.x"]
         os: [ubuntu-latest]
     steps:
@@ -43,7 +43,7 @@ jobs:
       TURBO_REMOTE_ONLY: true
     strategy:
       matrix:
-        node-version: ["16.x"]
+        node-version: ["18.x"]
         pnpm-version: ["7.x"]
         os: [ubuntu-latest]
     if: ${{ github.ref == 'refs/heads/master' && (contains(github.event.head_commit.message, '[bump ver]') || contains(github.event.head_commit.message, 'RELEASING')) }}
diff --git a/packages/next-pwa/package.json b/packages/next-pwa/package.json
index 5955e36e..0e3a94c1 100644
--- a/packages/next-pwa/package.json
+++ b/packages/next-pwa/package.json
@@ -56,7 +56,6 @@
     "workbox-window": "6.5.4"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "24.0.1",
     "@rollup/plugin-json": "6.0.0",
     "@rollup/plugin-node-resolve": "15.0.1",
     "@rollup/plugin-terser": "0.4.0",
diff --git a/packages/next-pwa/rollup.config.js b/packages/next-pwa/rollup.config.js
index 4120e896..a450523c 100644
--- a/packages/next-pwa/rollup.config.js
+++ b/packages/next-pwa/rollup.config.js
@@ -32,13 +32,13 @@ const files = [
       "clean-webpack-plugin",
       "terser-webpack-plugin",
       "workbox-webpack-plugin",
+      "typescript",
       "webpack",
       "crypto",
       "fs",
       "path",
       "url",
       "fast-glob",
-      "typescript",
       "workbox-window",
     ],
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b4a0fd47..7da674c9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -525,9 +525,6 @@ importers:
         specifier: 6.5.4
         version: 6.5.4
     devDependencies:
-      '@rollup/plugin-commonjs':
-        specifier: 24.0.1
-        version: 24.0.1(rollup@3.20.2)
       '@rollup/plugin-json':
         specifier: 6.0.0
         version: 6.0.0(rollup@3.20.2)
@@ -2394,24 +2391,6 @@ packages:
       rollup: 2.79.1
     dev: false
 
-  /@rollup/plugin-commonjs@24.0.1(rollup@3.20.2):
-    resolution: {integrity: sha512-15LsiWRZk4eOGqvrJyu3z3DaBu5BhXIMeWnijSRvd8irrrg9SHpQ1pH+BUK4H6Z9wL9yOxZJMTLU+Au86XHxow==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^2.68.0||^3.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-    dependencies:
-      '@rollup/pluginutils': 5.0.2(rollup@3.20.2)
-      commondir: 1.0.1
-      estree-walker: 2.0.2
-      glob: 8.0.3
-      is-reference: 1.2.1
-      magic-string: 0.27.0
-      rollup: 3.20.2
-    dev: true
-
   /@rollup/plugin-json@6.0.0(rollup@3.20.2):
     resolution: {integrity: sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==}
     engines: {node: '>=14.0.0'}
@@ -3879,10 +3858,6 @@ packages:
     engines: {node: '>=4.0.0'}
     dev: false
 
-  /commondir@1.0.1:
-    resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
-    dev: true
-
   /concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
@@ -5805,12 +5780,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-reference@1.2.1:
-    resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
-    dependencies:
-      '@types/estree': 1.0.0
-    dev: true
-
   /is-regex@1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
     engines: {node: '>= 0.4'}
@@ -6295,13 +6264,6 @@ packages:
       sourcemap-codec: 1.4.8
     dev: false
 
-  /magic-string@0.27.0:
-    resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.14
-    dev: true
-
   /make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
     dev: true