es6 modules revamp

.nycrc

@@ -2,6 +2,7 @@
 	"check-coverage": false,
 	"reporter": ["text-summary", "html", "json", "lcov"],
 	"exclude": [
-		"test"
+		"test",
+        "lib"
 	]
 }

eslint.config.js

@@ -0,0 +1,14 @@
+import globals from "globals";
+
+export default [
+    {
+        files: ["src/*.js", "test/*.js"],
+        languageOptions: {
+            ecmaVersion: "latest",
+            sourceType: "module",
+            globals: {
+                ...globals.node
+            }
+        }
+    }
+];

package.json

@@ -1,12 +1,9 @@
 {
 	"name": "language-tags",
 	"version": "1.0.9",
-	"implements": [
-		"CommonJS/Modules/1.0"
-	],
 	"description": "Work with IANA language tags.",
 	"main": "lib/index.js",
-	"type": "commonjs",
+	"type": "module",
 	"homepage": "https://github.com/mattcg/language-tags",
 	"author": "Matthew Caruana Galizia <[email protected]>",
 	"repository": {
@@ -21,8 +18,8 @@
 		"prepublishOnly": "npm run build",
 		"prebuild": "rimraf lib && mkdirp lib",
 		"build": "babel src -d lib",
-		"lint": "eslint --ext=js,mjs .",
-		"tests-only": "nyc mocha --recursive test",
+		"lint": "eslint ./src ./test",
+		"tests-only": "nyc mocha",
 		"pretest": "npm run lint",
 		"test": "npm run tests-only"
 	},
@@ -41,37 +38,16 @@
 		"@babel/cli": "^7.22.10",
 		"@babel/preset-env": "^7.22.10",
 		"coveralls": "^3.1.1",
-		"eslint": "^8.47.0",
-		"mkdirp": "^0.5.6",
-		"mocha": "^3.5.3",
-		"nyc": "^10.3.2",
-		"rimraf": "^2.7.1"
+		"eslint": "^9.17.0",
+		"mkdirp": "^3.0.1",
+		"mocha": "^11.0.1",
+		"nyc": "^17.1.0",
+		"rimraf": "^6.0.1"
 	},
 	"files": [
 		"/lib"
 	],
 	"engines": {
 		"node": ">=0.10"
-	},
-	"eslintConfig": {
-		"parserOptions": {
-			"ecmaVersion": 2022,
-			"sourceType": "script"
-		},
-		"env": {
-			"node": true
-		},
-		"ignorePatterns": [
-			"!.babelrc.js"
-		],
-		"overrides": [
-			{
-				"files": "test/**",
-				"globals": {
-					"suite": false,
-					"test": false
-				}
-			}
-		]
 	}
 }

src/Subtag.js

@@ -6,10 +6,10 @@
 
 'use strict';
 
-var index = require('language-subtag-registry/data/json/index.json');
-var registry = require('language-subtag-registry/data/json/registry.json');
+import index from 'language-subtag-registry/data/json/index.json' with { type: 'json' };
+import registry from 'language-subtag-registry/data/json/registry.json' with { type: 'json' };
 
-class Subtag {
+export default class Subtag {
 	static ERR_NONEXISTENT = 1;
 	static ERR_TAG = 2;
 
@@ -119,5 +119,3 @@ class Subtag {
 		return this.format();
 	}
 }
-
-module.exports = Subtag;

src/Tag.js

@@ -6,12 +6,12 @@
 
 'use strict';
 
-var index = require('language-subtag-registry/data/json/index.json');
-var registry = require('language-subtag-registry/data/json/registry.json');
+import index from 'language-subtag-registry/data/json/index.json' with { type: 'json' };
+import registry from 'language-subtag-registry/data/json/registry.json' with { type: 'json' };
 
-var Subtag = require('./Subtag.js');
+import Subtag from './Subtag.js';
 
-class Tag {
+export default class Tag {
 	static ERR_DEPRECATED = 1;
 	static ERR_NO_LANGUAGE = 2;
 	static ERR_UNKNOWN = 3;
@@ -403,5 +403,3 @@ class Tag {
 		});
 	}
 }
-
-module.exports = Tag;

src/index.js

@@ -6,17 +6,19 @@
 
 'use strict';
 
-var Tag = require('./Tag.js');
-var Subtag = require('./Subtag.js');
+import Tag from './Tag.js';
+import Subtag from './Subtag.js';
 
-var index = require('language-subtag-registry/data/json/index.json');
-var registry = require('language-subtag-registry/data/json/registry.json');
+import index from 'language-subtag-registry/data/json/index.json' with { type: 'json' };
+import registry from 'language-subtag-registry/data/json/registry.json' with { type: 'json' };
+import meta from 'language-subtag-registry/data/json/meta.json' with { type: 'json' };
+import macrolanguages from 'language-subtag-registry/data/json/macrolanguage.json' with { type: 'json' };
 
-var tags = function(tag) {
+const tags = function(tag) {
 	return new Tag(tag);
 };
 
-module.exports = tags;
+export default tags;
 
 tags.check = function(tag) {
 	return new Tag(tag).valid();
@@ -103,7 +105,7 @@ tags.languages = function(macrolanguage) {
 	var i, l, record, results = [];
 
 	macrolanguage = macrolanguage.toLowerCase();
-	if (!require('language-subtag-registry/data/json/macrolanguage.json')[macrolanguage]) {
+	if (!macrolanguages[macrolanguage]) {
 		throw new Error('\'' + macrolanguage + '\' is not a macrolanguage.');
 	}
 
@@ -136,5 +138,5 @@ tags.type = function(subtag, type) {
 };
 
 tags.date = function() {
-	return require('language-subtag-registry/data/json/meta.json')['File-Date'];
+	return meta['File-Date'];
 };

test/lib/SubtagTest.js → test/src/SubtagTest.js

@@ -6,8 +6,9 @@
 
 'use strict';
 
-var assert = require('assert');
-var Subtag = require('../../lib/Subtag');
+import assert from 'assert';
+import {describe, it} from 'mocha';
+import Subtag from '../../src/Subtag.js';
 
 describe('Subtag', function () {
 	it('subtag.type() returns type', function() {

test/lib/TagTest.js → test/src/TagTest.js

@@ -6,8 +6,9 @@
 
 'use strict';
 
-var assert = require('assert');
-var Tag = require('../../lib/Tag');
+import assert from 'assert';
+import {describe, it} from 'mocha';
+import Tag from '../../src/Tag.js';
 
 describe('Tag', function () {
 	it('tag.type() returns \'grandfathered\'', function() {

test/lib/index-test.js → test/src/index-test.js

@@ -6,8 +6,9 @@
 
 'use strict';
 
-var assert = require('assert');
-var tags = require('../../lib');
+import assert from 'assert';
+import {describe, it} from 'mocha';
+import tags from '../../src/index.js';
 
 describe('tags', function () {
 	it('date() returns file date', function() {