From 0f4af83e4ed3cef1ec035c2833e0b06cab0bd87f Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Wed, 17 Aug 2022 20:07:00 +0200
Subject: [PATCH] fix: remove unused `@types/long` (#1785)

* fix: remove unused `@types/long`

* fix: typescript tests

Co-authored-by: Alexander Fenster <fenster@google.com>
---
 cli/package-lock.json   | 11 -----------
 package-lock.json       | 11 -----------
 package.json            |  3 +--
 tests/data/convert.d.ts |  2 ++
 tests/data/test.d.ts    |  2 ++
 5 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/cli/package-lock.json b/cli/package-lock.json
index e4bfef038..07b336b7f 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -51,7 +51,6 @@
         "@protobufjs/path": "^1.1.2",
         "@protobufjs/pool": "^1.1.0",
         "@protobufjs/utf8": "^1.1.0",
-        "@types/long": "^4.0.1",
         "@types/node": ">=13.7.0",
         "long": "^5.0.0"
       },
@@ -741,11 +740,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "../node_modules/@types/long": {
-      "version": "4.0.2",
-      "dev": true,
-      "license": "MIT"
-    },
     "../node_modules/@types/markdown-it": {
       "version": "12.2.3",
       "dev": true,
@@ -10126,7 +10120,6 @@
         "@protobufjs/path": "^1.1.2",
         "@protobufjs/pool": "^1.1.0",
         "@protobufjs/utf8": "^1.1.0",
-        "@types/long": "^4.0.1",
         "@types/node": ">=13.7.0",
         "benchmark": "^2.1.4",
         "browserify": "^17.0.0",
@@ -10615,10 +10608,6 @@
           "version": "3.0.2",
           "dev": true
         },
-        "@types/long": {
-          "version": "4.0.2",
-          "dev": true
-        },
         "@types/markdown-it": {
           "version": "12.2.3",
           "dev": true,
diff --git a/package-lock.json b/package-lock.json
index a6fcd8e53..8ce752da4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,6 @@
         "@protobufjs/path": "^1.1.2",
         "@protobufjs/pool": "^1.1.0",
         "@protobufjs/utf8": "^1.1.0",
-        "@types/long": "^4.0.1",
         "@types/node": ">=13.7.0",
         "long": "^5.0.0"
       },
@@ -738,11 +737,6 @@
       "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
       "dev": true
     },
-    "node_modules/@types/long": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
-      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
-    },
     "node_modules/@types/markdown-it": {
       "version": "12.2.3",
       "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
@@ -10627,11 +10621,6 @@
       "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
       "dev": true
     },
-    "@types/long": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
-      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
-    },
     "@types/markdown-it": {
       "version": "12.2.3",
       "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
diff --git a/package.json b/package.json
index f8a50271b..e8e4e0435 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "prof": "node bench/prof",
     "test": "npm run test:sources && npm run test:types",
     "test:sources": "tape -r ./lib/tape-adapter tests/*.js tests/node/*.js",
-    "test:types": "tsc tests/comp_typescript.ts --lib es2015 --strictNullChecks --experimentalDecorators --emitDecoratorMetadata && tsc tests/data/test.js.ts --lib es2015 --noEmit --strictNullChecks && tsc tests/data/*.ts --lib es2015 --noEmit --strictNullChecks",
+    "test:types": "tsc tests/comp_typescript.ts --lib es2015 --esModuleInterop --strictNullChecks --experimentalDecorators --emitDecoratorMetadata && tsc tests/data/test.js.ts --lib es2015 --esModuleInterop --noEmit --strictNullChecks && tsc tests/data/*.ts --lib es2015 --esModuleInterop --noEmit --strictNullChecks",
     "make": "npm run lint:sources && npm run build && npm run lint:types && node ./scripts/gentests.js && npm test"
   },
   "dependencies": {
@@ -50,7 +50,6 @@
     "@protobufjs/path": "^1.1.2",
     "@protobufjs/pool": "^1.1.0",
     "@protobufjs/utf8": "^1.1.0",
-    "@types/long": "^4.0.1",
     "@types/node": ">=13.7.0",
     "long": "^5.0.0"
   },
diff --git a/tests/data/convert.d.ts b/tests/data/convert.d.ts
index 17383732c..b40b881c4 100644
--- a/tests/data/convert.d.ts
+++ b/tests/data/convert.d.ts
@@ -1,4 +1,6 @@
 import * as $protobuf from "../..";
+import Long from "long";
+
 export interface IMessage {
     stringVal?: (string|null);
     stringRepeated?: (string[]|null);
diff --git a/tests/data/test.d.ts b/tests/data/test.d.ts
index c4bf3a71b..51c86c011 100644
--- a/tests/data/test.d.ts
+++ b/tests/data/test.d.ts
@@ -1,4 +1,6 @@
 import * as $protobuf from "../..";
+import Long from "long";
+
 export namespace jspb {
 
     namespace test {