fix: Converted the last require() to import.

nrkno · Mar 2, 2022 · 1879b7d · 1879b7d
1 parent 3b39ae6
commit 1879b7d
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 4,827 deletions.
diff --git a/client/tsconfig.json b/client/tsconfig.json
@@ -1,28 +1,27 @@
-{
-  "compilerOptions": {
-      // Target latest version of ECMAScript.
-      "target": "esnext",
-      // Search under node_modules for non-relative imports.
-      "moduleResolution": "node",
-      // Process & infer types from .js files.
-      "allowJs": false,
-      // Don't emit; allow Babel to transform files.
-      "noEmit": false,
-      // Enable strictest settings like strictNullChecks & noImplicitAny.
-      "strict": false,
-      // Disallow features that require cross-file information for emit.
-      "isolatedModules": false,
-      // Import non-ES modules as default imports.
-      "esModuleInterop": true,
-      //Support for jsx.
-      "jsx": "react",
-      // Check for "any" while converting to TS this can be turned off.
-      "noImplicitAny": true,
-      "module": "commonjs",
-      "resolveJsonModule": true,
-      "allowSyntheticDefaultImports": true,
-      "outDir": "../dist"
-  },
-  "include": ["../client", "../shared"],
-  "exclude": ["../**/node_modules/*", "../**/dist", "../**/*.spec.ts"]
-}
+{
+    "compilerOptions": {
+        "target": "esnext",
+        // Search under node_modules for non-relative imports.
+        "moduleResolution": "node",
+        // Process & infer types from .js files.
+        "allowJs": false,
+        // Don't emit; allow Babel to transform files.
+        "noEmit": false,
+        // Enable strictest settings like strictNullChecks & noImplicitAny.
+        "strict": false,
+        // Disallow features that require cross-file information for emit.
+        "isolatedModules": false,
+        // Import non-ES modules as default imports.
+        "esModuleInterop": true,
+        //Support for jsx.
+        "jsx": "react",
+        // Check for "any" while converting to TS this can be turned off.
+        "noImplicitAny": true,
+        "module": "commonjs",
+        "resolveJsonModule": true,
+        "allowSyntheticDefaultImports": true,
+        "outDir": "../dist"
+    },
+    "include": ["../client", "../shared"],
+    "exclude": ["../**/node_modules/*", "../**/dist", "../**/*.spec.ts"]
+}
diff --git a/server/__tests__/channelReducer.spec.ts b/server/__tests__/channelReducer.spec.ts
@@ -5,11 +5,15 @@ import {
     storeSetCompleteChState,
     storeSetOutputLevel,
 } from '../../shared/src/actions/channelActions'
-import { IChannel, InumberOfChannels } from '../../shared/src/reducers/channelsReducer'
+import {
+    IChannel,
+    InumberOfChannels,
+} from '../../shared/src/reducers/channelsReducer'
 
