Merge pull request #246 from codeoverflow-org/239-use-nodecg-types

Use `nodecg-types` for nodecg types instead of `nodecg`

Author: hlxid

.scripts/create-service.py

@@ -45,7 +45,7 @@
     os.mkdir(f'nodecg-io-{service_name}/extension')
     with open(f'nodecg-io-{service_name}/extension/index.ts', mode='w') as file:
         file.writelines([
-            'import { NodeCG } from "nodecg/types/server";\n',
+            'import { NodeCG } from "nodecg-types/types/server";\n',
             'import { Result, emptySuccess, success, ServiceBundle } from "nodecg-io-core";\n',
             f'import {{ {service_name_c}Client }} from "./{service_name_cc}Client";\n',
             '\n',
@@ -124,7 +124,7 @@
     os.mkdir(f'samples/{sample_name}/extension')
     with open(f'samples/{sample_name}/extension/index.ts', mode='w') as file:
         file.writelines([
-            'import { NodeCG } from "nodecg/types/server";\n',
+            'import { NodeCG } from "nodecg-types/types/server";\n',
             f'import {{ {service_name_c}Client }} from "nodecg-io-{service_name}";\n',
             'import { requireService } from "nodecg-io-core";\n',
             '\n',

nodecg-io-ahk/extension/AHK.ts

@@ -1,5 +1,5 @@
 import fetch from "node-fetch";
-import { NodeCG } from "nodecg/types/server";
+import { NodeCG } from "nodecg-types/types/server";
 
 export class AHK {
     private readonly address: string;

nodecg-io-ahk/extension/index.ts

@@ -1,4 +1,4 @@
-import { NodeCG } from "nodecg/types/server";
+import { NodeCG } from "nodecg-types/types/server";
 import { Result, emptySuccess, success, ServiceBundle } from "nodecg-io-core";
 import { AHK } from "./AHK";
 

nodecg-io-ahk/package.json

@@ -38,7 +38,7 @@
     "devDependencies": {
         "@types/node": "^15.0.2",
         "@types/node-fetch": "^2.5.10",
-        "nodecg": "^1.8.1",
+        "nodecg-types": "^1.8.2",
         "typescript": "^4.2.4"
     },
     "dependencies": {

nodecg-io-android/extension/android.ts

@@ -4,7 +4,7 @@ import { spawn } from "child_process";
 import { onExit, readableToString } from "@rauschma/stringio";
 import { AddressInfo } from "net";
 import { buffer as readableToBuffer } from "get-stream";
-import { NodeCG } from "nodecg/types/server";
+import { NodeCG } from "nodecg-types/types/server";
 
 /**
  * Represents an android device that is connected via ADB.

nodecg-io-android/extension/index.ts

@@ -1,4 +1,4 @@
-import { NodeCG } from "nodecg/types/server";
+import { NodeCG } from "nodecg-types/types/server";
 import { Result, emptySuccess, success, ServiceBundle } from "nodecg-io-core";
 import { Android } from "./android";
 

nodecg-io-android/package.json

@@ -37,7 +37,7 @@
     "license": "MIT",
     "devDependencies": {
         "@types/node": "^15.0.2",
-        "nodecg": "^1.8.1",
+        "nodecg-types": "^1.8.2",
         "typescript": "^4.2.4"
     },
     "dependencies": {

nodecg-io-core/dashboard/authentication.ts

@@ -1,4 +1,4 @@
-/// <reference types="nodecg/types/browser" />
+/// <reference types="nodecg-types/types/browser" />
 
 import { updateMonacoLayout } from "./serviceInstance";
 import { setPassword, isPasswordSet } from "./crypto";

nodecg-io-core/dashboard/package.json

@@ -15,7 +15,7 @@
     "dependencies": {
         "crypto-js": "^4.0.0",
         "monaco-editor": "^0.23.0",
-        "nodecg": "^1.8.1",
+        "nodecg-types": "^1.8.2",
         "nodecg-io-core": "^0.2.0"
     },
     "license": "MIT"

nodecg-io-core/extension/__tests__/mocks.ts

@@ -1,5 +1,5 @@
 import { ObjectMap, ServiceInstance } from "../service";
-import type { NodeCG, ReplicantOptions, Replicant, Logger } from "nodecg/types/server";
+import type { NodeCG, ReplicantOptions, Replicant, Logger } from "nodecg-types/types/server";
 import { EventEmitter } from "events";
 
 // The mock-nodecg package has a few problems like no typings and some un-implemented functions that are a dealbreaker for us.