Skip to content
This repository was archived by the owner on Apr 13, 2025. It is now read-only.

Use nodecg-types for nodecg types instead of nodecg #246

Merged
merged 4 commits into from
Sep 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .scripts/create-service.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-ahk/extension/AHK.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-ahk/extension/index.ts
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-ahk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-android/extension/android.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-android/extension/index.ts
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-android/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-core/dashboard/authentication.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// <reference types="nodecg/types/browser" />
/// <reference types="nodecg-types/types/browser" />

import { updateMonacoLayout } from "./serviceInstance";
import { setPassword, isPasswordSet } from "./crypto";
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-core/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-core/extension/__tests__/mocks.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-core/extension/bundleManager.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { ObjectMap, Service, ServiceDependency, ServiceInstance } from "./service";
import { emptySuccess, error, Result } from "./utils/result";
import { EventEmitter } from "events";
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-core/extension/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { ServiceManager } from "./serviceManager";
import { BundleManager } from "./bundleManager";
import { MessageManager } from "./messageManager";
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-core/extension/instanceManager.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { ObjectMap, Service, ServiceInstance } from "./service";
import { emptySuccess, error, Result } from "./utils/result";
import { ServiceManager } from "./serviceManager";
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-core/extension/messageManager.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { emptySuccess, error, Result, success } from "./utils/result";
import { InstanceManager } from "./instanceManager";
import { BundleManager } from "./bundleManager";
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-core/extension/persistenceManager.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeCG, ReplicantServer } from "nodecg/types/server";
import { NodeCG, ReplicantServer } from "nodecg-types/types/server";
import { InstanceManager } from "./instanceManager";
import { BundleManager } from "./bundleManager";
import * as crypto from "crypto-js";
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-core/extension/serviceBundle.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NodeCGIOCore } from ".";
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { ObjectMap, Service } from "./service";
import { Result } from "./utils/result";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-core/extension/serviceManager.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Service } from "./service";
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { error, Result, success } from "./utils/result";

/* eslint-disable @typescript-eslint/no-explicit-any */
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-core/extension/serviceProvider.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { EventEmitter } from "events";
import { NodeCGIOCore } from "./index";
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";

/**
* A wrapper around a ServiceClient that has helper functions for setting up callbacks and
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@types/jest": "^27.0.1",
"@types/node": "^15.0.2",
"jest": "^27.0.6",
"nodecg": "^1.8.1",
"nodecg-types": "^1.8.2",
"typescript": "^4.2.4",
"ts-jest": "^27.0.3"
},
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-curseforge/extension/index.ts
Original file line number Diff line number Diff line change
@@ -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 { CurseForge } from "./curseforgeClient";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-curseforge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-debug/dashboard/debug-helper.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// <reference types="nodecg/types/browser" />
/// <reference types="nodecg-types/types/browser" />
/// <reference types="monaco-editor/monaco" />

// Buttons
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-debug/extension/debugHelper.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventEmitter } from "events";
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";

export interface Color {
red: number;
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-debug/extension/index.ts
Original file line number Diff line number Diff line change
@@ -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 { DebugHelper } from "./debugHelper";

Expand Down
1 change: 1 addition & 0 deletions nodecg-io-debug/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nodecg-io-debug/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"license": "MIT",
"devDependencies": {
"@types/node": "^15.0.2",
"nodecg": "^1.8.1",
"nodecg-types": "^1.8.2",
"typescript": "^4.2.4"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-discord/extension/index.ts
Original file line number Diff line number Diff line change
@@ -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 { Client as DiscordClient } from "discord.js";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-discord/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-elgato-light/extension/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { Result, emptySuccess, success, ServiceBundle, error } from "nodecg-io-core";
import { ElgatoLightClient, ElgatoLightConfig } from "./elgatoLightClient";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-elgato-light/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-gsheets/extension/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { Result, emptySuccess, success, error, ServiceBundle } from "nodecg-io-core";
import { google, sheets_v4 } from "googleapis";
import type { Credentials } from "google-auth-library/build/src/auth/credentials";
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-gsheets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-intellij/extension/index.ts
Original file line number Diff line number Diff line change
@@ -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 { IntelliJ } from "./intellij";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-intellij/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-irc/extension/index.ts
Original file line number Diff line number Diff line change
@@ -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 { Client as IRCClient } from "irc";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-irc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-midi-input/extension/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { Result, emptySuccess, success, error, ServiceBundle } from "nodecg-io-core";
import * as easymidi from "easymidi";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-midi-input/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-midi-output/extension/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { Result, emptySuccess, success, error, ServiceBundle } from "nodecg-io-core";
import * as easymidi from "easymidi";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-midi-output/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-nanoleaf/extension/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { Result, emptySuccess, success, ServiceBundle, error } from "nodecg-io-core";
import { NanoleafClient } from "./nanoleafClient";
import { NanoleafUtils } from "./nanoleafUtils";
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-nanoleaf/extension/nanoleafUtils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fetch from "node-fetch";
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { Color } from "./interfaces";

/**
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-nanoleaf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"license": "MIT",
"devDependencies": {
"@types/node": "^15.0.2",
"nodecg": "^1.8.1",
"nodecg-types": "^1.8.2",
"typescript": "^4.2.4"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-obs/extension/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { Result, emptySuccess, success, error, ServiceBundle } from "nodecg-io-core";
import * as OBSWebSocket from "obs-websocket-js";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-obs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-philipshue/extension/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeCG } from "nodecg/types/server";
import { NodeCG } from "nodecg-types/types/server";
import { Result, emptySuccess, success, error, ServiceBundle } from "nodecg-io-core";
import { v4 as ipv4 } from "is-ip";
import { v3 } from "node-hue-api";
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-philipshue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-rcon/extension/index.ts
Original file line number Diff line number Diff line change
@@ -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 { Rcon } from "rcon-client";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-rcon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-reddit/extension/index.ts
Original file line number Diff line number Diff line change
@@ -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 RedditAPI from "reddit-ts";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-reddit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-sacn-receiver/extension/index.ts
Original file line number Diff line number Diff line change
@@ -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 { SacnReceiverServiceClient } from "./sacnReceiverClient";

Expand Down
2 changes: 1 addition & 1 deletion nodecg-io-sacn-receiver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Loading