-let fs = require('fs')
+import fs from 'fs'
 const parsedFullStoreJSON = fs.readFileSync(
-    '__tests__/__mocks__/parsedFullStore.json'
+    '__tests__/__mocks__/parsedFullStore.json',
+    'utf-8'
 )
 
 describe('Test redux channelReducer actions', () => {

diff --git a/server/__tests__/faderReducer.spec.ts b/server/__tests__/faderReducer.spec.ts
@@ -22,12 +22,14 @@ import {
     storeXmix,
 } from '../../shared/src/actions/faderActions'
 
-let fs = require('fs')
+import fs from 'fs'
 const parsedSimpleStoreJSON = fs.readFileSync(
-    '__tests__/__mocks__/parsedSimpleStore.json'
+    '__tests__/__mocks__/parsedSimpleStore.json',
+    'utf-8'
 )
 const parsedFullStoreJSON = fs.readFileSync(
-    '__tests__/__mocks__/parsedFullStore.json'
+    '__tests__/__mocks__/parsedFullStore.json',
+    'utf-8'
 )
 
 describe('Test redux faderReducers actions', () => {

diff --git a/server/__tests__/indexReducer.spec.ts b/server/__tests__/indexReducer.spec.ts
@@ -1,8 +1,9 @@
 import indexReducer from '../../shared/src/reducers/indexReducer'
 
-let fs = require('fs')
+import fs from 'fs'
 const parsedEmptyStoreJSON = fs.readFileSync(
-    '__tests__/__mocks__/parsedEmptyStore.json'
+    '__tests__/__mocks__/parsedEmptyStore.json',
+    'utf-8'
 )
 
 describe('Test initialize store', () => {

diff --git a/server/__tests__/settingsReducer.spec.ts b/server/__tests__/settingsReducer.spec.ts
@@ -7,9 +7,10 @@ import {
     UPDATE_SETTINGS,
 } from '../../shared/src/actions/settingsActions'
 
-let fs = require('fs')
+import fs from 'fs'
 const parsedFullStoreJSON = fs.readFileSync(
-    '__tests__/__mocks__/parsedFullStore.json'
+    '__tests__/__mocks__/parsedFullStore.json',
+    'utf-8'
 )
 
 describe('Test redux settingsReducer actions', () => {

diff --git a/server/package.json b/server/package.json
@@ -1,42 +1,41 @@
-{
-  "name": "server",
-  "version": "0.0.0",
-  "license": "MIT",
-  "scripts": {
-    "build": "tsc",
-    "watch": "tsc --watch",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "lint": ""
-  },
-  "devDependencies": {
-    "@types/express": "^4.17.13",
-    "@types/jest": "^26.0.20",
-    "@types/node": "^14.14.35",
-    "@types/redux": "^3.6.0",
-    "jest": "^26.6.3",
-    "typescript": "^4.5.5"
-  },
-  "dependencies": {
-    "@babel/core": "^7.13.10",
-    "@tv2media/logger": "^1.2.2",
-    "@types/socket.io": "^3.0.2",
-    "@types/webmidi": "^2.0.6",
-    "casparcg-connection": "^5.1.0",
-    "emberplus-connection": "^0.0.4",
-    "express": "^4.17.1",
-    "express-csp-header": "^4.0.0",
-    "node-emberplus": "https://github.com/olzzon/node-emberplus#feat/export-ber",
-    "node-vmix": "^1.6.0",
-    "osc": "^2.4.2",
-    "performance-now": "^2.1.0",
-    "redux": "^4.1.2",
-    "shared": "^0.0.0",
-    "socket.io": "^4.4.1",
-    "ts-jest": "^26.5.3",
-    "vmix-js-utils": "^4.0.7",
-    "web-midi-api": "^2.0.8",
-    "webmidi": "^2.5.2"
-  },
-  "peerDependencies": {}
-}
+{
+    "name": "server",
+    "version": "0.0.0",
+    "license": "MIT",
+    "scripts": {
+        "build": "tsc",
+        "watch": "tsc --watch",
+        "test": "jest",
+        "test:watch": "jest --watch",
+        "lint": ""
+    },
+    "devDependencies": {
+        "@types/express": "^4.17.13",
+        "@types/jest": "^26.0.20",
+        "@types/node": "^14.14.35",
+        "@types/redux": "^3.6.0",
+        "jest": "^26.6.3",
+        "typescript": "^4.5.5"
+    },
+    "dependencies": {
+        "@babel/core": "^7.13.10",
+        "@tv2media/logger": "^1.2.2",
+        "@types/socket.io": "^3.0.2",
+        "@types/webmidi": "^2.0.6",
+        "casparcg-connection": "^5.1.0",
+        "emberplus-connection": "^0.0.4",
+        "express": "^4.17.1",
+        "node-emberplus": "https://github.com/olzzon/node-emberplus#feat/export-ber",
+        "node-vmix": "^1.6.0",
+        "osc": "^2.4.2",
+        "performance-now": "^2.1.0",
+        "redux": "^4.1.2",
+        "shared": "^0.0.0",
+        "socket.io": "^4.4.1",
+        "ts-jest": "^26.5.3",
+        "vmix-js-utils": "^4.0.7",
+        "web-midi-api": "^2.0.8",
+        "webmidi": "^2.5.2"
+    },
+    "peerDependencies": {}
+}
diff --git a/server/tsconfig.json b/server/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
-        "target": "ESNEXT",
-        "lib": ["ESNEXT", "dom"],
+        "target": "esnext",
+        "lib": ["esnext", "dom"],
         "moduleResolution": "node",
         "allowJs": false,
         "strict": false,