feat: Convert to ESM (#297)

* feat: Convert to ESM * fix: Adjusting linting to ESM module structure Co-authored-by: Trygve Lie <trygve.lie@finn.no>
eik-lib · Jan 7, 2022 · 86c5cb3 · 86c5cb3
1 parent 3ebd04d
commit 86c5cb3
Show file tree

Hide file tree

Showing 85 changed files with 547 additions and 688 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,11 +1,20 @@
 {
+  "parser": "@babel/eslint-parser",
   "extends": ["airbnb-base", "prettier"],
   "plugins": ["prettier"],
+  "parserOptions": {
+    "ecmaVersion": 11,
+    "sourceType": "module",
+    "requireConfigFile": false
+  },
   "rules": {
-    "strict": [0, "global"],
+    "import/prefer-default-export": "off",
+    "import/extensions": ["error", {
+      "js": "ignorePackages"
+      }
+    ],
     "class-methods-use-this": [0],
     "no-underscore-dangle": [0],
-    "no-restricted-syntax": [0],
-    "import/extensions": [0]
+    "no-restricted-syntax": [0]
   }
 }
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,7 +14,7 @@ jobs:
   - name: Setup Node.js
     uses: actions/setup-node@v2
     with:
-      node-version: 14.x
+      node-version: 16.x
   - name: npm install
     run: |
       npm install
@@ -35,7 +35,7 @@ jobs:
   - name: Setup Node.js
     uses: actions/setup-node@v2
     with:
-      node-version: 14.x
+      node-version: 16.x
   - name: npm install
     run: |
       npm install

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x]
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}

