Added rollup config.

src/node/db/DB.ts

@@ -21,7 +21,7 @@
  * limitations under the License.
  */
 
-import ueberDB from 'ueberdb2';
+import {Database} from 'ueberdb2';
 import {dbSettings, dbType} from '../utils/Settings';
 import log4js from 'log4js';
 import {shutdown as statsShutdown,createCollection} from '../stats';
@@ -37,7 +37,7 @@ let db = null;
  * Initializes the database with the settings provided by the settings module
  */
 const init = async () => {
-  db = new ueberDB.Database(dbType, dbSettings, null, logger);
+  db = new Database(dbType, dbSettings, null, logger);
   await db.init();
   if (db.metrics != null) {
     for (const [metric, value] of Object.entries(db.metrics)) {

src/node/server.ts

@@ -34,6 +34,12 @@ import {checkDeprecationStatus, enforceMinNodeVersion} from './utils/NodeVersion
 import {Gate} from './utils/promises';
 import * as UpdateCheck from "./utils/UpdateCheck";
 import {Plugin} from "./models/Plugin";
+import {db} from './db/DB'
+import {createServer, server} from './hooks/express';
+import {aCallAll} from '../static/js/pluginfw/hooks'
+import * as pluginDefs from '../static/js/pluginfw/plugin_defs'
+import * as plugins from "../static/js/pluginfw/plugins";
+import {createCollection} from "./stats";
 
 let wtfnode;
 if (settings.dumpOnUncleanExit) {
@@ -45,13 +51,6 @@ if (settings.dumpOnUncleanExit) {
 enforceMinNodeVersion('12.17.0');
 checkDeprecationStatus('12.17.0', '1.9.0');
 
-import db = require('./db/DB');
-import {} from './db/DB'
-import {createServer, server} from './hooks/express';
-import hooks = require('../static/js/pluginfw/hooks');
-import pluginDefs = require('../static/js/pluginfw/plugin_defs');
-import plugins = require('../static/js/pluginfw/plugins');
-import {createCollection} from "./stats";
 const logger = log4js.getLogger('server');
 console.log = logger.info.bind(logger); // do the same for others - console.debug, etc.
 
@@ -149,8 +148,8 @@ export const start = async () => {
     logger.info(`Installed plugins: ${installedPlugins}`);
     logger.debug(`Installed parts:\n${plugins.formatParts()}`);
     logger.debug(`Installed server-side hooks:\n${plugins.formatHooks('hooks', false)}`);
-    await hooks.aCallAll('loadSettings', {settings});
-    await hooks.aCallAll(createServer());
+    await aCallAll('loadSettings', {settings});
+    await aCallAll(createServer());
   } catch (err) {
     logger.error('Error occurred while starting Etherpad');
     state = State.STATE_TRANSITION_FAILED;
@@ -191,7 +190,7 @@ export const stop = async () => {
   try {
     let timeout = null;
     await Promise.race([
-      hooks.aCallAll('shutdown'),
+      aCallAll('shutdown'),
       new Promise((resolve, reject) => {
         timeout = setTimeout(() => reject(new Error('Timed out waiting for shutdown tasks')), 3000);
       }),

src/node/utils/Settings.ts

@@ -30,7 +30,7 @@
 import exp from "constants";
 // FIXME Is there a better way to enter dynamic package.json path
 // @ts-ignore
-import packageJSON from '../../../package.json'
+import packageJSON from '../../package.json'
 import {findEtherpadRoot, makeAbsolute, isSubdir} from './AbsolutePaths';
 import deepEqual from 'fast-deep-equal/es6';
 import fs from 'fs';

src/node/utils/run_cmd.ts

@@ -145,7 +145,9 @@ const run_cmd = (args, opts:RunOpts = {
 
   let px;
   const p = new Promise<string>((resolve, reject) => { px = {resolve, reject}; });
+  // @ts-ignore
   [, p.stdout, p.stderr] = streams;
+  // @ts-ignore
   p.child = proc;
 
   const stdioStringPromises = [undefined, Promise.resolve(), Promise.resolve()];

src/package.json

@@ -30,6 +30,7 @@
     }
   ],
   "dependencies": {
+    "@rollup/plugin-json": "^6.0.0",
     "async": "^3.2.2",
     "cjstoesm": "^2.1.2",
     "clean-css": "^5.3.2",
@@ -104,7 +105,9 @@
     "sinon": "^13.0.2",
     "split-grid": "^1.0.11",
     "supertest": "^6.3.3",
-    "typescript": "^4.9.5"
+    "typescript": "^4.9.5",
+    "rollup-plugin-typescript2": "^0.35.0",
+    "rollup-plugin-copy": "^3.4.0"
   },
   "engines": {
     "node": ">=14.15.0",
@@ -118,7 +121,8 @@
     "lint": "eslint .",
     "test": "mocha --require @babel/register --timeout 120000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs",
     "test-container": "mocha --timeout 5000 tests/container/specs/api",
-    "dev": "concurrently \"npx tsc --watch\" \"nodemon -q dist/server.js\""
+    "dev": "concurrently \"npx tsc --watch\" \"nodemon -q dist/server.js\"",
+    "build": "npx rollup -c rollup.config.js"
   },
   "version": "1.9.0",
   "license": "Apache-2.0"

src/rollup.config.js

@@ -0,0 +1,28 @@
+const typescript = require('rollup-plugin-typescript2');
+const copy = require('rollup-plugin-copy');
+const glob = require('glob');
+const json = require('@rollup/plugin-json')
+module.exports = {
+    input: glob.sync('./node/**/*.ts'), // Matches all TypeScript files in the 'src' directory and its subdirectories
+    output: {
+        preserveModules: true,
+        dir: './dist',
+        format: 'cjs',
+    },
+    plugins: [
+        json(),
+        typescript({
+            tsconfig: 'tsconfig.json',
+        }),
+        copy({
+            targets: [
+                {src:'./package.json', dest:'./dist'},
+                { src: './LICENSE', dest: './dist' },
+                { src: './src/locales/*', dest: './dist/locales' },
+                { src: './src/static/css/*', dest: './dist/static/css' },
+                { src: './src/templates', dest: './dist/templates' },
+                {src:'./ep.json', dest:'./dist'},
+            ]
+        })
+    ],
+};

src/tsconfig.json

@@ -4,12 +4,13 @@
     "allowJs": true,
     "typeRoots": ["node_modules/@types"],
     "types": ["node", "jquery"],
-    "module": "commonjs",
+    "module": "esnext",
     "esModuleInterop": true,
     "moduleResolution": "node",
     "sourceMap": true,
     "target": "ES2015",
     "outDir": "dist"
   },
+  "exclude": ["node_modules"],
   "lib": ["es2015"]
 }