Merge pull request #560 from mcottontensor/backport/UE5.5/pr-549

mcottontensor · web-flow · commit 73b17289bc06 · 2025-04-03T11:29:54.000+11:00
[UE5.5] Merge pull request #549 from mcottontensor/eslint-plugin-fix
diff --git a/Common/package.json b/Common/package.json
@@ -34,8 +34,7 @@
         "typedoc": "^0.28.0",
         "typedoc-plugin-markdown": "^4.4.2",
         "typescript": "^5.7.3",
-        "typescript-eslint": "^8.24.0",
-        "@epicgames-ps/eslint-plugin-check-copyright": "*"
+        "typescript-eslint": "^8.24.0"
     },
     "dependencies": {
         "@protobuf-ts/runtime": "^2.9.4",
diff --git a/Extras/JSStreamer/Dockerfile b/Extras/JSStreamer/Dockerfile
@@ -4,7 +4,6 @@ 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
diff --git a/Extras/JSStreamer/package.json b/Extras/JSStreamer/package.json
@@ -32,8 +32,7 @@
         "webpack": "^5.97.1",
         "webpack-cli": "^6.0.1",
         "webpack-dev-server": "^5.2.0",
-        "webpack-node-externals": "^3.0.0",
-        "@epicgames-ps/eslint-plugin-check-copyright": "*"
+        "webpack-node-externals": "^3.0.0"
     },
     "dependencies": {
         "@epicgames-ps/lib-pixelstreamingcommon-ue5.5": "*"
diff --git a/Extras/SS_Test/Dockerfile b/Extras/SS_Test/Dockerfile
@@ -6,7 +6,6 @@ COPY NODE_VERSION ./NODE_VERSION
 COPY package.json ./package.json
 COPY Common/ ./Common
 COPY Extras/SS_Test/ ./Extras/SS_Test
-COPY Extras/eslint/plugin-check-copyright ./Extras/eslint/plugin-check-copyright
 
 RUN npm i
 RUN cd Common && npm i && npm run build
diff --git a/Extras/SS_Test/package.json b/Extras/SS_Test/package.json
@@ -22,7 +22,6 @@
         "@types/node": "^20.10.1",
         "@types/ws": "^8.5.10",
         "rimraf": "^5.0.5",
-        "typescript": "^5.3.2",
-        "@epicgames-ps/eslint-plugin-check-copyright": "*"
+        "typescript": "^5.3.2"
     }
 }
diff --git a/Frontend/implementations/react/package.json b/Frontend/implementations/react/package.json
@@ -24,7 +24,6 @@
     },
     "dependencies": {
         "@epicgames-ps/lib-pixelstreamingfrontend-ue5.5": "*",
-        "@epicgames-ps/eslint-plugin-check-copyright": "*",
         "react": "^19.0.0",
         "react-dom": "^19.0.0"
     }
diff --git a/Frontend/implementations/typescript/package.json b/Frontend/implementations/typescript/package.json
@@ -22,7 +22,6 @@
     },
     "dependencies": {
         "@epicgames-ps/lib-pixelstreamingfrontend-ue5.5": "*",
-        "@epicgames-ps/lib-pixelstreamingfrontend-ui-ue5.5": "*",
-        "@epicgames-ps/eslint-plugin-check-copyright": "*"
+        "@epicgames-ps/lib-pixelstreamingfrontend-ui-ue5.5": "*"
     }
 }
diff --git a/Frontend/library/package.json b/Frontend/library/package.json
@@ -29,8 +29,7 @@
         "rimraf": "^6.0.1",
         "ts-jest": "^29.2.5",
         "typescript": "^5.7.3",
