mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-01-31 19:02:59 +01:00
Fixed.
This commit is contained in:
parent
3435e8cfb9
commit
dd32be50a8
5 changed files with 15 additions and 6 deletions
4
.github/workflows/backend-tests.yml
vendored
4
.github/workflows/backend-tests.yml
vendored
|
@ -18,7 +18,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
node: [1.0.3, canary]
|
node: [1.0.23, canary]
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Checkout repository
|
name: Checkout repository
|
||||||
|
@ -51,7 +51,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
node: [1.0.3, canary]
|
node: [1.0.23, canary]
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Checkout repository
|
name: Checkout repository
|
||||||
|
|
2
.github/workflows/frontend-admin-tests.yml
vendored
2
.github/workflows/frontend-admin-tests.yml
vendored
|
@ -16,7 +16,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
node: [1.0.3, canary]
|
node: [1.0.23, canary]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
|
|
|
@ -18,7 +18,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
node: [1.0.3, canary]
|
node: [1.0.23, canary]
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Check out latest release
|
name: Check out latest release
|
||||||
|
|
BIN
src/bun.lockb
BIN
src/bun.lockb
Binary file not shown.
|
@ -25,11 +25,11 @@ const settings = require('./Settings');
|
||||||
const fs = require('fs').promises;
|
const fs = require('fs').promises;
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const plugins = require('../../static/js/pluginfw/plugin_defs');
|
const plugins = require('../../static/js/pluginfw/plugin_defs');
|
||||||
const RequireKernel = require('etherpad-require-kernel');
|
|
||||||
const mime = require('mime-types');
|
const mime = require('mime-types');
|
||||||
const Threads = require('threads');
|
const Threads = require('threads');
|
||||||
const log4js = require('log4js');
|
const log4js = require('log4js');
|
||||||
const sanitizePathname = require('./sanitizePathname');
|
const sanitizePathname = require('./sanitizePathname');
|
||||||
|
const pathutil = require("path");
|
||||||
|
|
||||||
const logger = log4js.getLogger('Minify');
|
const logger = log4js.getLogger('Minify');
|
||||||
|
|
||||||
|
@ -267,7 +267,16 @@ const lastModifiedDateOfEverything = async () => {
|
||||||
// This should be provided by the module, but until then, just use startup
|
// This should be provided by the module, but until then, just use startup
|
||||||
// time.
|
// time.
|
||||||
const _requireLastModified = new Date();
|
const _requireLastModified = new Date();
|
||||||
const requireDefinition = () => `var require = ${RequireKernel.kernelSource};\n`;
|
const requireDefinition = () => {
|
||||||
|
const pathutil = require('path');
|
||||||
|
const kernelPath = pathutil.join(__dirname, 'kernel.js');
|
||||||
|
const fs = require('fs');
|
||||||
|
|
||||||
|
const kernel = fs.readFileSync(kernelPath, 'utf8');
|
||||||
|
const instruction = `var require = ${kernel};\n`;
|
||||||
|
console.log(instruction)
|
||||||
|
return instruction
|
||||||
|
}
|
||||||
|
|
||||||
const getFileCompressed = async (filename, contentType) => {
|
const getFileCompressed = async (filename, contentType) => {
|
||||||
let content = await getFile(filename);
|
let content = await getFile(filename);
|
||||||
|
|
Loading…
Reference in a new issue