Merge pull request #1563 from UziTech/rollup

Separate marked into modules

.eslintignore

@@ -1 +1,2 @@
+lib
 *.min.js

.eslintrc.json

@@ -3,10 +3,6 @@
   "plugins": [
     "standard"
   ],
-  "parserOptions": {
-    "ecmaVersion": 5,
-    "sourceType": "script"
-  },
   "rules": {
     "semi": ["error", "always"],
     "indent": ["error", 2, {
@@ -20,11 +16,12 @@
     "no-useless-escape": "off",
     "one-var": "off",
     "no-control-regex": "off",
-    "no-prototype-builtins": "off"
+    "no-prototype-builtins": "off",
+
+    "prefer-const": "error",
+    "no-var": "error"
   },
   "env": {
-    "node": true,
-    "browser": true,
-    "amd": true
+    "node": true
   }
 }

.travis.yml

@@ -19,23 +19,23 @@ jobs:
       script: npm run test:lint
       node_js: lts/*
 
-    - stage: minify 🗜️
+    - stage: build 🗜️
       script: |
         npm run build
         if ! git diff --quiet; then
           git config --global user.email "travis@travis-ci.org"
           git config --global user.name "Travis-CI"
           git config credential.helper "store --file=.git/credentials"
           echo "https://${GITHUB_TOKEN}:@github.com" > .git/credentials
-          git commit -am '🗜️ minify [skip ci]'
+          git commit -am '🗜️ build [skip ci]'
           git push origin HEAD:${TRAVIS_BRANCH}
         fi
       node_js: lts/*
       if: branch = master AND type = push
 
-    - stage: security scan 🔐
-      script: npm run test:redos
-      node_js: lts/*
+    # - stage: security scan 🔐
+    #   script: npm run test:redos
+    #   node_js: lts/*
 
 cache:
   directories:

bin/marked

@@ -5,18 +5,18 @@
  * Copyright (c) 2011-2013, Christopher Jeffrey (MIT License)
  */
 
-var fs = require('fs'),
-    path = require('path'),
-    marked = require('../');
+const fs = require('fs'),
+  path = require('path'),
+  marked = require('../');
 
 /**
  * Man Page
  */
 
 function help() {
-  var spawn = require('child_process').spawn;
+  const spawn = require('child_process').spawn;
 
-  var options = {
+  const options = {
     cwd: process.cwd(),
     env: process.env,
     setsid: false,
@@ -33,7 +33,7 @@ function help() {
 }
 
 function version() {
-  var pkg = require('../package.json');
+  const pkg = require('../package.json');
   console.log(pkg.version);
 }
 
@@ -42,17 +42,17 @@ function version() {
  */
 
 function main(argv, callback) {
-  var files = [],
-      options = {},
-      input,
-      output,
-      string,
-      arg,
-      tokens,
-      opt;
+  const files = [],
+    options = {};
+  let input,
+    output,
+    string,
+    arg,
+    tokens,
+    opt;
 
   function getarg() {
-    var arg = argv.shift();
+    let arg = argv.shift();
 
     if (arg.indexOf('--') === 0) {
       // e.g. --opt
@@ -162,8 +162,8 @@ function main(argv, callback) {
  */
 
 function getStdin(callback) {
-  var stdin = process.stdin,
-      buff = '';
+  const stdin = process.stdin;
+  let buff = '';
 
   stdin.setEncoding('utf8');
 

docs/.eslintrc.json

@@ -0,0 +1,33 @@
+{
+  "extends": "standard",
+  "plugins": [
+    "standard"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 5,
+    "sourceType": "script"
+  },
+  "rules": {
+    "semi": ["error", "always"],
+    "indent": ["error", 2, {
+      "SwitchCase": 1,
+      "VariableDeclarator": { "var": 2 },
+      "outerIIFEBody": 0
+    }],
+    "operator-linebreak": ["error", "before", { "overrides": { "=": "after" } }],
+    "space-before-function-paren": ["error", "never"],
+    "no-cond-assign": "off",
+    "no-useless-escape": "off",
+    "one-var": "off",
+    "no-control-regex": "off",
+    "no-prototype-builtins": "off",
+
+    "prefer-const": "off",
+    "no-var": "off"
+  },
+  "env": {
+    "node": true,
+    "browser": true,
+    "amd": true
+  }
+}

docs/AUTHORS.md

@@ -1,6 +1,6 @@
 # Authors
 
-Marked takes an encompassing approach to its community. As such, you can think of these as [concentric circles](https://medium.com/the-node-js-collection/healthy-open-source-967fa8be7951), where each group encompases the following groups.
+Marked takes an encompassing approach to its community. As such, you can think of these as [concentric circles](https://medium.com/the-node-js-collection/healthy-open-source-967fa8be7951), where each group encompasses the following groups.
 
 <table>
   <tbody>
@@ -170,7 +170,7 @@ To be removed: You can remove yourself through the [GitHub UI](https://help.gith
 A note on volunteering:
 
 1. Please do not volunteer unless you believe you can demonstrate to your peers you can do the work required.
-2. Please do not overcommit yourself; we count on those committed to the project to be responsive. Really consider, with all you have going on, wehther you able to really commit to it.
+2. Please do not overcommit yourself; we count on those committed to the project to be responsive. Really consider, with all you have going on, whether you able to really commit to it.
 3. Don't let the previous frighten you away, it can always be changed later by you or your peers.
 
 [Details on badges](#badges)
@@ -227,7 +227,7 @@ Badges? If you *want* 'em, we got 'em, and here's how you get 'em (and&hellip;dr
 		</blockquote>
 	</dd>
   <dt>Dr. Docs</dt>
-  <dd>Someone who has contributed a great deal to the creation and maintainance of the non-code areas of marked.</dd>
+  <dd>Someone who has contributed a great deal to the creation and maintenance of the non-code areas of marked.</dd>
 	<dt>Eye for the CLI</dt>
 	<dd>At this point? Pretty much anyone who can update that `man` file to the current Marked version without regression in the CLI tool itself.</dd>
 	<dt>GitHub Guru</dt>
@@ -259,9 +259,9 @@ Badges? If you *want* 'em, we got 'em, and here's how you get 'em (and&hellip;dr
 
 <dl>
 	<dt>Defibrillator</dt>
-	<dd>A contributor who stepped up to help bring Marked back to life by contriuting solutions to help Marked pass when compared against the CommonMark and GitHub Flavored Markdown specifications.</dd>
+	<dd>A contributor who stepped up to help bring Marked back to life by contributing solutions to help Marked pass when compared against the CommonMark and GitHub Flavored Markdown specifications.</dd>
 	<dt>Maker of the Marked mark</dt>
-	<dd>This badge is given to the person or oganization credited with creating the logo (or logotype) used in Marked communications for a given period of time. **Maker of the Marked mark from 2017 to present**, for example.</dd>
+	<dd>This badge is given to the person or organization credited with creating the logo (or logotype) used in Marked communications for a given period of time. **Maker of the Marked mark from 2017 to present**, for example.</dd>
 	<dt>Release Wrangler</dt>
 	<dd>This is a badge given to all Publishers.</dd>
 	<dt>Snyk's Security Saint</dt>

docs/CONTRIBUTING.md

@@ -5,9 +5,10 @@
 - [ ] Make sure you are on the `master` branch.
 - [ ] Be sure to run `npm install` or `npm update`.
 - [ ] Create a branch.
-- [ ] Make as small a change as possible.
-- [ ] Run `npm test`, fix any broken things (for linting, you can run `npm run lint` to have the linter fix them for you).
-- [ ] Submit a PR.
+- [ ] Update code in `src` folder. (`lib` folder is for auto compiled code)
+- [ ] Run `npm run test:all`, fix any broken things (for linting, you can run `npm run lint` to have the linter fix them for you).
+- [ ] Run `npm run build:reset` to remove changes to compiled files.
+- [ ] Submit a Pull Request.
 
 ## Design principles
 
@@ -30,6 +31,7 @@ The following table lists the ticket type labels we use when there is work to be
 |RR - refactor and re-engineer      |Results in an improvement to developers using Marked (improved readability) or end-users (faster performance) or both.                                                              |
 |NFS - new feature (spec related)   |A capability Marked does not currently provide but is in one of the [supported specifications](#/README.md#specifications)                                                           |
 |NFU - new feature (user requested) |A capability Marked does not currently provide but has been requested by users of Marked.                                                                                           |
+|NFE - new feature (should be an extension) |A capability Marked does not currently provide and is not part of a spec.                                                                                           |
 
 ## Test early, often, and everything
 
@@ -86,9 +88,8 @@ To check for (and fix) standardized syntax (lint):
 npm run lint
 ```
 
-To build your own minified version of Marked:
+To build your own es5, esm, and minified versions of Marked:
 
 ```bash
 npm run build
 ```
-

docs/PUBLISHING.md

@@ -7,7 +7,7 @@
 
 ## Overall strategy
 
-**Master is always shippable:** We try to merge PRs in such a way that `master` is the only branch to really be concerned about *and* `master` can always be released. This allows smoother flow between new fetures, bug fixes, and so on. (Almost a continuous deployment setup, without automation.)
+**Master is always shippable:** We try to merge PRs in such a way that `master` is the only branch to really be concerned about *and* `master` can always be released. This allows smoother flow between new features, bug fixes, and so on. (Almost a continuous deployment setup, without automation.)
 
 ## Versioning
 
@@ -20,5 +20,5 @@ We follow [semantic versioning](https://semver.org) where the following sequence
 What to expect while Marked is a zero-major (0.x.y):
 
 1. The major will remain at zero; thereby, alerting consumers to the potentially volatile nature of the package.
-2. The minor will tend to be more analagous to a `major` release. 
-3. The patch will tend to be more analagous to a `minor` release or a collection of bug fixes (patches).
+2. The minor will tend to be more analogous to a `major` release.
+3. The patch will tend to be more analogous to a `minor` release or a collection of bug fixes (patches).

docs/USING_ADVANCED.md

@@ -40,7 +40,7 @@ console.log(marked(markdownString));
 
 |Member      |Type      |Default  |Since    |Notes         |
 |:-----------|:---------|:--------|:--------|:-------------|
-|baseUrl     |`string`  |`null`   |0.3.9    |A prefix url for any relative link. |  
+|baseUrl     |`string`  |`null`   |0.3.9    |A prefix url for any relative link. |
 |breaks      |`boolean` |`false`  |v0.2.7   |If true, add `<br>` on a single line break (copies GitHub). Requires `gfm` be `true`.|
 |gfm         |`boolean` |`true`   |v0.2.1   |If true, use approved [GitHub Flavored Markdown (GFM) specification](https://github.github.com/gfm/).|
 |headerIds   |`boolean` |`true`   |v0.4.0   |If true, include an `id` attribute when emitting headings (h1, h2, h3, etc).|

docs/USING_PRO.md

@@ -106,7 +106,7 @@ You also have direct access to the lexer and parser if you so desire.
 
 ``` js
 const tokens = marked.lexer(text, options);
-console.log(marked.parser(tokens));
+console.log(marked.parser(tokens, options));
 ```
 
 ``` js