chore: removed circular dep and css.escape

Author: anikethsaha

package-lock.json

@@ -76,7 +76,6 @@
     "conventional-changelog-cli": "^2.0.25",
     "copy-dir": "^1.2.0",
     "cross-env": "^6.0.3",
-    "css.escape": "^1.5.1",
     "cssnano": "^4.1.10",
     "cypress": "^3.8.1",
     "cypress-image-snapshot": "^3.1.1",

package.json

@@ -1,13 +1,13 @@
 import { readFileSync } from 'fs';
 import { resolve, basename } from 'path';
 import resolvePathname from 'resolve-pathname';
-import debug from 'debug';
-import fetch from 'node-fetch';
 import { AbstractHistory } from '../../src/core/router/history/abstract';
 import { Compiler } from '../../src/core/render/compiler';
 import { isAbsolutePath } from '../../src/core/router/util';
 import * as tpl from '../../src/core/render/tpl';
 import { prerenderEmbed } from '../../src/core/render/embed';
+import fetch from 'node-fetch';
+import debug from 'debug';
 
 function cwd(...args) {
   return resolve(process.cwd(), ...args);

packages/docsify-server-renderer/index.js

@@ -1,7 +1,7 @@
-import Tweezer from 'tweezer.js';
 import { isMobile } from '../util/env';
 import * as dom from '../util/dom';
 import config from '../config';
+import Tweezer from 'tweezer.js';
 
 const nav = {};
 let hoverOver = false;

src/core/event/scroll.js

@@ -1,10 +1,10 @@
-import marked from 'marked';
-import prism from 'prismjs';
 import * as util from './util';
 import * as dom from './util/dom';
 import { Compiler } from './render/compiler';
 import { slugify } from './render/slugify';
 import { get } from './fetch/ajax';
+import prism from 'prismjs';
+import marked from 'marked';
 
 export default function() {
   window.Docsify = {

src/core/global-api.js

@@ -1,40 +1,20 @@
-import marked from 'marked';
 import { isAbsolutePath, getPath, getParentPath } from '../router/util';
 import { isFn, merge, cached, isPrimitive } from '../util/core';
 import { tree as treeTpl } from './tpl';
 import { genTree } from './gen-tree';
 import { slugify } from './slugify';
 import { emojify } from './emojify';
+import { getAndRemoveConfig } from './utils';
 import { imageCompiler } from './compiler/image';
 import { highlightCodeCompiler } from './compiler/code';
 import { paragraphCompiler } from './compiler/paragraph';
 import { taskListCompiler } from './compiler/taskList';
 import { taskListItemCompiler } from './compiler/taskListItem';
 import { linkCompiler } from './compiler/link';
+import marked from 'marked';
 
 const cachedLinks = {};
 
-export function getAndRemoveConfig(str = '') {
-  const config = {};
-
-  if (str) {
-    str = str
-      .replace(/^'/, '')
-      .replace(/'$/, '')
-      .replace(/(?:^|\s):([\w-]+:?)=?([\w-]+)?/g, (m, key, value) => {
-        if (key.indexOf(':') === -1) {
-          config[key] = (value && value.replace(/"/g, '')) || true;
-          return '';
-        }
-
-        return m;
-      })
-      .trim();
-  }
-
-  return { str, config };
-}
-
 const compileMedia = {
   markdown(url) {
     return {

src/core/render/compiler.js

@@ -1,4 +1,4 @@
-import { getAndRemoveConfig } from '../compiler';
+import { getAndRemoveConfig } from '../utils';
 import { slugify } from './slugify';
 
 export const headingCompiler = ({ renderer, router, _self }) =>

src/core/render/compiler/headline.js

@@ -1,4 +1,4 @@
-import { getAndRemoveConfig } from '../compiler';
+import { getAndRemoveConfig } from '../utils';
 import { isAbsolutePath } from '../../router/util';
 
 export const linkCompiler = ({ renderer, router, linkTarget, compilerClass }) =>

src/core/render/compiler/link.js

@@ -1,6 +1,6 @@
-import stripIndent from 'strip-indent';
 import { get } from '../fetch/ajax';
 import { merge } from '../util/core';
+import stripIndent from 'strip-indent';
 
 const cached = {};
 

src/core/render/embed.js

@@ -1,5 +1,4 @@
 /* eslint-disable no-unused-vars */
-import tinydate from 'tinydate';
 import * as dom from '../util/dom';
 import cssVars from '../util/polyfill/css-vars';
 import { callHook } from '../init/lifecycle';
@@ -11,6 +10,7 @@ import { scrollActiveSidebar } from '../event/scroll';
 import { Compiler } from './compiler';
 import * as tpl from './tpl';
 import { prerenderEmbed } from './embed';
+import tinydate from 'tinydate';
 
 function executeScript() {
   const script = dom

src/core/render/index.js

@@ -0,0 +1,20 @@
+export function getAndRemoveConfig(str = '') {
+  const config = {};
+
+  if (str) {
+    str = str
+      .replace(/^'/, '')
+      .replace(/'$/, '')
+      .replace(/(?:^|\s):([\w-]+:?)=?([\w-]+)?/g, (m, key, value) => {
+        if (key.indexOf(':') === -1) {
+          config[key] = (value && value.replace(/"/g, '')) || true;
+          return '';
+        }
+
+        return m;
+      })
+      .trim();
+  }
+
+  return { str, config };
+}

src/core/render/utils.js

@@ -1,8 +1,8 @@
 import { supportsPushState } from '../util/env';
 import * as dom from '../util/dom';
+import { noop } from '../util/core';
 import { HashHistory } from './history/hash';
 import { HTML5History } from './history/html5';
-import { noop } from '../util/core';
 
 export function routerMixin(proto) {
   proto.route = {};

src/core/router/index.js

@@ -2,8 +2,8 @@
 require = require('esm')(
   module /* , options */
 ); /* eslint-disable-line no-global-assign */
-const { expect } = require('chai');
 const { History } = require('../../src/core/router/history/base');
+const { expect } = require('chai');
 
 class MockHistory extends History {
   parse(path) {

test/unit/base.test.js

@@ -1,5 +1,5 @@
-const { expect } = require('chai');
 const { init, expectSameDom } = require('../_helper');
+const { expect } = require('chai');
 
 describe('render', function() {
   it('important content (tips)', async function() {

test/unit/render.test.js

@@ -2,8 +2,8 @@
 require = require('esm')(
   module /* , options */
 ); /* eslint-disable-line no-global-assign */
-const { expect } = require('chai');
 const { resolvePath } = require('../../src/core/router/util');
+const { expect } = require('chai');
 
 describe('router/util', function() {
   it('resolvePath', async function() {