diff --git a/examples/auth.post.js b/examples/auth.post.js
@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/examples/map.alias.delete.js b/examples/map.alias.delete.js
@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/examples/map.alias.get.js b/examples/map.alias.get.js
@@ -1,9 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const fetch = require('node-fetch');
+import fetch from 'node-fetch';
 
 fetch('http://localhost:4001/map/buzz/v4', {
     method: 'GET',

diff --git a/examples/map.alias.post.js b/examples/map.alias.post.js
@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/examples/map.alias.put.js b/examples/map.alias.put.js
@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/examples/map.etag.get.js b/examples/map.etag.get.js
@@ -1,9 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const fetch = require('node-fetch');
+import fetch from 'node-fetch';
 
 const get = async () => {
 

diff --git a/examples/map.get.js b/examples/map.get.js
@@ -1,9 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const fetch = require('node-fetch');
+import fetch from 'node-fetch';
 
 fetch('http://localhost:4001/map/buzz/4.2.2', {
     method: 'GET',

diff --git a/examples/map.put.js b/examples/map.put.js
@@ -1,11 +1,9 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
-const fs = require('fs');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
+import fs from 'node:fs';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/examples/npm.alias.delete.js b/examples/npm.alias.delete.js
@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/examples/npm.alias.get.js b/examples/npm.alias.get.js
@@ -1,9 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const fetch = require('node-fetch');
+import fetch from 'node-fetch';
 
 fetch('http://localhost:4001/npm/fuzz/v8/main/index.js', {
     method: 'GET',

diff --git a/examples/npm.alias.post.js b/examples/npm.alias.post.js
@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/examples/npm.alias.put.js b/examples/npm.alias.put.js
@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/examples/npm.get.js b/examples/npm.get.js
@@ -1,9 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const fetch = require('node-fetch');
+import fetch from 'node-fetch';
 
 fetch('http://localhost:4001/npm/fuzz/8.4.1/main/index.js', {
     method: 'GET',

diff --git a/examples/npm.put.js b/examples/npm.put.js
@@ -1,11 +1,9 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
-const fs = require('fs');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
+import fs from 'node:fs';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/examples/pkg.alias.delete.js b/examples/pkg.alias.delete.js
@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/examples/pkg.alias.get.js b/examples/pkg.alias.get.js
@@ -1,9 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const fetch = require('node-fetch');
+import fetch from 'node-fetch';
 
 fetch('http://localhost:4001/pkg/fuzz/v8/main/index.js', {
     method: 'GET',

diff --git a/examples/pkg.alias.post.js b/examples/pkg.alias.post.js
@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/examples/pkg.alias.put.js b/examples/pkg.alias.put.js
@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/examples/pkg.etag.get.js b/examples/pkg.etag.get.js
@@ -1,9 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const fetch = require('node-fetch');
+import fetch from 'node-fetch';
 
 const get = async () => {
 

diff --git a/examples/pkg.get.js b/examples/pkg.get.js
@@ -1,9 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const fetch = require('node-fetch');
+import fetch from 'node-fetch';
 
 fetch('http://localhost:4001/pkg/fuzz/8.4.1/main/index.js', {
     method: 'GET',

diff --git a/examples/pkg.put.js b/examples/pkg.put.js
@@ -1,11 +1,9 @@
 /* eslint-disable no-console */
 /* eslint-disable import/no-extraneous-dependencies */
 
-'use strict';
-
-const FormData = require('form-data');
-const fetch = require('node-fetch');
-const fs = require('fs');
+import FormData from 'form-data';
+import fetch from 'node-fetch';
+import fs from 'node:fs';
 
 const authenticate = async (address) => {
     const formData = new FormData();

diff --git a/lib/classes/alias.js b/lib/classes/alias.js
@@ -1,5 +1,3 @@
-'use strict';
-
 const Alias = class Alias {
     constructor({ name = '', type = '', alias = '', org = '' } = {}) {
         this._version = '';
@@ -47,4 +45,5 @@ const Alias = class Alias {
         return 'Alias';
     }
 }
-module.exports = Alias;
+
+export default Alias;
diff --git a/lib/classes/asset.js b/lib/classes/asset.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const mime = require('mime/lite');
-const path = require('path');
+import mime from 'mime';
+import path from 'node:path';
 
 /**
  * Meta information about an Asset.
@@ -95,4 +93,5 @@ const Asset = class Asset {
         return 'Asset';
     }
 }
-module.exports = Asset;
+
+export default Asset;
diff --git a/lib/classes/author.js b/lib/classes/author.js
@@ -1,5 +1,3 @@
-'use strict';
-
 const Author = class Author {
     constructor({ name = '', user = '' } = {}) {
         this._name = name;
@@ -25,4 +23,5 @@ const Author = class Author {
         return 'Author';
     }
 }
-module.exports = Author;
+
+export default Author;
diff --git a/lib/classes/http-incoming.js b/lib/classes/http-incoming.js
@@ -1,5 +1,3 @@
-'use strict';
-
 /**
  * A bearer object to hold misc data through a http
  * request / response cyclus.
@@ -70,4 +68,5 @@ const HttpIncoming = class HttpIncoming {
         return 'HttpIncoming';
     }
 };
-module.exports = HttpIncoming;
+
+export default HttpIncoming;
diff --git a/lib/classes/http-outgoing.js b/lib/classes/http-outgoing.js
@@ -1,6 +1,4 @@
-'use strict';
-
-const { stream } = require('@eik/common');
+import { stream } from '@eik/common';
 
 const STATUS_CODES = [
     100, 101, 102, 103,
@@ -88,4 +86,4 @@ const HttpOutgoing = class HttpOutgoing {
         return 'HttpOutgoing';
     }
 }
-module.exports = HttpOutgoing;
+export default HttpOutgoing;
diff --git a/lib/classes/meta.js b/lib/classes/meta.js
@@ -1,5 +1,3 @@
-'use strict';
-
 const Meta = class Meta {
     constructor({
         value = '',
@@ -28,4 +26,5 @@ const Meta = class Meta {
         return 'Meta';
     }
 }
-module.exports = Meta;
+
+export default Meta;