Merge pull request #242 from marp-team/eslint-recommended

Use ESLint recommended config instead of eslint-config-airbnb

.eslintrc.yml

@@ -1,14 +1,20 @@
 env:
-  node: true
   es6: true
+  node: true
 
 extends:
-  - airbnb-base
+  - eslint:recommended
+  - plugin:import/recommended
   - prettier
 
 parser: babel-eslint
 
 rules:
+  import/order:
+    - error
+    - alphabetize:
+        order: 'asc'
+
   max-len:
     - error
     - 80
@@ -18,11 +24,3 @@ rules:
       ignoreRegExpLiterals: true
       ignoreStrings: true
       ignoreTemplateLiterals: true
-
-  no-param-reassign: off
-
-  no-restricted-syntax:
-    - error
-    - ForInStatement
-    - LabeledStatement
-    - WithStatement

CHANGELOG.md

@@ -14,6 +14,7 @@
 ### Changed
 
 - Upgrade dependent packages to the latest version ([#241](https://github.com/marp-team/marpit/pull/241))
+- Use ESLint recommended config instead of `eslint-config-airbnb` ([#242](https://github.com/marp-team/marpit/pull/242))
 
 ## v1.5.3 - 2020-05-04
 

package.json

@@ -49,7 +49,7 @@
     "docs:style": "node ./docsify/build.js",
     "format": "prettier \"**/*.{css,html,js,json,md,scss,ts,yaml,yml}\"",
     "jsdoc": "rimraf jsdoc && jsdoc src -c .jsdoc.json",
-    "lint:js": "eslint .",
+    "lint:js": "eslint --report-unused-disable-directives .",
     "lint:css": "stylelint \"./**/*.{css,scss}\"",
     "prepack": "npm-run-all --parallel check:* lint:* test:coverage --sequential build",
     "preversion": "run-p check:* lint:* test:coverage",
@@ -75,7 +75,6 @@
     "dedent": "^0.7.0",
     "docsify-themeable": "^0.8.1",
     "eslint": "^7.0.0",
-    "eslint-config-airbnb-base": "14.1.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-import": "^2.20.2",
     "jest": "^26.0.1",

src/markdown/background_image/advanced.js

@@ -1,7 +1,7 @@
 /** @module */
-import marpitPlugin from '../../plugin'
 import InlineStyle from '../../helpers/inline_style'
 import wrapTokens from '../../helpers/wrap_tokens'
+import marpitPlugin from '../../plugin'
 
 /**
  * Marpit advanced background image plugin.

src/markdown/comment.js

@@ -1,6 +1,6 @@
 /** @module */
-import yaml from './directives/yaml'
 import marpitPlugin from '../plugin'
+import yaml from './directives/yaml'
 
 const commentMatcher = /<!--+\s*([\s\S]*?)\s*--+>/
 const commentMatcherOpening = /^<!--/

src/markdown/container.js

@@ -1,7 +1,7 @@
 /** @module */
-import marpitPlugin from '../plugin'
 import wrapArray from '../helpers/wrap_array'
 import wrapTokens from '../helpers/wrap_tokens'
+import marpitPlugin from '../plugin'
 
 /**
  * Marpit container plugin.

src/markdown/directives/apply.js

@@ -1,8 +1,8 @@
 /** @module */
 import kebabCase from 'lodash.kebabcase'
-import builtInDirectives from './directives'
-import marpitPlugin from '../../plugin'
 import InlineStyle from '../../helpers/inline_style'
+import marpitPlugin from '../../plugin'
+import builtInDirectives from './directives'
 
 /**
  * Apply parsed Marpit directives to markdown-it tokens.

src/markdown/directives/parse.js

@@ -1,9 +1,9 @@
 /** @module */
 import MarkdownItFrontMatter from 'markdown-it-front-matter'
-import yaml from './yaml'
-import * as directives from './directives'
-import { markAsParsed } from '../comment'
 import marpitPlugin from '../../plugin'
+import { markAsParsed } from '../comment'
+import * as directives from './directives'
+import yaml from './yaml'
 
 const isDirectiveComment = (token) =>
   token.type === 'marpit_comment' && token.meta.marpitParsedDirectives

src/markdown/header_and_footer.js

@@ -1,6 +1,6 @@
 /** @module */
-import marpitPlugin from '../plugin'
 import wrapTokens from '../helpers/wrap_tokens'
+import marpitPlugin from '../plugin'
 
 /**
  * Marpit header and footer plugin.

src/markdown/heading_divider.js

@@ -1,6 +1,6 @@
 /** @module */
-import marpitPlugin from '../plugin'
 import split from '../helpers/split'
+import marpitPlugin from '../plugin'
 
 /**
  * Marpit heading divider plugin.

src/markdown/image/apply.js

@@ -1,6 +1,6 @@
 /** @module */
-import marpitPlugin from '../../plugin'
 import InlineStyle from '../../helpers/inline_style'
+import marpitPlugin from '../../plugin'
 
 /**
  * Marpit image apply plugin.

src/markdown/image/parse.js

@@ -115,7 +115,6 @@ function parseImage(md) {
 
     try {
       md.normalizeLink = (url) => {
-        // eslint-disable-next-line no-new-wrappers
         const imprimitiveUrl = new String(normalizeLink.call(md, url))
         originalURLMap.set(imprimitiveUrl, url)
 

src/markdown/inline_svg.js

@@ -1,7 +1,7 @@
 /** @module */
-import marpitPlugin from '../plugin'
 import split from '../helpers/split'
 import wrapTokens from '../helpers/wrap_tokens'
+import marpitPlugin from '../plugin'
 
 /**
  * Marpit Inline SVG plugin.

src/markdown/slide.js

@@ -1,7 +1,7 @@
 /** @module */
-import marpitPlugin from '../plugin'
 import split from '../helpers/split'
 import wrapTokens from '../helpers/wrap_tokens'
+import marpitPlugin from '../plugin'
 
 /**
  * Marpit slide plugin.

src/markdown/slide_container.js

@@ -1,8 +1,8 @@
 /** @module */
-import marpitPlugin from '../plugin'
 import split from '../helpers/split'
 import wrapArray from '../helpers/wrap_array'
 import wrapTokens from '../helpers/wrap_tokens'
+import marpitPlugin from '../plugin'
 
 /**
  * Marpit slide container plugin.

src/marpit.js

@@ -1,23 +1,23 @@
 import MarkdownIt from 'markdown-it'
-import wrapArray from './helpers/wrap_array'
-import ThemeSet from './theme_set'
 import { marpitContainer } from './element'
-import marpitApplyDirectives from './markdown/directives/apply'
+import wrapArray from './helpers/wrap_array'
 import marpitBackgroundImage from './markdown/background_image'
 import marpitCollect from './markdown/collect'
 import marpitComment from './markdown/comment'
 import marpitContainerPlugin from './markdown/container'
+import marpitApplyDirectives from './markdown/directives/apply'
+import marpitParseDirectives from './markdown/directives/parse'
 import marpitFragment from './markdown/fragment'
 import marpitHeaderAndFooter from './markdown/header_and_footer'
 import marpitHeadingDivider from './markdown/heading_divider'
-import marpitInlineSVG from './markdown/inline_svg'
-import marpitParseDirectives from './markdown/directives/parse'
 import marpitImage from './markdown/image'
+import marpitInlineSVG from './markdown/inline_svg'
 import marpitSlide from './markdown/slide'
 import marpitSlideContainer from './markdown/slide_container'
 import marpitStyleAssign from './markdown/style/assign'
 import marpitStyleParse from './markdown/style/parse'
 import marpitSweep from './markdown/sweep'
+import ThemeSet from './theme_set'
 
 const defaultOptions = {
   container: marpitContainer,

test/markdown/background_image.js

@@ -1,11 +1,11 @@
 import cheerio from 'cheerio'
 import MarkdownIt from 'markdown-it'
-import applyDirectives from '../../src/markdown/directives/apply'
 import backgroundImage from '../../src/markdown/background_image'
 import comment from '../../src/markdown/comment'
-import inlineSVG from '../../src/markdown/inline_svg'
+import applyDirectives from '../../src/markdown/directives/apply'
 import parseDirectives from '../../src/markdown/directives/parse'
 import image from '../../src/markdown/image'
+import inlineSVG from '../../src/markdown/inline_svg'
 import slide from '../../src/markdown/slide'
 
 const splitBackgroundKeywords = ['left', 'right']

test/markdown/collect.js

@@ -1,12 +1,12 @@
 import dedent from 'dedent'
 import MarkdownIt from 'markdown-it'
-import applyDirectives from '../../src/markdown/directives/apply'
+import { ThemeSet } from '../../src/index'
 import collect from '../../src/markdown/collect'
 import comment, { markAsParsed } from '../../src/markdown/comment'
-import inlineSVG from '../../src/markdown/inline_svg'
+import applyDirectives from '../../src/markdown/directives/apply'
 import parseDirectives from '../../src/markdown/directives/parse'
+import inlineSVG from '../../src/markdown/inline_svg'
 import slide from '../../src/markdown/slide'
-import { ThemeSet } from '../../src/index'
 
 describe('Marpit collect plugin', () => {
   const themeSet = new ThemeSet()

test/markdown/directives/apply.js

@@ -1,8 +1,8 @@
 import cheerio from 'cheerio'
 import dedent from 'dedent'
 import MarkdownIt from 'markdown-it'
-import applyDirectives from '../../../src/markdown/directives/apply'
 import comment from '../../../src/markdown/comment'
+import applyDirectives from '../../../src/markdown/directives/apply'
 import parseDirectives from '../../../src/markdown/directives/parse'
 import slide from '../../../src/markdown/slide'
 

test/markdown/header_and_footer.js

@@ -1,10 +1,10 @@
 import cheerio from 'cheerio'
 import MarkdownIt from 'markdown-it'
-import applyDirectives from '../../src/markdown/directives/apply'
 import comment from '../../src/markdown/comment'
+import applyDirectives from '../../src/markdown/directives/apply'
 import parseDirectives from '../../src/markdown/directives/parse'
-import slide from '../../src/markdown/slide'
 import headerAndFooter from '../../src/markdown/header_and_footer'
+import slide from '../../src/markdown/slide'
 
 describe('Marpit header and footer plugin', () => {
   const themeSet = new Map()

test/markdown/heading_divider.js

@@ -1,8 +1,8 @@
 import cheerio from 'cheerio'
 import MarkdownIt from 'markdown-it'
 import comment from '../../src/markdown/comment'
-import headingDivider from '../../src/markdown/heading_divider'
 import parseDirectives from '../../src/markdown/directives/parse'
+import headingDivider from '../../src/markdown/heading_divider'
 import slide from '../../src/markdown/slide'
 
 describe('Marpit heading divider plugin', () => {

test/markdown/image.js

@@ -1,12 +1,12 @@
 import cheerio from 'cheerio'
 import MarkdownIt from 'markdown-it'
-import applyDirectives from '../../src/markdown/directives/apply'
 import backgroundImage from '../../src/markdown/background_image'
 import comment from '../../src/markdown/comment'
-import inlineSVG from '../../src/markdown/inline_svg'
+import applyDirectives from '../../src/markdown/directives/apply'
 import parseDirectives from '../../src/markdown/directives/parse'
 import headerAndFooter from '../../src/markdown/header_and_footer'
 import image from '../../src/markdown/image'
+import inlineSVG from '../../src/markdown/inline_svg'
 import slide from '../../src/markdown/slide'
 
 describe('Marpit image plugin', () => {

test/markdown/inline_svg.js

@@ -1,9 +1,9 @@
 import cheerio from 'cheerio'
 import MarkdownIt from 'markdown-it'
-import slide from '../../src/markdown/slide'
+import { Theme, ThemeSet } from '../../src/index'
 import inlineSVG from '../../src/markdown/inline_svg'
+import slide from '../../src/markdown/slide'
 import skipThemeValidationSymbol from '../../src/theme/symbol'
-import { Theme, ThemeSet } from '../../src/index'
 
 describe('Marpit inline SVG plugin', () => {
   const marpitStub = (props = {}) => ({

test/markdown/style/assign.js

@@ -1,8 +1,8 @@
 import cheerio from 'cheerio'
 import dedent from 'dedent'
 import MarkdownIt from 'markdown-it'
-import applyDirectives from '../../../src/markdown/directives/apply'
 import comment from '../../../src/markdown/comment'
+import applyDirectives from '../../../src/markdown/directives/apply'
 import parseDirectives from '../../../src/markdown/directives/parse'
 import slide from '../../../src/markdown/slide'
 import styleAssign from '../../../src/markdown/style/assign'

test/markdown/sweep.js

@@ -1,12 +1,12 @@
 import cheerio from 'cheerio'
 import dedent from 'dedent'
 import MarkdownIt from 'markdown-it'
-import applyDirectives from '../../src/markdown/directives/apply'
 import backgroundImage from '../../src/markdown/background_image'
 import comment from '../../src/markdown/comment'
-import inlineSVG from '../../src/markdown/inline_svg'
+import applyDirectives from '../../src/markdown/directives/apply'
 import parseDirectives from '../../src/markdown/directives/parse'
 import image from '../../src/markdown/image'
+import inlineSVG from '../../src/markdown/inline_svg'
 import slide from '../../src/markdown/slide'
 import sweep from '../../src/markdown/sweep'
 

test/marpit.js

@@ -1,7 +1,7 @@
 import cheerio from 'cheerio'
 import dedent from 'dedent'
-import postcss from 'postcss'
 import MarkdownIt from 'markdown-it'
+import postcss from 'postcss'
 import { Marpit, ThemeSet } from '../src/index'
 
 describe('Marpit', () => {

test/postcss/printable.js

@@ -1,7 +1,7 @@
 import dedent from 'dedent'
 import postcss from 'postcss'
-import { findAtRule, findDecl, findRule } from '../_supports/postcss_finder'
 import printable, { postprocess } from '../../src/postcss/printable'
+import { findAtRule, findDecl, findRule } from '../_supports/postcss_finder'
 
 describe('Marpit PostCSS printable plugin', () => {
   const run = (input, opts) =>

test/postcss/pseudo_selector/replace.js

@@ -1,7 +1,7 @@
 import dedent from 'dedent'
 import postcss from 'postcss'
-import replace from '../../../src/postcss/pseudo_selector/replace'
 import { Element } from '../../../src/index'
+import replace from '../../../src/postcss/pseudo_selector/replace'
 
 describe('Marpit PostCSS pseudo selector replace plugin', () => {
   const run = (input, ...opts) =>

test/postcss/root/rem.js

@@ -1,7 +1,7 @@
 import dedent from 'dedent'
 import postcss from 'postcss'
-import { rootFontSizeCustomProp } from '../../../src/postcss/root/replace'
 import rem from '../../../src/postcss/root/rem'
+import { rootFontSizeCustomProp } from '../../../src/postcss/root/replace'
 
 describe('Marpit PostCSS rem plugin', () => {
   const run = (input) => postcss([rem()]).process(input, { from: undefined })

test/postcss/root/replace.js

@@ -1,10 +1,10 @@
 import dedent from 'dedent'
 import postcss from 'postcss'
+import prependSlide from '../../../src/postcss/pseudo_selector/prepend'
+import replaceSlide from '../../../src/postcss/pseudo_selector/replace'
 import replace, {
   rootFontSizeCustomProp,
 } from '../../../src/postcss/root/replace'
-import prependSlide from '../../../src/postcss/pseudo_selector/prepend'
-import replaceSlide from '../../../src/postcss/pseudo_selector/replace'
 
 describe('Marpit PostCSS root replace plugin', () => {
   const run = (input, plugins = []) =>

test/theme.js

@@ -1,6 +1,6 @@
 import dedent from 'dedent'
-import skipThemeValidationSymbol from '../src/theme/symbol'
 import { Theme } from '../src/index'
+import skipThemeValidationSymbol from '../src/theme/symbol'
 
 describe('Theme', () => {
   describe('.fromCSS', () => {

test/theme_set.js

@@ -1,6 +1,6 @@
 import dedent from 'dedent'
-import scaffoldTheme from '../src/theme/scaffold'
 import { ThemeSet, Theme } from '../src/index'
+import scaffoldTheme from '../src/theme/scaffold'
 
 describe('ThemeSet', () => {
   let instance