Use and support ESM

Author: zodern

.eslintrc.yml

@@ -58,7 +58,6 @@ rules:
   comma-style:
   - 2
   - last
-  complexity: [1, 9]
   computed-property-spacing:
   - 2
   - never

index.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require('./lib');
+import './src/index.js';

package-lock.json

@@ -3,6 +3,7 @@
   "version": "1.5.11",
   "description": "Production Quality Meteor Deployments",
   "main": "lib/index.js",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/zodern/meteor-up.git"
@@ -22,13 +23,10 @@
     "mup": "./index.js"
   },
   "scripts": {
-    "prepare": "npm run build -s",
-    "build": "babel src --out-dir lib --copy-files --source-maps",
-    "build:watch": "npm run build -s -- -w",
     "test": "node ./tests/run.js",
-    "test:module": "mocha --require @babel/register",
+    "test:module": "mocha",
     "test:parallel": "bash ./tests/run-parallel.sh",
-    "test:unit": "cross-env NODE_ENV=test nyc --all mocha --require @babel/register src/**/*.unit.js",
+    "test:unit": "cross-env NODE_ENV=test nyc --all mocha src/**/*.unit.js",
     "lint": "npm run lint:code && npm run lint:defaultConfig && npm run lint:readme && npm run lint:css && npm run lint:docs-configs",
     "lint:defaultConfig": "eslint --ext=\".sample\" -c .eslintrc.yml --rule=\"comma-dangle: 0\" .",
     "lint:code": "eslint .",
@@ -40,38 +38,31 @@
     "clean-shrinkwrap": "cd tests && node clean-shrinkwrap.js"
   },
   "devDependencies": {
-    "@babel/cli": "^7.25.7",
-    "@babel/core": "^7.25.7",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-    "@babel/plugin-transform-modules-commonjs": "^7.25.7",
-    "@babel/register": "^7.25.7",
-    "babel-eslint": "^10.1.0",
-    "babel-plugin-istanbul": "^6.0.0",
     "chai": "^4.2.0",
-    "chai-string": "^1.5.0",
+    "chai-string": "^1.6.0",
     "cross-env": "^6.0.3",
     "eslint": "^4.19.1",
     "eslint-config-es": "^0.8.12",
-    "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-markdown": "^1.0.2",
     "gfm-code-blocks": "^1.0.0",
     "keypair": "^1.0.1",
-    "mocha": "^6.2.3",
+    "mocha": "^7.2.0",
     "node-forge": "^0.7.1",
     "nyc": "^15.0.1",
     "sinon": "^7.5.0",
-    "stylelint": "^16.9.0",
-    "stylelint-config-standard": "^36.0.1"
+    "stylelint": "^17.3.0",
+    "stylelint-config-standard": "^40.0.0"
   },
   "dependencies": {
     "@hapi/joi": "^15.1.1",
     "@zodern/nodemiral": "^2.0.0-beta.1",
     "axios": "^0.28.1",
+    "babel-eslint": "^10.1.0",
     "bluebird": "^3.7.2",
     "boxen": "^4.2.0",
     "chalk": "^3.0.0",
-    "debug": "^4.1.1",
+    "debug": "^4.4.3",
+    "eslint-plugin-babel": "^5.3.1",
     "expand-tilde": "^2.0.2",
     "global-modules": "^2.0.0",
     "lodash": "^4.17.21",
@@ -81,11 +72,11 @@
     "resolve-from": "^5.0.0",
     "shell-escape": "^0.2.0",
     "shelljs": "^0.8.5",
-    "ssh2": "^1.16.0",
+    "ssh2": "^1.17.0",
     "tar": "6.2",
-    "traverse": "^0.6.6",
+    "traverse": "^0.6.11",
     "uuid": "^7.0.3",
-    "www-authenticate": "^0.6.2",
+    "www-authenticate": "^0.6.3",
     "yargs": "^15.4.1"
   },
   "nyc": {

package.json

@@ -1,4 +1,4 @@
-import registerCommand, { commands, registerCommandOverrides } from '../commands';
+import registerCommand, { commands, registerCommandOverrides } from '../commands.js';
 import assert from 'assert';
 import sinon from 'sinon';
 

src/__tests__/commands.unit.js

@@ -1,4 +1,4 @@
-import { hooks, registerHook } from '../hooks';
+import { hooks, registerHook } from '../hooks.js';
 import assert from 'assert';
 
 describe('hooks', () => {

src/__tests__/hooks.unit.js

@@ -1,5 +1,7 @@
-import modules, { locatePluginDir } from '../load-plugins';
-import { expect } from 'chai';
+import modules, { locatePluginDir } from '../load-plugins.js';
+import chai from 'chai';
+
+const { expect } = chai;
 
 describe('load-plugins', () => {
   it('should load included plugins', () => {

src/__tests__/load-plugins.unit.js

@@ -1,12 +1,17 @@
-import * as validate from '../validate';
-import { commands } from '../commands';
-import { expect } from 'chai';
+import * as validate from '../validate/index.js';
+import chai from 'chai';
+import { commands } from '../commands.js';
+import { fileURLToPath } from 'url';
 import fs from 'fs';
-import { hooks } from '../hooks';
+import { hooks } from '../hooks.js';
 import path from 'path';
-import PluginAPI from '../plugin-api';
+import PluginAPI from '../plugin-api.js';
 import sinon from 'sinon';
 
+const { expect } = chai;
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
 describe('PluginAPI', () => {
   let api;
   const base = path.join(__dirname, '../../tests/fixtures/project-unit-tests');
@@ -131,25 +136,27 @@ describe('PluginAPI', () => {
   });
 
   describe('validateConfig', () => {
-    const errors = { errors: ['error1', 'error2'], depreciations: [] };
-    let validatorStub;
     let totalConsoleOutput = '';
     let consoleStub;
+    let oldMongoValidator = validate._pluginValidators.mongo;
 
     beforeEach(() => {
       totalConsoleOutput = '';
-      validatorStub = sinon.stub(validate, 'default').returns(errors);
       consoleStub = sinon.stub(console, 'log').callsFake((...text) => {
         totalConsoleOutput += text.join(' ');
       });
     });
 
     afterEach(() => {
-      validatorStub.restore();
       consoleStub.restore();
+      validate._pluginValidators.mongo = oldMongoValidator;
     });
 
     it('should show validation errors', () => {
+      validate._pluginValidators.mongo = [function() {
+        return [{ message: 'error1' }, { message: 'error2' }];
+      }];
+
       api.validateConfig(api.configPath);
       consoleStub.restore();
 
@@ -158,9 +165,6 @@ describe('PluginAPI', () => {
     });
 
     it('should show nothing when config is valid', () => {
-      errors.errors = [];
-      errors.depreciations = [];
-
       api.validateConfig(api.configPath);
 
       expect(totalConsoleOutput).to.equal('');
@@ -256,7 +260,7 @@ describe('PluginAPI', () => {
 
     it('should update commandHistory', () => {
       api.runCommand('test.logs');
-      expect(api.commandHistory).to.deep.equal([{name: 'test.logs'}]);
+      expect(api.commandHistory).to.deep.equal([{ name: 'test.logs' }]);
     });
   });
 

src/__tests__/plugin-api.unit.js

@@ -1,5 +1,7 @@
-import { _configPreps, registerPreparer, runConfigPreps } from '../prepare-config';
-import { expect } from 'chai';
+import { _configPreps, registerPreparer, runConfigPreps } from '../prepare-config.js';
+import chai from 'chai';
+
+const { expect } = chai;
 
 describe('prepare-config', () => {
   beforeEach(() => {

src/__tests__/prepare-config.unit.js

@@ -1,5 +1,7 @@
-import { _configScrubbers, registerScrubber, scrubConfig, utils } from '../scrub-config';
-import { expect } from 'chai';
+import { _configScrubbers, registerScrubber, scrubConfig, utils } from '../scrub-config.js';
+import chai from 'chai';
+
+const { expect } = chai;
 
 describe('scrub-config', () => {
   beforeEach(() => {