Fixed npm installation and moved to types folder.

.github/workflows/windows.yml

@@ -116,6 +116,8 @@ jobs:
       -
         name: Install Cypress
         run: cd etherpad && cd src && npm install cypress --legacy-peer-deps
+      - name: Install npm@6
+        run: npm install npm@6 -g
       -
         name: Run Etherpad
         run: |

src/node/security/SecretRotator.ts

@@ -1,7 +1,7 @@
 'use strict';
 
-import {DeriveModel} from "../models/DeriveModel";
+import {DeriveModel} from "../types/DeriveModel";
-import {LegacyParams} from "../models/LegacyParams";
+import {LegacyParams} from "../types/LegacyParams";
 
 const {Buffer} = require('buffer');
 const crypto = require('./crypto');

src/node/server.ts

@@ -24,8 +24,8 @@
  * limitations under the License.
  */
 
-import {PluginType} from "./models/Plugin";
+import {PluginType} from "./types/Plugin";
-import {ErrorCaused} from "./models/ErrorCaused";
+import {ErrorCaused} from "./types/ErrorCaused";
 import {PromiseHooks} from "node:v8";
 
 const log4js = require('log4js');

src/node/utils/Abiword.ts

@@ -20,7 +20,7 @@
  */
 
 import {ChildProcess} from "node:child_process";
-import {AsyncQueueTask} from "../models/AsyncQueueTask";
+import {AsyncQueueTask} from "../types/AsyncQueueTask";
 
 const spawn = require('child_process').spawn;
 const async = require('async');

src/node/utils/ExportTxt.ts

@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-import {AText, PadType} from "../models/PadType";
+import {AText, PadType} from "../types/PadType";
-import {MapType} from "../models/MapType";
+import {MapType} from "../types/MapType";
 
 const Changeset = require('../../static/js/Changeset');
 const attributes = require('../../static/js/attributes');

src/node/utils/run_cmd.ts

@@ -1,8 +1,8 @@
 'use strict';
 
-import {ErrorExtended, RunCMDOptions, RunCMDPromise} from "../models/RunCMDOptions";
+import {ErrorExtended, RunCMDOptions, RunCMDPromise} from "../types/RunCMDOptions";
 import {ChildProcess} from "node:child_process";
-import {PromiseWithStd} from "../models/PromiseWithStd";
+import {PromiseWithStd} from "../types/PromiseWithStd";
 import {Readable} from "node:stream";
 
 const spawn = require('cross-spawn');