From 94439dddbe8a1af0fea41de5315710cd9c82ab1c Mon Sep 17 00:00:00 2001
From: jihchi <achi@987.tw>
Date: Fri, 27 Jan 2023 18:25:40 +0100
Subject: [PATCH] Revert "Only install typescript on 14.x Node.js"

This reverts commit 7c63dce6d00099aba440837f845d7987bed68b5d.
---
 .github/workflows/main.yml |  4 ----
 package.json               |  1 +
 pnpm-lock.yaml             | 13 +++++++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 74e587b..d3d76e6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,10 +27,6 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
-      - name: Install typescript (optional)
-        if: ${{ matrix.node == '14.x' }}
-        run: pnpm install --no-lockfile typescript
-
       - name: Test
         run: pnpm test -- --coverage
 
diff --git a/package.json b/package.json
index 32f424f..4f26cde 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "prettier": "2.8.1",
     "rimraf": "^3.0.2",
     "tsup": "^6.5.0",
+    "typescript": "^4.9.4",
     "vite": "^4.0.0",
     "vitest": "^0.25.7"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3936de6..5ad8ad4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,6 +9,7 @@ specifiers:
   prettier: 2.8.1
   rimraf: ^3.0.2
   tsup: ^6.5.0
+  typescript: ^4.9.4
   vite: ^4.0.0
   vitest: ^0.25.7
 
@@ -22,7 +23,8 @@ devDependencies:
   '@vitest/coverage-c8': 0.28.3
   prettier: 2.8.1
   rimraf: 3.0.2
-  tsup: 6.5.0
+  tsup: 6.5.0_typescript@4.9.4
+  typescript: 4.9.4
   vite: 4.0.4
   vitest: 0.25.8
 
@@ -1590,7 +1592,7 @@ packages:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
     dev: true
 
-  /tsup/6.5.0:
+  /tsup/6.5.0_typescript@4.9.4:
     resolution: {integrity: sha512-36u82r7rYqRHFkD15R20Cd4ercPkbYmuvRkz3Q1LCm5BsiFNUgpo36zbjVhCOgvjyxNBWNKHsaD5Rl8SykfzNA==}
     engines: {node: '>=14'}
     hasBin: true
@@ -1620,6 +1622,7 @@ packages:
       source-map: 0.8.0-beta.0
       sucrase: 3.29.0
       tree-kill: 1.2.2
+      typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
       - ts-node
@@ -1630,6 +1633,12 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
+  /typescript/4.9.4:
+    resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==}
+    engines: {node: '>=4.2.0'}
+    hasBin: true
+    dev: true
+
   /ufo/1.0.1:
     resolution: {integrity: sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==}
     dev: true