Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
* eol=lf
test/* linguist-vendored
lib/* linguist-generated
marked.min.js linguist-generated
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
UnitTests:
strategy:
matrix:
# lowest verison here should also be in `engines` field
node_version: [18, "lts/*", "latest"]
# lowest version here should also be in `engines` field
node_version: [20, "lts/*", "latest"]
runs-on: ubuntu-latest
steps:
- name: Checkout Code
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ lib
docs/LICENSE.md
vuln.js
man/marked.1
marked.min.js
test.js
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ $ marked --help
</head>
<body>
<div id="content"></div>
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/marked/lib/marked.umd.js"></script>
<script>
document.getElementById('content').innerHTML =
marked.parse('# Marked in the browser\n\nRendered by **marked**.');
Expand Down
4 changes: 2 additions & 2 deletions bin/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export async function main(nodeProcess) {
try {
// try require for json
markedConfig = require(configFile);
} catch (err) {
} catch(err) {
if (err.code !== 'ERR_REQUIRE_ESM') {
throw err;
}
Expand Down Expand Up @@ -271,7 +271,7 @@ export async function main(nodeProcess) {
try {
await start(nodeProcess.argv.slice());
nodeProcess.exit(0);
} catch (err) {
} catch(err) {
if (err.code === 'ENOENT') {
nodeProcess.stderr.write('marked: ' + err.path + ': No such file or directory');
} else {
Expand Down
2 changes: 1 addition & 1 deletion docs/INDEX.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ $ marked -s 'line1\nline2' -c config.json
</head>
<body>
<div id="content"></div>
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/marked/lib/marked.umd.js"></script>
<script>
document.getElementById('content').innerHTML =
marked.parse('# Marked in browser\n\nRendered by **marked**.');
Expand Down
2 changes: 1 addition & 1 deletion docs/USING_ADVANCED.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ markedWorker.postMessage(markdownString);
```js
// markedWorker.js

importScripts('path/to/marked.min.js');
importScripts('path/to/marked.umd.js');

onmessage = (e) => {
const markdownString = e.data
Expand Down
13 changes: 10 additions & 3 deletions docs/build.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* global marked */
import '../marked.min.js';
import '../lib/marked.umd.js';
import { promises } from 'fs';
import { join, dirname, parse, format } from 'path';
import { fileURLToPath } from 'url';
Expand Down Expand Up @@ -48,10 +48,17 @@ async function init() {
console.log('Cleaning up output directory ' + outputDir);
await rm(outputDir, { force: true, recursive: true });
await mkdir(outputDir);
await mkdir(join(outputDir, 'lib'));
console.log(`Copying file ${join(inputDir, 'LICENSE.md')}`);
await copyFile(join(cwd, 'LICENSE.md'), join(inputDir, 'LICENSE.md'));
console.log(`Copying file ${join(outputDir, 'marked.min.js')}`);
await copyFile(join(cwd, 'marked.min.js'), join(outputDir, 'marked.min.js'));
console.log(`Copying file ${join(outputDir, 'lib/marked.umd.js')}`);
await copyFile(join(cwd, 'lib/marked.umd.js'), join(outputDir, 'lib/marked.umd.js'));
console.log(`Copying file ${join(outputDir, 'lib/marked.umd.js.map')}`);
await copyFile(join(cwd, 'lib/marked.umd.js.map'), join(outputDir, 'lib/marked.umd.js.map'));
console.log(`Copying file ${join(outputDir, 'lib/marked.esm.js')}`);
await copyFile(join(cwd, 'lib/marked.esm.js'), join(outputDir, 'lib/marked.esm.js'));
console.log(`Copying file ${join(outputDir, 'lib/marked.esm.js.map')}`);
await copyFile(join(cwd, 'lib/marked.esm.js.map'), join(outputDir, 'lib/marked.esm.js.map'));
const tmpl = await readFile(templateFile, 'utf8');
console.log('Building markdown...');
const [original, commonmark, gfm] = await getTests([
Expand Down
1 change: 1 addition & 0 deletions docs/demo/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ function loadVersion(ver) {
} else {
promise = import(ver + '/lib/marked.esm.js')
.catch(fetchMarked(ver + '/marked.min.js'))
.catch(fetchMarked(ver + '/lib/marked.umd.js'))
.catch(fetchMarked(ver + '/lib/marked.js'))
.then((marked) => {
if (!marked) {
Expand Down
14 changes: 1 addition & 13 deletions esbuild.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function config(options) {
},
sourcemap: true,
bundle: true,
minify: false,
minify: true,
...(options.format === 'umd'
? {
plugins: [umdWrapper({
Expand All @@ -43,19 +43,7 @@ await esbuild.build(config({
outfile: 'lib/marked.esm.js',
}));

await esbuild.build(config({
format: 'cjs',
outfile: 'lib/marked.cjs',
}));

await esbuild.build(config({
format: 'umd',
outfile: 'lib/marked.umd.js',
}));

await esbuild.build(config({
sourcemap: false,
minify: true,
format: 'umd',
outfile: 'marked.min.js',
}));
2 changes: 1 addition & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import markedEslintConfig from '@markedjs/eslint-config';

export default [
{
ignores: ['**/lib', '**/*.min.js', '**/public'],
ignores: ['**/lib', '**/public'],
},
...markedEslintConfig,
];
Loading