-        "typescript-eslint": "^8.24.0",
-        "@epicgames-ps/eslint-plugin-check-copyright": "*"
+        "typescript-eslint": "^8.24.0"
     },
     "dependencies": {
         "@epicgames-ps/lib-pixelstreamingcommon-ue5.5": "^0.2.9",
diff --git a/Frontend/ui-library/package.json b/Frontend/ui-library/package.json
@@ -23,8 +23,7 @@
         "nodemon": "^3.1.9",
         "rimraf": "^6.0.1",
         "typescript": "^5.7.3",
-        "typescript-eslint": "^8.24.0",
-        "@epicgames-ps/eslint-plugin-check-copyright": "*"
+        "typescript-eslint": "^8.24.0"
     },
     "dependencies": {
         "jss": "^10.10.0",
diff --git a/Signalling/package.json b/Signalling/package.json
@@ -31,8 +31,7 @@
         "typedoc": "^0.28.0",
         "typedoc-plugin-markdown": "^4.4.2",
         "typescript": "^5.7.3",
-        "typescript-eslint": "^8.24.0",
-        "@epicgames-ps/eslint-plugin-check-copyright": "*"
+        "typescript-eslint": "^8.24.0"
     },
     "dependencies": {
         "express": "^4.21.2",
diff --git a/SignallingWebServer/Dockerfile b/SignallingWebServer/Dockerfile
@@ -4,7 +4,6 @@ FROM node:lts
 WORKDIR /SignallingWebServer
 COPY NODE_VERSION ./NODE_VERSION
 COPY package.json ./package.json
-COPY /Extras/eslint/plugin-check-copyright ./Extras/eslint/plugin-check-copyright
 COPY /Common ./Common
 COPY /Signalling ./Signalling
 COPY /SignallingWebServer ./SignallingWebServer
diff --git a/SignallingWebServer/package.json b/SignallingWebServer/package.json
@@ -24,8 +24,7 @@
         "eslint-plugin-tsdoc": "^0.4.0",
         "rimraf": "^6.0.1",
         "typescript": "^5.7.3",
-        "typescript-eslint": "^8.24.0",
-        "@epicgames-ps/eslint-plugin-check-copyright": "*"
+        "typescript-eslint": "^8.24.0"
     },
     "dependencies": {
         "@epicgames-ps/lib-pixelstreamingsignalling-ue5.5": "*",
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -3,7 +3,7 @@
 import eslint from '@eslint/js';
 import prettierPluginRecommended from 'eslint-plugin-prettier/recommended';
 import tseslint from 'typescript-eslint';
-import checkCopyrightPlugin from '@epicgames-ps/eslint-plugin-check-copyright'
+import checkCopyrightPlugin from './Extras/eslint/plugin-check-copyright/index.js'
 
 export default tseslint.config(
     eslint.configs.recommended,
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,8 +13,7 @@
         "Extras/FrontendTests",
         "Extras/MinimalStreamTester",
         "Extras/SS_Test",
-        "Extras/mediasoup-sdp-bridge",
-        "Extras/eslint/plugin-check-copyright"
+        "Extras/mediasoup-sdp-bridge"
     ],
     "private": true,
     "scripts": {
@@ -28,7 +27,6 @@
         "pre-commit-lint"
     ],
     "devDependencies": {
-        "@epicgames-ps/eslint-plugin-check-copyright": "*",
         "eslint": "^9.22.0",
         "typescript-eslint": "^8.26.1",
         "lint-staged": "^15.3.0",

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`"@types/node": "^20.10.1",`
`23`	`23`	`"@types/ws": "^8.5.10",`
`24`	`24`	`"rimraf": "^5.0.5",`
`25`		`- "typescript": "^5.3.2",`
`26`		`- "@epicgames-ps/eslint-plugin-check-copyright": "*"`
	`25`	`+ "typescript": "^5.3.2"`
`27`	`26`	`}`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`},`
`25`	`25`	`"dependencies": {`
`26`	`26`	`"@epicgames-ps/lib-pixelstreamingfrontend-ue5.5": "*",`
`27`		`- "@epicgames-ps/eslint-plugin-check-copyright": "*",`
`28`	`27`	`"react": "^19.0.0",`
`29`	`28`	`"react-dom": "^19.0.0"`
`30`	`29`	`}`