From 3a4992633ee62d5edfbb484d9c6bcb3cf158489d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 31 Jul 2023 14:34:36 +0200 Subject: Migrate server to ESM Sorry for the very big commit that may lead to git log issues and merge conflicts, but it's a major step forward: * Server can be faster at startup because imports() are async and we can easily lazy import big modules * Angular doesn't seem to support ES import (with .js extension), so we had to correctly organize peertube into a monorepo: * Use yarn workspace feature * Use typescript reference projects for dependencies * Shared projects have been moved into "packages", each one is now a node module (with a dedicated package.json/tsconfig.json) * server/tools have been moved into apps/ and is now a dedicated app bundled and published on NPM so users don't have to build peertube cli tools manually * server/tests have been moved into packages/ so we don't compile them every time we want to run the server * Use isolatedModule option: * Had to move from const enum to const (https://www.typescriptlang.org/docs/handbook/enums.html#objects-vs-enums) * Had to explictely specify "type" imports when used in decorators * Prefer tsx (that uses esbuild under the hood) instead of ts-node to load typescript files (tests with mocha or scripts): * To reduce test complexity as esbuild doesn't support decorator metadata, we only test server files that do not import server models * We still build tests files into js files for a faster CI * Remove unmaintained peertube CLI import script * Removed some barrels to speed up execution (less imports) --- .../fixtures/peertube-plugin-test-six/main.js | 46 ---------------------- .../fixtures/peertube-plugin-test-six/package.json | 20 ---------- 2 files changed, 66 deletions(-) delete mode 100644 server/tests/fixtures/peertube-plugin-test-six/main.js delete mode 100644 server/tests/fixtures/peertube-plugin-test-six/package.json (limited to 'server/tests/fixtures/peertube-plugin-test-six') diff --git a/server/tests/fixtures/peertube-plugin-test-six/main.js b/server/tests/fixtures/peertube-plugin-test-six/main.js deleted file mode 100644 index 243b041e7..000000000 --- a/server/tests/fixtures/peertube-plugin-test-six/main.js +++ /dev/null @@ -1,46 +0,0 @@ -const fs = require('fs') -const path = require('path') - -async function register ({ - storageManager, - peertubeHelpers, - getRouter -}) { - const { logger } = peertubeHelpers - - { - await storageManager.storeData('superkey', { value: 'toto' }) - await storageManager.storeData('anotherkey', { value: 'toto2' }) - await storageManager.storeData('storedArrayKey', ['toto', 'toto2']) - - const result = await storageManager.getData('superkey') - logger.info('superkey stored value is %s', result.value) - - const storedArrayValue = await storageManager.getData('storedArrayKey') - logger.info('storedArrayKey isArray is %s', Array.isArray(storedArrayValue) ? 'true' : 'false') - logger.info('storedArrayKey stored value is %s', storedArrayValue.join(', ')) - } - - { - getRouter().get('/create-file', async (req, res) => { - const basePath = peertubeHelpers.plugin.getDataDirectoryPath() - - fs.writeFile(path.join(basePath, 'Aladdin.txt'), 'Prince Ali', function (err) { - if (err) return res.sendStatus(500) - - res.sendStatus(200) - }) - }) - } -} - -async function unregister () { - return -} - -module.exports = { - register, - unregister -} - -// ########################################################################### diff --git a/server/tests/fixtures/peertube-plugin-test-six/package.json b/server/tests/fixtures/peertube-plugin-test-six/package.json deleted file mode 100644 index 8c97826b0..000000000 --- a/server/tests/fixtures/peertube-plugin-test-six/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "peertube-plugin-test-six", - "version": "0.0.1", - "description": "Plugin test 6", - "engine": { - "peertube": ">=1.3.0" - }, - "keywords": [ - "peertube", - "plugin" - ], - "homepage": "https://github.com/Chocobozzz/PeerTube", - "author": "Chocobozzz", - "bugs": "https://github.com/Chocobozzz/PeerTube/issues", - "library": "./main.js", - "staticDirs": {}, - "css": [], - "clientScripts": [], - "translations": {} -} -- cgit v1.2.3