Skip to content

Add typescript support and update package.json #5750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Add typescript support and update package.json #5750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
331cf3d
Added typescript support for most backend files.
SamTV12345 Jun 22, 2023
3c2129b
Rewrote server in typescript.
SamTV12345 Jun 23, 2023
7b99edc
Moved to ts for other dependencies.
SamTV12345 Jun 23, 2023
237f724
Moved to ts for other dependencies.
SamTV12345 Jun 23, 2023
76a6f66
Move all files to esm
SamTV12345 Jun 24, 2023
aa6323e
Fixed startup to "Running npm to get a list of installed plugins"
SamTV12345 Jun 25, 2023
798543f
Server starts up.
SamTV12345 Jun 25, 2023
8926677
Start server without paths.
SamTV12345 Jun 25, 2023
8ddac2d
Added rollup config.
SamTV12345 Jul 4, 2023
9a3b600
Added config for main node package.
SamTV12345 Jul 4, 2023
f6d7939
Split at dist path.
SamTV12345 Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion node_modules/ep_etherpad-lite
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions src/.babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["@babel/preset-env"]
Copy link

@AugustinMauroy AugustinMauroy Jan 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SamTV12345 this file 🤗

Copy link
Member Author

@SamTV12345 SamTV12345 Jan 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the hint. Good question. Now with SWC this shouldn't be needed anymore.

Copy link

@AugustinMauroy AugustinMauroy Jan 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now with SWC this shouldn't be needed anymore.

normally yesss

}
220 changes: 110 additions & 110 deletions src/.eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import "eslint-config-etherpad/patch/modern-module-resolution";
'use strict';

// This is a workaround for https://github.com/eslint/eslint/issues/3458
require('eslint-config-etherpad/patch/modern-module-resolution');

