Use ESM

wooorm · Aug 13, 2021 · 017c33f · 017c33f
1 parent 556d2a7
commit 017c33f
Show file tree

Hide file tree

Showing 22 changed files with 1,094 additions and 865 deletions.
diff --git a/package.json b/package.json
@@ -6,13 +6,14 @@
   "repository": "https://github.com/wooorm/franc",
   "bugs": "https://github.com/wooorm/franc/issues",
   "author": "Titus Wormer <tituswormer@gmail.com> (http://wooorm.com)",
+  "type": "module",
   "devDependencies": {
     "alpha-sort": "^3.0.0",
     "c8": "^7.0.0",
     "format": "^0.2.0",
     "human-format": "^0.11.0",
     "is-hidden": "^1.0.0",
-    "iso-639-3": "^2.0.0",
+    "iso-639-3": "^3.0.0",
     "lerna": "^3.0.0",
     "negate": "^1.0.0",
     "parse-author": "^2.0.0",
@@ -23,7 +24,7 @@
     "remark-lint-table-pipe-alignment": "^2.0.0",
     "remark-preset-wooorm": "^8.0.0",
     "remark-stringify": "^8.0.0",
-    "speakers": "^1.0.0",
+    "speakers": "^2.0.0",
     "tape": "^5.0.0",
     "trigrams": "^4.0.0",
     "udhr": "^4.0.0",
@@ -54,6 +55,8 @@
     "esnext": false,
     "rules": {
       "import/extensions": "off",
+      "import/no-useless-path-segments": "off",
+      "unicorn/import-index": "off",
       "unicorn/no-fn-reference-in-iterator": "off",
       "unicorn/no-hex-escape": "off",
       "unicorn/prefer-includes": "off",

diff --git a/packages/franc-all/data.js b/packages/franc-all/data.js
diff --git a/packages/franc-all/expressions.js b/packages/franc-all/expressions.js
diff --git a/packages/franc-all/package.json b/packages/franc-all/package.json
@@ -12,6 +12,9 @@
     "detect",
     "guess"
   ],
+  "sideEffects": false,
+  "type": "module",
+  "main": "index.js",
   "files": [
     "data.js",
     "expressions.js",

diff --git a/packages/franc-cli/index.js b/packages/franc-cli/index.js
@@ -1,13 +1,15 @@
 #!/usr/bin/env node
-'use strict'
+import {createRequire} from 'node:module'
+import meow from 'meow'
+import franc from 'franc'
 
-var meow = require('meow')
-var franc = require('franc')
-var pack = require('./package')
+const require = createRequire(import.meta.url)
+const pack = require('./package.json')
 
 var command = Object.keys(pack.bin)[0]
 
 var cli = meow(help(), {
+  importMeta: import.meta,
   flags: {
     all: {
       type: 'boolean',

diff --git a/packages/franc-cli/package.json b/packages/franc-cli/package.json
@@ -13,6 +13,8 @@
     "cli",
     "bin"
   ],
+  "type": "module",
+  "main": "index.js",
   "bin": {
     "franc": "index.js"
   },
@@ -21,7 +23,7 @@
   ],
   "dependencies": {
     "franc": "^5.0.0",
-    "meow": "^7.0.0"
+    "meow": "^10.0.0"
   },
   "repository": "https://github.com/wooorm/franc/tree/main/packages/franc-cli",
   "bugs": "https://github.com/wooorm/franc/issues",

diff --git a/packages/franc-min/data.js b/packages/franc-min/data.js
diff --git a/packages/franc-min/expressions.js b/packages/franc-min/expressions.js
diff --git a/packages/franc-min/package.json b/packages/franc-min/package.json
@@ -12,6 +12,9 @@
     "detect",
     "guess"
   ],
+  "sideEffects": false,
+  "type": "module",
+  "main": "index.js",
   "files": [
     "data.js",
     "expressions.js",

diff --git a/packages/franc/data.js b/packages/franc/data.js
diff --git a/packages/franc/expressions.js b/packages/franc/expressions.js
diff --git a/packages/franc/index.js b/packages/franc/index.js
@@ -1,21 +1,21 @@
 'use strict'
 
 /* Load `trigram-utils`. */
-var utilities = require('trigram-utils')
+import utilities from 'trigram-utils'
 
 /* Load `expressions` (regular expressions matching
  * scripts). */
-var expressions = require('./expressions.js')
+import expressions from './expressions.js'
 
 /* Load `data` (trigram information per language,
  * per script). */
-var data = require('./data.js')
+import data from './data.js'
 
 /* Expose `detectAll` on `detect`. */
 detect.all = detectAll
 
 /* Expose `detect`. */
-module.exports = detect
+export default detect
 
 /* Maximum sample length. */
 var MAX_LENGTH = 2048

diff --git a/packages/franc/package.json b/packages/franc/package.json
@@ -12,14 +12,17 @@
     "detect",
     "guess"
   ],
-  "dependencies": {
-    "trigram-utils": "^1.0.0"
-  },
+  "sideEffects": false,
+  "type": "module",
+  "main": "index.js",
   "files": [
     "data.js",
     "expressions.js",
     "index.js"
   ],
+  "dependencies": {
+    "trigram-utils": "^1.0.0"
+  },
   "repository": "https://github.com/wooorm/franc/tree/main/packages/franc",
   "bugs": "https://github.com/wooorm/franc/issues",
   "funding": {