Merge pull request #13 from 20minutes/fix/biome

Use Biome instead of ESLint

Author: j0k3r

.swcrc.cjs .cjs.swcrc.swcrc.cjs renamed to .cjs.swcrc

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://swc.rs/schema.json",
   "jsc": {
     "target": "es2022",
     "parser": {

.swcrc.esm .esm.swcrc.swcrc.esm renamed to .esm.swcrc

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://swc.rs/schema.json",
   "jsc": {
     "target": "es2022",
     "parser": {

biome.jsonc

@@ -0,0 +1,11 @@
+{
+  "extends": ["@20minutes/eslint-config/biome"],
+  "javascript": {
+    "jsxRuntime": "reactClassic"
+  },
+  "linter": {
+    "rules": {
+      "a11y": "off"
+    }
+  }
+}

eslint.config.mjs

@@ -16,14 +16,15 @@
   "repository": "20minutes/draft-convert",
   "scripts": {
     "build": "yarn clean && yarn build:esm && yarn build:cjs && yarn build:types",
-    "build:cjs": "swc src -d dist --config-file .swcrc.cjs --strip-leading-paths && node scripts/rename-dist-cjs-entry.js",
-    "build:esm": "swc src -d dist --config-file .swcrc.esm --strip-leading-paths --delete-dir-on-start --out-file-extension mjs && node scripts/fix-dist-esm-imports.js",
+    "build:cjs": "swc src -d dist --config-file .cjs.swcrc --strip-leading-paths && node scripts/rename-dist-cjs-entry.js",
+    "build:esm": "swc src -d dist --config-file .esm.swcrc --strip-leading-paths --delete-dir-on-start --out-file-extension mjs && node scripts/fix-dist-esm-imports.js",
     "build:types": "node scripts/build-dist-types.js",
     "test": "jest",
     "test:watch": "jest --watch",
     "clean": "rimraf ./dist ./lib ./esm",
     "build-and-test": "yarn clean && yarn test",
-    "lint": "eslint src/ test/"
+    "lint": "biome check --max-diagnostics=none",
+    "lint:fix": "biome check --write --unsafe --max-diagnostics=none"
   },
   "files": [
     "dist"
@@ -49,17 +50,11 @@
     "invariant": "^2.2.1"
   },
   "devDependencies": {
-    "@20minutes/eslint-config": "^2.0.0",
+    "@20minutes/eslint-config": "^3.0.0",
     "@swc/cli": "^0.8.0",
     "@swc/core": "^1.9.2",
     "@swc/jest": "^0.2.36",
     "draft-js": "^0.11.7",
-    "eslint": "^9.0.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-react": "7.37.5",
-    "eslint-plugin-react-hooks": "^7.0.1",
     "jest": "^30.2.0",
     "jest-environment-jsdom": "^30.2.0",
     "prettier": "^3.6.2",

package.json

@@ -20,18 +20,15 @@ const rewriteSpecifiers = (source) =>
   source
     .replace(
       /(\bfrom\s+['"])(\.\.?\/[^'"]+)(['"])/g,
-      (full, before, specifier, after) =>
-        `${before}${toMjsSpecifier(specifier)}${after}`
+      (_full, before, specifier, after) => `${before}${toMjsSpecifier(specifier)}${after}`
     )
     .replace(
       /(\bimport\s*['"])(\.\.?\/[^'"]+)(['"])/g,
-      (full, before, specifier, after) =>
-        `${before}${toMjsSpecifier(specifier)}${after}`
+      (_full, before, specifier, after) => `${before}${toMjsSpecifier(specifier)}${after}`
     )
     .replace(
       /(\bimport\s*\(\s*['"])(\.\.?\/[^'"]+)(['"]\s*\))/g,
-      (full, before, specifier, after) =>
-        `${before}${toMjsSpecifier(specifier)}${after}`
+      (_full, before, specifier, after) => `${before}${toMjsSpecifier(specifier)}${after}`
     )
 
 const walkFiles = (directory) =>

scripts/fix-dist-esm-imports.js

@@ -1,9 +1,9 @@
-import updateMutation from './util/updateMutation.js'
-import rangeSort from './util/rangeSort.js'
 import getElementHTML from './util/getElementHTML.js'
 import getElementTagLength from './util/getElementTagLength.js'
+import rangeSort from './util/rangeSort.js'
+import updateMutation from './util/updateMutation.js'
 
-const converter = (entity = {}, originalText = '') => originalText
+const converter = (_entity = {}, originalText = '') => originalText
 
 export default (block, entityMap, entityConverter = converter) => {
   let resultText = [...block.text]
@@ -14,10 +14,7 @@ export default (block, entityMap, entityConverter = converter) => {
     getEntityHTML = entityConverter(converter)
   }
 
-  if (
-    Object.prototype.hasOwnProperty.call(block, 'entityRanges') &&
-    block.entityRanges.length > 0
-  ) {
+  if (Object.hasOwn(block, 'entityRanges') && block.entityRanges.length > 0) {
     let entities = block.entityRanges.sort(rangeSort)
 
     let styles = block.inlineStyleRanges
@@ -43,7 +40,7 @@ export default (block, entityMap, entityConverter = converter) => {
       const suffixLength = getElementTagLength(entityHTML, 'end')
 
       const updateLaterMutation = (mutation, mutationIndex) => {
-        if (mutationIndex > index || Object.prototype.hasOwnProperty.call(mutation, 'style')) {
+        if (mutationIndex > index || Object.hasOwn(mutation, 'style')) {
           return updateMutation(
             mutation,
             entityRange.offset,

src/blockEntities.js

@@ -1,9 +1,9 @@
 import invariant from 'invariant'
-import styleObjectFunction from './util/styleObjectFunction.js'
+import defaultInlineHTML from './default/defaultInlineHTML.js'
 import accumulateFunction from './util/accumulateFunction.js'
 import getElementHTML from './util/getElementHTML.js'
 import rangeSort from './util/rangeSort.js'
-import defaultInlineHTML from './default/defaultInlineHTML.js'
+import styleObjectFunction from './util/styleObjectFunction.js'
 
 const subtractStyles = (original, toRemove) =>
   original.filter((el) => !toRemove.some((elToRemove) => elToRemove.style === el.style))

src/blockInlineStyles.js

@@ -10,15 +10,11 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-// immutable is CJS-only; default import maps to module.exports for Node ESM interop.
-// eslint-disable-next-line import/default
-import Immutable from 'immutable'
 import DraftJS from 'draft-js'
+import Immutable from 'immutable'
 import getSafeBodyFromHTML from './util/parseHTML.js'
 import rangeSort from './util/rangeSort.js'
 
-// eslint-disable-next-line import/no-named-as-default-member
-const { List, Map, OrderedSet } = Immutable
 const {
   BlockMapBuilder,
   CharacterMetadata,
@@ -63,13 +59,13 @@ const handleMiddleware = (maybeMiddleware, base) => {
   return maybeMiddleware
 }
 
-const defaultHTMLToBlock = (nodeName, node, lastList) => undefined
+const defaultHTMLToBlock = (_nodeName, _node, _lastList) => undefined
 
-const defaultHTMLToStyle = (nodeName, node, currentStyle) => currentStyle
+const defaultHTMLToStyle = (_nodeName, _node, currentStyle) => currentStyle
 
-const defaultHTMLToEntity = (nodeName, node) => undefined
+const defaultHTMLToEntity = (_nodeName, _node) => undefined
 
-const defaultTextToEntity = (text) => []
+const defaultTextToEntity = (_text) => []
 
 const nullthrows = (x) => {
   if (x != null) {
@@ -97,17 +93,17 @@ function getWhitespaceChunk(inEntity) {
 
   return {
     text: SPACE,
-    inlines: [OrderedSet()],
+    inlines: [Immutable.OrderedSet()],
     entities,
     blocks: [],
   }
 }
 
-function getSoftNewlineChunk(block, depth, flat = false, data = Map()) {
+function getSoftNewlineChunk(block, depth, flat = false, data = Immutable.Map()) {
   if (flat === true) {
     return {
       text: '\r',
-      inlines: [OrderedSet()],
+      inlines: [Immutable.OrderedSet()],
       entities: new Array(1),
       blocks: [
         {
@@ -122,16 +118,16 @@ function getSoftNewlineChunk(block, depth, flat = false, data = Map()) {
 
   return {
     text: '\n',
-    inlines: [OrderedSet()],
+    inlines: [Immutable.OrderedSet()],
     entities: new Array(1),
     blocks: [],
   }
 }
 
-function getBlockDividerChunk(block, depth, data = Map()) {
+function getBlockDividerChunk(block, depth, data = Immutable.Map()) {
   return {
     text: '\r',
-    inlines: [OrderedSet()],
+    inlines: [Immutable.OrderedSet()],
     entities: new Array(1),
     blocks: [
       {
@@ -175,7 +171,7 @@ function getBlockTypeForTag(tag, lastList) {
   }
 }
 
-function baseCheckBlockType(nodeName, node, lastList) {
+function baseCheckBlockType(nodeName, _node, lastList) {
   return getBlockTypeForTag(nodeName, lastList)
 }
 
@@ -209,7 +205,7 @@ function processInlineTag(tag, node, currentStyle) {
   return currentStyle
 }
 
-function baseProcessInlineTag(tag, node, inlineStyles = OrderedSet()) {
+function baseProcessInlineTag(tag, node, inlineStyles = Immutable.OrderedSet()) {
   return processInlineTag(tag, node, inlineStyles)
 }
 
@@ -376,10 +372,10 @@ function genFragment(
 
   if (typeof blockInfo === 'string') {
     blockType = blockInfo
-    blockDataMap = Map()
+    blockDataMap = Immutable.Map()
   } else {
     blockType = typeof blockInfo === 'string' ? blockInfo : blockInfo.type
-    blockDataMap = blockInfo.data ? Map(blockInfo.data) : Map()
+    blockDataMap = blockInfo.data ? Immutable.Map(blockInfo.data) : Immutable.Map()
   }
   if (!inBlock && (fragmentBlockTags.indexOf(nodeName) !== -1 || blockType)) {
     chunk = getBlockDividerChunk(
@@ -472,10 +468,10 @@ function genFragment(
 
         if (typeof newBlockInfo === 'string') {
           newBlockType = newBlockInfo
-          newBlockData = Map()
+          newBlockData = Immutable.Map()
         } else {
           newBlockType = newBlockInfo.type || getBlockTypeForTag(nodeName, lastList)
-          newBlockData = newBlockInfo.data ? Map(newBlockInfo.data) : Map()
+          newBlockData = newBlockInfo.data ? Immutable.Map(newBlockInfo.data) : Immutable.Map()
         }
 
         chunk = joinChunks(
@@ -492,7 +488,11 @@ function genFragment(
   }
 
   if (newBlock) {
-    chunk = joinChunks(chunk, getBlockDividerChunk(nextBlockType, depth, Map()), options.flat)
+    chunk = joinChunks(
+      chunk,
+      getBlockDividerChunk(nextBlockType, depth, Immutable.Map()),
+      options.flat
+    )
   }
 
   return chunk
@@ -527,7 +527,7 @@ function getChunkForHTML(
   // UL block to sta rt with.
   let chunk = genFragment(
     safeBody,
-    OrderedSet(),
+    Immutable.OrderedSet(),
     'ul',
     null,
     workingBlocks,
@@ -563,14 +563,14 @@ function getChunkForHTML(
 
   // If we saw no block tags, put an unstyled one in
   if (chunk.blocks.length === 0) {
-    chunk.blocks.push({ type: 'unstyled', data: Map(), depth: 0 })
+    chunk.blocks.push({ type: 'unstyled', data: Immutable.Map(), depth: 0 })
   }
 
   // Sometimes we start with text that isn't in a block, which is then
   // followed by blocks. Need to fix up the blocks to add in
   // an unstyled block for this content
   if (chunk.text.split('\r').length === chunk.blocks.length + 1) {
-    chunk.blocks.unshift({ type: 'unstyled', data: Map(), depth: 0 })
+    chunk.blocks.unshift({ type: 'unstyled', data: Immutable.Map(), depth: 0 })
   }
 
   return chunk
@@ -619,7 +619,7 @@ function convertFromHTMLtoContentBlocks(
     const end = start + textBlock.length
     const inlines = nullthrows(chunk).inlines.slice(start, end)
     const entities = nullthrows(chunk).entities.slice(start, end)
-    const characterList = List(
+    const characterList = Immutable.List(
       inlines.map((style, entityIndex) => {
         const data = { style, entity: null }
         if (entities[entityIndex]) {

src/convertFromHTML.js

@@ -1,20 +1,20 @@
+import DraftJS from 'draft-js'
 import invariant from 'invariant'
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import DraftJS from 'draft-js'
-import encodeBlock from './encodeBlock.js'
 import blockEntities from './blockEntities.js'
 import blockInlineStyles from './blockInlineStyles.js'
+import defaultBlockHTML from './default/defaultBlockHTML.js'
+import encodeBlock from './encodeBlock.js'
 import accumulateFunction from './util/accumulateFunction.js'
 import blockTypeObjectFunction from './util/blockTypeObjectFunction.js'
 import getBlockTags from './util/getBlockTags.js'
 import getNestedBlockTags from './util/getNestedBlockTags.js'
-import defaultBlockHTML from './default/defaultBlockHTML.js'
 
 const { convertToRaw } = DraftJS
 
-const defaultEntityToHTML = (entity, originalText) => originalText
-const defaultValidateHTML = (html) => true
+const defaultEntityToHTML = (_entity, originalText) => originalText
+const defaultValidateHTML = (_html) => true
 
 const convertToHTML =
   ({
@@ -99,7 +99,7 @@ const convertToHTML =
           html = blockHTML.start + innerHTML + blockHTML.end
         }
 
-        if (innerHTML.length === 0 && Object.prototype.hasOwnProperty.call(blockHTML, 'empty')) {
+        if (innerHTML.length === 0 && Object.hasOwn(blockHTML, 'empty')) {
           if (React.isValidElement(blockHTML.empty)) {
             html = ReactDOMServer.renderToStaticMarkup(blockHTML.empty)
           } else {
@@ -127,11 +127,7 @@ const convertToHTML =
   }
 
 export default (...args) => {
-  if (
-    args.length === 1 &&
-    Object.prototype.hasOwnProperty.call(args[0], '_map') &&
-    args[0].getBlockMap != null
-  ) {
+  if (args.length === 1 && Object.hasOwn(args[0], '_map') && args[0].getBlockMap != null) {
     // skip higher-order function and use defaults
     return convertToHTML({})(...args)
   }