module.exports = {
ignorePatterns: [
export const ignorePatterns = [
'/static/js/admin/jquery.autosize.js',
'/static/js/admin/minify.json.js',
'/static/js/vendors/browser.js',
Expand All @@ -14,128 +10,132 @@ module.exports = {
'/static/js/vendors/jquery.js',
'/static/js/vendors/nice-select.js',
'/tests/frontend/lib/',
],
overrides: [
];
export const overrides = [
{
files: [
'**/.eslintrc.*',
],
extends: 'etherpad/node',
files: [
'**/.eslintrc.*',
],
extends: 'etherpad/node',
},
{
files: [
'**/*',
],
excludedFiles: [
'**/.eslintrc.*',
'tests/frontend/**/*',
],
extends: 'etherpad/node',
files: [
'**/*',
],
excludedFiles: [
'**/.eslintrc.*',
'tests/frontend/**/*',
],
extends: 'etherpad/node',
},
{
files: [
'static/**/*',
'tests/frontend/helper.js',
'tests/frontend/helper/**/*',
],
excludedFiles: [
'**/.eslintrc.*',
],
extends: 'etherpad/browser',
env: {
'shared-node-browser': true,
},
overrides: [
{
files: [
files: [
'static/**/*',
'tests/frontend/helper.js',
'tests/frontend/helper/**/*',
],
globals: {
helper: 'readonly',
},
],
excludedFiles: [
'**/.eslintrc.*',
],
extends: 'etherpad/browser',
env: {
'shared-node-browser': true,
},
],
},
{
files: [
'tests/**/*',
],
excludedFiles: [
'**/.eslintrc.*',
'tests/frontend/cypress/**/*',
'tests/frontend/helper.js',
'tests/frontend/helper/**/*',
'tests/frontend/travis/**/*',
'tests/ratelimit/**/*',
],
extends: 'etherpad/tests',
rules: {
'mocha/no-exports': 'off',
'mocha/no-top-level-hooks': 'off',
},
overrides: [
{
files: [
'tests/frontend/helper/**/*',
],
globals: {
helper: 'readonly',
},
},
],
},
{
files: [
'tests/backend/**/*',
],
excludedFiles: [
'**/.eslintrc.*',
],
extends: 'etherpad/tests/backend',
overrides: [
{
files: [
'tests/backend/**/*',
],
excludedFiles: [
'tests/backend/specs/**/*',
],
rules: {
files: [
'tests/**/*',
],
excludedFiles: [
'**/.eslintrc.*',
'tests/frontend/cypress/**/*',
'tests/frontend/helper.js',
'tests/frontend/helper/**/*',
'tests/frontend/travis/**/*',
'tests/ratelimit/**/*',
],
extends: 'etherpad/tests',
rules: {
'mocha/no-exports': 'off',
'mocha/no-top-level-hooks': 'off',
},
},
],
},
{
files: [
'tests/frontend/**/*',
],
excludedFiles: [
'**/.eslintrc.*',
'tests/frontend/cypress/**/*',
'tests/frontend/helper.js',
'tests/frontend/helper/**/*',
'tests/frontend/travis/**/*',
],
extends: 'etherpad/tests/frontend',
overrides: [
{
files: [
files: [
'tests/backend/**/*',
],
excludedFiles: [
'**/.eslintrc.*',
],
extends: 'etherpad/tests/backend',
overrides: [
{
files: [
'tests/backend/**/*',
],
excludedFiles: [
'tests/backend/specs/**/*',
],
rules: {
'mocha/no-exports': 'off',
'mocha/no-top-level-hooks': 'off',
},
},
],
},
{
files: [
'tests/frontend/**/*',
],
excludedFiles: [
'tests/frontend/specs/**/*',
],
rules: {
'mocha/no-exports': 'off',
'mocha/no-top-level-hooks': 'off',
},
},
],
],
excludedFiles: [
'**/.eslintrc.*',
'tests/frontend/cypress/**/*',
'tests/frontend/helper.js',
'tests/frontend/helper/**/*',
'tests/frontend/travis/**/*',
],
extends: 'etherpad/tests/frontend',
overrides: [
{
files: [
'tests/frontend/**/*',
],
excludedFiles: [
'tests/frontend/specs/**/*',
],
rules: {
'mocha/no-exports': 'off',
'mocha/no-top-level-hooks': 'off',
},
},
],
},
{
files: [
'tests/frontend/cypress/**/*',
],
extends: 'etherpad/tests/cypress',
files: [
'tests/frontend/cypress/**/*',
],
extends: 'etherpad/tests/cypress',
},
{
files: [
'tests/frontend/travis/**/*',
],
extends: 'etherpad/node',
files: [
'tests/frontend/travis/**/*',
],
extends: 'etherpad/node',
},
],
root: true,
];
export const root = true;
export default {
ignorePatterns,
overrides,
root
};
2 changes: 2 additions & 0 deletions src/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dist/
node_modules
Empty file modified src/bin/buildDebian.sh
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/buildForWindows.sh
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/cleanRun.sh
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/createRelease.sh
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/deb-src/DEBIAN/postinst
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/deb-src/DEBIAN/preinst
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/deb-src/DEBIAN/prerm
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/debugRun.sh
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/etherpad-healthcheck
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/fastRun.sh
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/installDeps.sh
100755 → 100644
View file
Open in desktop
Empty file.
Binary file modified src/bin/nsis/brand.ico
View file
Open in desktop
Binary file not shown.
Empty file modified src/bin/plugins/README.md
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/plugins/checkPlugin.js
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/plugins/getCorePlugins.sh
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/plugins/lib/README.md
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/plugins/lib/gitignore
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/plugins/listOfficialPlugins
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/plugins/reTestAllPlugins.sh
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/plugins/updateAllPluginsScript.sh
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/plugins/updateCorePlugins.sh
100755 → 100644
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion src/bin/run.sh
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ src/bin/installDeps.sh "$@" || exit 1
# Move to the node folder and start
log "Starting Etherpad..."

exec node src/node/server.js "$@"
exec node src/dist/node/server.js "$@"
Empty file modified src/bin/safeRun.sh
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified src/bin/updatePlugins.sh
100755 → 100644
View file
Open in desktop
Empty file.
Loading