Mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2026-07-24 02:27:12 +00:00
Code Issues Projects Releases Wiki Activity

refactor(node/utils): finish CJS->ESM (Settings, Minify, ExportEtherpad, ImportEtherpad, ExportHtml, toolbar)

Browse source 
All 26 files in node/utils/ now ESM. Settings.ts CJS shim removed (dead code
under "type": module); plugins doing require() get .default-wrapped namespace
via Node interop, the createRequire bridge in pluginfw will preserve sync
loading once that lands. toolbar.ts's module.exports.availableButtons
self-reference replaced by a module-private toolbar const.

ts-check: 526 -> 539 errors. The +13 is from default-imports landing on
modules that still live in db/ as CJS; resolves once db/ is flipped.
This commit is contained in:
SamTV12345 2026-04-26 13:06:08 +02:00
parent 5c3739f4df
commit 4e6d073213
6 changed files with 58 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/node/utils/ExportHtml.ts
View file

@ -1,6 +1,6 @@
'use strict';
import {AText, PadType} from "../types/PadType";
import {MapArrayType} from "../types/MapType";
import {AText, PadType} from "../types/PadType.js";
import {MapArrayType} from "../types/MapType.js";
/**
* Copyright 2009 Google Inc.
@ -18,18 +18,17 @@ import {MapArrayType} from "../types/MapType";
* limitations under the License.
*/
import {deserializeOps, splitAttributionLines, subattribution} from '../../static/js/Changeset';
const attributes = require('../../static/js/attributes');
const padManager = require('../db/PadManager');
const _ = require('underscore');
const Security = require('../../static/js/security');
const hooks = require('../../static/js/pluginfw/hooks');
const eejs = require('../eejs');
const _analyzeLine = require('./ExportHelper')._analyzeLine;
const _encodeWhitespace = require('./ExportHelper')._encodeWhitespace;
import padutils from "../../static/js/pad_utils";
import {StringIterator} from "../../static/js/StringIterator";
import {StringAssembler} from "../../static/js/StringAssembler";
import {deserializeOps, splitAttributionLines, subattribution} from '../../static/js/Changeset.js';
import * as attributes from '../../static/js/attributes.js';
import padManager from '../db/PadManager.js';
import _ from 'underscore';
import Security from '../../static/js/security.js';
import hooks from '../../static/js/pluginfw/hooks.js';
import eejs from '../eejs/index.js';
import { _analyzeLine, _encodeWhitespace } from './ExportHelper.js';
import padutils from "../../static/js/pad_utils.js";
import {StringIterator} from "../../static/js/StringIterator.js";
import {StringAssembler} from "../../static/js/StringAssembler.js";
const getPadHTML = async (pad: PadType, revNum: string) => {
let atext = pad.atext;
@ -509,7 +508,7 @@ const getHTMLFromAtext = async (pad:PadType, atext: AText, authorColors?: string
return pieces.join('');
};
exports.getPadHTMLDocument = async (padId: string, revNum: string, readOnlyId: number) => {
export const getPadHTMLDocument = async (padId: string, revNum: string, readOnlyId: number) => {
const pad = await padManager.getPad(padId);
// Include some Styles into the Head for Export
@ -587,5 +586,4 @@ const _processSpaces = (s: string) => {
return parts.join('');
};
exports.getPadHTML = getPadHTML;
exports.getHTMLFromAtext = getHTMLFromAtext;
export { getPadHTML, getHTMLFromAtext };