Merge pull request #557 from mcottontensor/backport/UE5.5/pr-541

[UE5.5] Merge pull request #541 from Belchy06/temp

Author: mcottontensor

Common/eslint.config.mjs

@@ -1,16 +1,14 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
-import eslint from '@eslint/js';
+
 import tseslint from 'typescript-eslint';
 import tsdocPlugin from 'eslint-plugin-tsdoc';
-import prettierPluginRecommended from 'eslint-plugin-prettier/recommended';
+import baseConfig from '../eslint.config.mjs'
 
 export default tseslint.config(
+    baseConfig,
     {
         ignores: ["src/Messages/signalling_messages.ts"],
     },
-    eslint.configs.recommended,
-    tseslint.configs.recommendedTypeCheckedOnly,
-    prettierPluginRecommended,
     {
         languageOptions: {
             parser: tseslint.parser,

Common/package.json

@@ -31,15 +31,16 @@
         "eslint-plugin-tsdoc": "^0.4.0",
         "nodemon": "^3.1.9",
         "rimraf": "^6.0.1",
-        "typedoc": "^0.27.7",
+        "typedoc": "^0.28.0",
         "typedoc-plugin-markdown": "^4.4.2",
         "typescript": "^5.7.3",
-        "typescript-eslint": "^8.24.0"
+        "typescript-eslint": "^8.24.0",
+        "@epicgames-ps/eslint-plugin-check-copyright": "*"
     },
     "dependencies": {
         "@protobuf-ts/runtime": "^2.9.4",
-        "ws": "^8.18.0",
-        "@types/ws": "^8.5.14"
+        "@types/ws": "^8.5.14",
+        "ws": "^8.18.0"
     },
     "author": "Epic Games",
     "license": "MIT",

Common/src/Messages/base_message.ts

@@ -1,3 +1,4 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
 /**
  * All Pixel Streaming messages should adhere to this interface.
  */

Common/src/Messages/message_helpers.ts

@@ -1,3 +1,4 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
 import { IMessageType } from '@protobuf-ts/runtime';
 import { BaseMessage } from './base_message';
 import { Logger } from '../Logger/Logger';

Common/src/Messages/message_registry.ts

@@ -1,3 +1,4 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
 import { IMessageType } from '@protobuf-ts/runtime';
 import * as Messages from './signalling_messages';
 import { BaseMessage } from './base_message';

Common/src/Protocol/KeepaliveMonitor.ts

@@ -1,3 +1,4 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
 import * as Messages from '../Messages/signalling_messages';
 import * as MessageHelpers from '../Messages/message_helpers';
 import { SignallingProtocol } from './SignallingProtocol';

Common/src/Transport/ITransport.ts

@@ -1,3 +1,4 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
 import { EventEmitter } from '../Event/EventEmitter';
 
 /**

Common/src/pixelstreamingcommon.ts

@@ -1,3 +1,4 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
 export { Logger, LogLevel, ILogger, overrideLogger } from './Logger/Logger';
 export { ITransport } from './Transport/ITransport';
 export { WebSocketTransport } from './Transport/WebSocketTransport';

Extras/JSStreamer/Dockerfile

@@ -4,6 +4,7 @@ FROM node:20-bookworm
 ## Maybe something like: docker build -t epicgames/jsstreamer:latest -f ./Extras/JSStreamer/Dockerfile .
 
 WORKDIR /streamer
+COPY /Extras/eslint/plugin-check-copyright ./Extras/eslint/plugin-check-copyright
 COPY /Common ./Common
 COPY /Extras/JSStreamer ./Extras/JSStreamer
 COPY ./package.json ./package.json

Extras/JSStreamer/eslint.config.mjs

@@ -1,16 +1,14 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
-import eslint from '@eslint/js';
+
 import tseslint from 'typescript-eslint';
 import tsdocPlugin from 'eslint-plugin-tsdoc';
-import prettierPluginRecommended from 'eslint-plugin-prettier/recommended';
+import baseConfig from '../../eslint.config.mjs'
 
 export default tseslint.config(
+    baseConfig,
     {
         ignores: [],
     },
-    eslint.configs.recommended,
-    tseslint.configs.recommendedTypeCheckedOnly,
-    prettierPluginRecommended,
     {
         languageOptions: {
             parser: tseslint.parser,