codewalker/marked
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Fix: use named exports only for ESM build (#2226)

Browse Source
This commit is contained in:
Ben McCann 2021-10-07 06:07:13 -07:00 committed by GitHub
parent 3306813f39
commit 223e61dbdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 124 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
lib/marked.esm.js
View File

@ -9,7 +9,7 @@
* The code in this file is generated from files in ./src/ * The code in this file is generated from files in ./src/
*/ */
var marked$1 = {exports: {}}; var esmEntry$1 = {exports: {}};
var defaults$5 = {exports: {}}; var defaults$5 = {exports: {}};
@ -1360,7 +1360,7 @@ var rules = {
inline: inline$1 inline: inline$1
}; };
const Tokenizer$1 = Tokenizer_1$1; const Tokenizer$2 = Tokenizer_1$1;
const { defaults: defaults$3 } = defaults$5.exports; const { defaults: defaults$3 } = defaults$5.exports;
const { block, inline } = rules; const { block, inline } = rules;
const { repeatString } = helpers; const { repeatString } = helpers;
@ -1414,7 +1414,7 @@ var Lexer_1$1 = class Lexer {
this.tokens = []; this.tokens = [];
this.tokens.links = Object.create(null); this.tokens.links = Object.create(null);
this.options = options || defaults$3; this.options = options || defaults$3;
this.options.tokenizer = this.options.tokenizer || new Tokenizer$1(); this.options.tokenizer = this.options.tokenizer || new Tokenizer$2();
this.tokenizer = this.options.tokenizer; this.tokenizer = this.options.tokenizer;
this.tokenizer.options = this.options; this.tokenizer.options = this.options;
this.tokenizer.lexer = this; this.tokenizer.lexer = this;
@ -2114,9 +2114,9 @@ var Slugger_1$1 = class Slugger {
} }
}; };
const Renderer$1 = Renderer_1$1; const Renderer$2 = Renderer_1$1;
const TextRenderer$1 = TextRenderer_1$1; const TextRenderer$2 = TextRenderer_1$1;
const Slugger$1 = Slugger_1$1; const Slugger$2 = Slugger_1$1;
const { defaults: defaults$1 } = defaults$5.exports; const { defaults: defaults$1 } = defaults$5.exports;
const { const {
unescape unescape
@ -2128,11 +2128,11 @@ const {
var Parser_1$1 = class Parser { var Parser_1$1 = class Parser {
constructor(options) { constructor(options) {
this.options = options || defaults$1; this.options = options || defaults$1;
this.options.renderer = this.options.renderer || new Renderer$1(); this.options.renderer = this.options.renderer || new Renderer$2();
this.renderer = this.options.renderer; this.renderer = this.options.renderer;
this.renderer.options = this.options; this.renderer.options = this.options;
this.textRenderer = new TextRenderer$1(); this.textRenderer = new TextRenderer$2();
this.slugger = new Slugger$1(); this.slugger = new Slugger$2();
} }
/** /**
@ -2401,12 +2401,12 @@ var Parser_1$1 = class Parser {
} }
}; };
const Lexer = Lexer_1$1; const Lexer$1 = Lexer_1$1;
const Parser = Parser_1$1; const Parser$1 = Parser_1$1;
const Tokenizer = Tokenizer_1$1; const Tokenizer$1 = Tokenizer_1$1;
const Renderer = Renderer_1$1; const Renderer$1 = Renderer_1$1;
const TextRenderer = TextRenderer_1$1; const TextRenderer$1 = TextRenderer_1$1;
const Slugger = Slugger_1$1; const Slugger$1 = Slugger_1$1;
const { const {
merge, merge,
checkSanitizeDeprecation, checkSanitizeDeprecation,
@ -2421,7 +2421,7 @@ const {
/** /**
* Marked * Marked
*/ */
function marked(src, opt, callback) { function marked$1(src, opt, callback) {
// throw error in case of non string input // throw error in case of non string input
if (typeof src === 'undefined' || src === null) { if (typeof src === 'undefined' || src === null) {
throw new Error('marked(): input parameter is undefined or null'); throw new Error('marked(): input parameter is undefined or null');
@ -2436,7 +2436,7 @@ function marked(src, opt, callback) {
opt = null; opt = null;
} }
opt = merge({}, marked.defaults, opt || {}); opt = merge({}, marked$1.defaults, opt || {});
checkSanitizeDeprecation(opt); checkSanitizeDeprecation(opt);
if (callback) { if (callback) {
@ -2444,7 +2444,7 @@ function marked(src, opt, callback) {
let tokens; let tokens;
try { try {
tokens = Lexer.lex(src, opt); tokens = Lexer$1.lex(src, opt);
} catch (e) { } catch (e) {
return callback(e); return callback(e);
} }
@ -2455,9 +2455,9 @@ function marked(src, opt, callback) {
if (!err) { if (!err) {
try { try {
if (opt.walkTokens) { if (opt.walkTokens) {
marked.walkTokens(tokens, opt.walkTokens); marked$1.walkTokens(tokens, opt.walkTokens);
} }
out = Parser.parse(tokens, opt); out = Parser$1.parse(tokens, opt);
} catch (e) { } catch (e) {
err = e; err = e;
} }
@ -2479,7 +2479,7 @@ function marked(src, opt, callback) {
if (!tokens.length) return done(); if (!tokens.length) return done();
let pending = 0; let pending = 0;
marked.walkTokens(tokens, function(token) { marked$1.walkTokens(tokens, function(token) {
if (token.type === 'code') { if (token.type === 'code') {
pending++; pending++;
setTimeout(() => { setTimeout(() => {
@ -2509,11 +2509,11 @@ function marked(src, opt, callback) {
} }
try { try {
const tokens = Lexer.lex(src, opt); const tokens = Lexer$1.lex(src, opt);
if (opt.walkTokens) { if (opt.walkTokens) {
marked.walkTokens(tokens, opt.walkTokens); marked$1.walkTokens(tokens, opt.walkTokens);
} }
return Parser.parse(tokens, opt); return Parser$1.parse(tokens, opt);
} catch (e) { } catch (e) {
e.message += '\nPlease report this to https://github.com/markedjs/marked.'; e.message += '\nPlease report this to https://github.com/markedjs/marked.';
if (opt.silent) { if (opt.silent) {
@ -2529,24 +2529,24 @@ function marked(src, opt, callback) {
* Options * Options
*/ */
marked.options = marked$1.options =
marked.setOptions = function(opt) { marked$1.setOptions = function(opt) {
merge(marked.defaults, opt); merge(marked$1.defaults, opt);
changeDefaults(marked.defaults); changeDefaults(marked$1.defaults);
return marked; return marked$1;
}; };
marked.getDefaults = getDefaults; marked$1.getDefaults = getDefaults;
marked.defaults = defaults; marked$1.defaults = defaults;
/** /**
* Use Extension * Use Extension
*/ */
marked.use = function(...args) { marked$1.use = function(...args) {
const opts = merge({}, ...args); const opts = merge({}, ...args);
const extensions = marked.defaults.extensions || { renderers: {}, childTokens: {} }; const extensions = marked$1.defaults.extensions || { renderers: {}, childTokens: {} };
let hasExtensions; let hasExtensions;
args.forEach((pack) => { args.forEach((pack) => {
@ -2605,7 +2605,7 @@ marked.use = function(...args) {
// ==-- Parse "overwrite" extensions --== // // ==-- Parse "overwrite" extensions --== //
if (pack.renderer) { if (pack.renderer) {
const renderer = marked.defaults.renderer || new Renderer(); const renderer = marked$1.defaults.renderer || new Renderer$1();
for (const prop in pack.renderer) { for (const prop in pack.renderer) {
const prevRenderer = renderer[prop]; const prevRenderer = renderer[prop];
// Replace renderer with func to run extension, but fall back if false // Replace renderer with func to run extension, but fall back if false
@ -2620,7 +2620,7 @@ marked.use = function(...args) {
opts.renderer = renderer; opts.renderer = renderer;
} }
if (pack.tokenizer) { if (pack.tokenizer) {
const tokenizer = marked.defaults.tokenizer || new Tokenizer(); const tokenizer = marked$1.defaults.tokenizer || new Tokenizer$1();
for (const prop in pack.tokenizer) { for (const prop in pack.tokenizer) {
const prevTokenizer = tokenizer[prop]; const prevTokenizer = tokenizer[prop];
// Replace tokenizer with func to run extension, but fall back if false // Replace tokenizer with func to run extension, but fall back if false
@ -2637,7 +2637,7 @@ marked.use = function(...args) {
// ==-- Parse WalkTokens extensions --== // // ==-- Parse WalkTokens extensions --== //
if (pack.walkTokens) { if (pack.walkTokens) {
const walkTokens = marked.defaults.walkTokens; const walkTokens = marked$1.defaults.walkTokens;
opts.walkTokens = (token) => { opts.walkTokens = (token) => {
pack.walkTokens.call(this, token); pack.walkTokens.call(this, token);
if (walkTokens) { if (walkTokens) {
@ -2650,7 +2650,7 @@ marked.use = function(...args) {
opts.extensions = extensions; opts.extensions = extensions;
} }
marked.setOptions(opts); marked$1.setOptions(opts);
}); });
}; };
@ -2658,32 +2658,32 @@ marked.use = function(...args) {
* Run callback for every token * Run callback for every token
*/ */
marked.walkTokens = function(tokens, callback) { marked$1.walkTokens = function(tokens, callback) {
for (const token of tokens) { for (const token of tokens) {
callback(token); callback(token);
switch (token.type) { switch (token.type) {
case 'table': { case 'table': {
for (const cell of token.header) { for (const cell of token.header) {
marked.walkTokens(cell.tokens, callback); marked$1.walkTokens(cell.tokens, callback);
} }
for (const row of token.rows) { for (const row of token.rows) {
for (const cell of row) { for (const cell of row) {
marked.walkTokens(cell.tokens, callback); marked$1.walkTokens(cell.tokens, callback);
} }
} }
break; break;
} }
case 'list': { case 'list': {
marked.walkTokens(token.items, callback); marked$1.walkTokens(token.items, callback);
break; break;
} }
default: { default: {
if (marked.defaults.extensions && marked.defaults.extensions.childTokens && marked.defaults.extensions.childTokens[token.type]) { // Walk any extensions if (marked$1.defaults.extensions && marked$1.defaults.extensions.childTokens && marked$1.defaults.extensions.childTokens[token.type]) { // Walk any extensions
marked.defaults.extensions.childTokens[token.type].forEach(function(childTokens) { marked$1.defaults.extensions.childTokens[token.type].forEach(function(childTokens) {
marked.walkTokens(token[childTokens], callback); marked$1.walkTokens(token[childTokens], callback);
}); });
} else if (token.tokens) { } else if (token.tokens) {
marked.walkTokens(token.tokens, callback); marked$1.walkTokens(token.tokens, callback);
} }
} }
} }
@ -2693,7 +2693,7 @@ marked.walkTokens = function(tokens, callback) {
/** /**
* Parse Inline * Parse Inline
*/ */
marked.parseInline = function(src, opt) { marked$1.parseInline = function(src, opt) {
// throw error in case of non string input // throw error in case of non string input
if (typeof src === 'undefined' || src === null) { if (typeof src === 'undefined' || src === null) {
throw new Error('marked.parseInline(): input parameter is undefined or null'); throw new Error('marked.parseInline(): input parameter is undefined or null');
@ -2703,15 +2703,15 @@ marked.parseInline = function(src, opt) {
+ Object.prototype.toString.call(src) + ', string expected'); + Object.prototype.toString.call(src) + ', string expected');
} }
opt = merge({}, marked.defaults, opt || {}); opt = merge({}, marked$1.defaults, opt || {});
checkSanitizeDeprecation(opt); checkSanitizeDeprecation(opt);
try { try {
const tokens = Lexer.lexInline(src, opt); const tokens = Lexer$1.lexInline(src, opt);
if (opt.walkTokens) { if (opt.walkTokens) {
marked.walkTokens(tokens, opt.walkTokens); marked$1.walkTokens(tokens, opt.walkTokens);
} }
return Parser.parseInline(tokens, opt); return Parser$1.parseInline(tokens, opt);
} catch (e) { } catch (e) {
e.message += '\nPlease report this to https://github.com/markedjs/marked.'; e.message += '\nPlease report this to https://github.com/markedjs/marked.';
if (opt.silent) { if (opt.silent) {
@ -2727,27 +2727,37 @@ marked.parseInline = function(src, opt) {
* Expose * Expose
*/ */
marked.Parser = Parser; marked$1.Parser = Parser$1;
marked.parser = Parser.parse; marked$1.parser = Parser$1.parse;
marked.Renderer = Renderer; marked$1.Renderer = Renderer$1;
marked.TextRenderer = TextRenderer; marked$1.TextRenderer = TextRenderer$1;
marked.Lexer = Lexer; marked$1.Lexer = Lexer$1;
marked.lexer = Lexer.lex; marked$1.lexer = Lexer$1.lex;
marked.Tokenizer = Tokenizer; marked$1.Tokenizer = Tokenizer$1;
marked.Slugger = Slugger; marked$1.Slugger = Slugger$1;
marked.parse = marked; marked$1.parse = marked$1;
marked$1.exports = marked; var marked_1 = marked$1;
var parse = marked$1.exports.parse = marked;
var Parser_1 = marked$1.exports.Parser = Parser;
var parser = marked$1.exports.parser = Parser.parse;
var Renderer_1 = marked$1.exports.Renderer = Renderer;
var TextRenderer_1 = marked$1.exports.TextRenderer = TextRenderer;
var Lexer_1 = marked$1.exports.Lexer = Lexer;
var lexer = marked$1.exports.lexer = Lexer.lex;
var Tokenizer_1 = marked$1.exports.Tokenizer = Tokenizer;
var Slugger_1 = marked$1.exports.Slugger = Slugger;
var marked_1 = marked$1.exports; const marked = marked_1;
const Lexer = Lexer_1$1;
const Parser = Parser_1$1;
const Tokenizer = Tokenizer_1$1;
const Renderer = Renderer_1$1;
const TextRenderer = TextRenderer_1$1;
const Slugger = Slugger_1$1;
export { Lexer_1 as Lexer, Parser_1 as Parser, Renderer_1 as Renderer, Slugger_1 as Slugger, TextRenderer_1 as TextRenderer, Tokenizer_1 as Tokenizer, marked_1 as default, lexer, parse, parser }; esmEntry$1.exports = marked;
var parse = esmEntry$1.exports.parse = marked;
var Parser_1 = esmEntry$1.exports.Parser = Parser;
var parser = esmEntry$1.exports.parser = Parser.parse;
var Renderer_1 = esmEntry$1.exports.Renderer = Renderer;
var TextRenderer_1 = esmEntry$1.exports.TextRenderer = TextRenderer;
var Lexer_1 = esmEntry$1.exports.Lexer = Lexer;
var lexer = esmEntry$1.exports.lexer = Lexer.lex;
var Tokenizer_1 = esmEntry$1.exports.Tokenizer = Tokenizer;
var Slugger_1 = esmEntry$1.exports.Slugger = Slugger;
var esmEntry = esmEntry$1.exports;
export { Lexer_1 as Lexer, Parser_1 as Parser, Renderer_1 as Renderer, Slugger_1 as Slugger, TextRenderer_1 as TextRenderer, Tokenizer_1 as Tokenizer, esmEntry as default, lexer, parse, parser };

65
lib/marked.js
View File

@ -10,10 +10,10 @@
*/ */
(function (global, factory) { (function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
typeof define === 'function' && define.amd ? define(['exports'], factory) : typeof define === 'function' && define.amd ? define(factory) :
(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.marked = {})); (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.marked = factory());
})(this, (function (exports) { 'use strict'; })(this, (function () { 'use strict';
function _defineProperties(target, props) { function _defineProperties(target, props) {
for (var i = 0; i < props.length; i++) { for (var i = 0; i < props.length; i++) {
@ -69,8 +69,6 @@
throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
} }
var marked$1 = {exports: {}};
var defaults$5 = {exports: {}}; var defaults$5 = {exports: {}};
function getDefaults$1() { function getDefaults$1() {
@ -470,7 +468,7 @@
*/ */
var Tokenizer_1$1 = /*#__PURE__*/function () { var Tokenizer_1 = /*#__PURE__*/function () {
function Tokenizer(options) { function Tokenizer(options) {
this.options = options || defaults$4; this.options = options || defaults$4;
} }
@ -1395,7 +1393,7 @@
inline: inline$1 inline: inline$1
}; };
var Tokenizer$1 = Tokenizer_1$1; var Tokenizer$1 = Tokenizer_1;
var defaults$3 = defaults$5.exports.defaults; var defaults$3 = defaults$5.exports.defaults;
var block = rules.block, var block = rules.block,
inline = rules.inline; inline = rules.inline;
@ -1442,7 +1440,7 @@
*/ */
var Lexer_1$1 = /*#__PURE__*/function () { var Lexer_1 = /*#__PURE__*/function () {
function Lexer(options) { function Lexer(options) {
this.tokens = []; this.tokens = [];
this.tokens.links = Object.create(null); this.tokens.links = Object.create(null);
@ -1962,7 +1960,7 @@
* Renderer * Renderer
*/ */
var Renderer_1$1 = /*#__PURE__*/function () { var Renderer_1 = /*#__PURE__*/function () {
function Renderer(options) { function Renderer(options) {
this.options = options || defaults$2; this.options = options || defaults$2;
} }
@ -2111,7 +2109,7 @@
* returns only the textual part of the token * returns only the textual part of the token
*/ */
var TextRenderer_1$1 = /*#__PURE__*/function () { var TextRenderer_1 = /*#__PURE__*/function () {
function TextRenderer() {} function TextRenderer() {}
var _proto = TextRenderer.prototype; var _proto = TextRenderer.prototype;
@ -2160,7 +2158,7 @@
* Slugger generates header id * Slugger generates header id
*/ */
var Slugger_1$1 = /*#__PURE__*/function () { var Slugger_1 = /*#__PURE__*/function () {
function Slugger() { function Slugger() {
this.seen = {}; this.seen = {};
} }
@ -2216,16 +2214,16 @@
return Slugger; return Slugger;
}(); }();
var Renderer$1 = Renderer_1$1; var Renderer$1 = Renderer_1;
var TextRenderer$1 = TextRenderer_1$1; var TextRenderer$1 = TextRenderer_1;
var Slugger$1 = Slugger_1$1; var Slugger$1 = Slugger_1;
var defaults$1 = defaults$5.exports.defaults; var defaults$1 = defaults$5.exports.defaults;
var unescape = helpers.unescape; var unescape = helpers.unescape;
/** /**
* Parsing & Compiling * Parsing & Compiling
*/ */
var Parser_1$1 = /*#__PURE__*/function () { var Parser_1 = /*#__PURE__*/function () {
function Parser(options) { function Parser(options) {
this.options = options || defaults$1; this.options = options || defaults$1;
this.options.renderer = this.options.renderer || new Renderer$1(); this.options.renderer = this.options.renderer || new Renderer$1();
@ -2561,12 +2559,12 @@
return Parser; return Parser;
}(); }();
var Lexer = Lexer_1$1; var Lexer = Lexer_1;
var Parser = Parser_1$1; var Parser = Parser_1;
var Tokenizer = Tokenizer_1$1; var Tokenizer = Tokenizer_1;
var Renderer = Renderer_1$1; var Renderer = Renderer_1;
var TextRenderer = TextRenderer_1$1; var TextRenderer = TextRenderer_1;
var Slugger = Slugger_1$1; var Slugger = Slugger_1;
var merge = helpers.merge, var merge = helpers.merge,
checkSanitizeDeprecation = helpers.checkSanitizeDeprecation, checkSanitizeDeprecation = helpers.checkSanitizeDeprecation,
escape = helpers.escape; escape = helpers.escape;
@ -2965,27 +2963,8 @@
marked.Tokenizer = Tokenizer; marked.Tokenizer = Tokenizer;
marked.Slugger = Slugger; marked.Slugger = Slugger;
marked.parse = marked; marked.parse = marked;
marked$1.exports = marked; var marked_1 = marked;
var parse = marked$1.exports.parse = marked;
var Parser_1 = marked$1.exports.Parser = Parser;
var parser = marked$1.exports.parser = Parser.parse;
var Renderer_1 = marked$1.exports.Renderer = Renderer;
var TextRenderer_1 = marked$1.exports.TextRenderer = TextRenderer;
var Lexer_1 = marked$1.exports.Lexer = Lexer;
var lexer = marked$1.exports.lexer = Lexer.lex;
var Tokenizer_1 = marked$1.exports.Tokenizer = Tokenizer;
var Slugger_1 = marked$1.exports.Slugger = Slugger;
var marked_1 = marked$1.exports;
exports.Lexer = Lexer_1; return marked_1;
exports.Parser = Parser_1;
exports.Renderer = Renderer_1;
exports.Slugger = Slugger_1;
exports.TextRenderer = TextRenderer_1;
exports.Tokenizer = Tokenizer_1;
exports["default"] = marked_1;
exports.lexer = lexer;
exports.parse = parse;
exports.parser = parser;
})); }));

2
marked.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
rollup.config.esm.js
View File

@ -2,7 +2,7 @@ const commonjs = require('@rollup/plugin-commonjs');
const license = require('rollup-plugin-license'); const license = require('rollup-plugin-license');
module.exports = { module.exports = {
input: 'src/marked.js', input: 'src/esm-entry.js',
output: { output: {
file: 'lib/marked.esm.js', file: 'lib/marked.esm.js',
format: 'esm' format: 'esm'

2
rollup.config.js
View File

@ -8,7 +8,7 @@ module.exports = {
file: 'lib/marked.js', file: 'lib/marked.js',
format: 'umd', format: 'umd',
name: 'marked', name: 'marked',
esModule: false exports: 'default'
}, },
plugins: [ plugins: [
license({ license({

18
src/esm-entry.js Normal file
View File

@ -0,0 +1,18 @@
const marked = require('./marked.js');
const Lexer = require('./Lexer.js');
const Parser = require('./Parser.js');
const Tokenizer = require('./Tokenizer.js');
const Renderer = require('./Renderer.js');
const TextRenderer = require('./TextRenderer.js');
const Slugger = require('./Slugger.js');
module.exports = marked;
module.exports.parse = marked;
module.exports.Parser = Parser;
module.exports.parser = Parser.parse;
module.exports.Renderer = Renderer;
module.exports.TextRenderer = TextRenderer;
module.exports.Lexer = Lexer;
module.exports.lexer = Lexer.lex;
module.exports.Tokenizer = Tokenizer;
module.exports.Slugger = Slugger;

9
src/marked.js
View File

@ -335,12 +335,3 @@ marked.Slugger = Slugger;
marked.parse = marked; marked.parse = marked;
module.exports = marked; module.exports = marked;
module.exports.parse = marked;
module.exports.Parser = Parser;
module.exports.parser = Parser.parse;
module.exports.Renderer = Renderer;
module.exports.TextRenderer = TextRenderer;
module.exports.Lexer = Lexer;
module.exports.lexer = Lexer.lex;
module.exports.Tokenizer = Tokenizer;
module.exports.Slugger = Slugger;