ES module support on Node 16

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.16.1-alpine
+FROM node:16-alpine
 
 LABEL maintainer="madnificent@gmail.com"
 

babel.config.json

@@ -3,8 +3,10 @@
     ["@babel/preset-env",
       {
         "targets": {
-          "node": 14
-        }
+          "node": 16,
+		  "esmodules": true
+        },
+        "modules": false
       }
     ],
     ["@babel/preset-typescript"]

helpers/mu/index.js

@@ -1,6 +1,6 @@
-import { app, errorHandler } from './server';
-import sparql from './sparql';
-import { v1 as uuidV1 } from 'uuid';
+import { app, errorHandler } from "./server.js";
+import sparql from "./sparql.js";
+import { v1 as uuidV1 } from "uuid";
 
 // generates a uuid
 const uuid = uuidV1;
@@ -21,7 +21,7 @@ const mu = {
   sparqlEscapeDateTime: sparql.sparqlEscapeDateTime,
   sparqlEscapeBool: sparql.sparqlEscapeBool,
   uuid,
-  errorHandler
+  errorHandler,
 };
 
 const SPARQL = mu.SPARQL,

package.json

@@ -2,6 +2,7 @@
   "name": "mu-javascript-template",
   "version": "1.6.0",
   "description": "Template for mu services written in JavaScript",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mu-semtech/mu-javascript-template.git"
@@ -18,7 +19,7 @@
     "@babel/preset-env": "^7.14.1",
     "@babel/preset-typescript": "^7.16.7",
     "babel-plugin-module-resolver": "4.1.0",
-    "body-parser": "~1.19.0",
+    "body-parser": "~1.20.0",
     "coffeescript": "^2.6.1",
     "env-var": "^7.0.0",
     "express": "^4.17.1",

transpile-sources.sh

@@ -105,6 +105,10 @@ fi
 ## mu helpers
 cd /usr/src/processing/
 
+## Need the babel config for building mu-package as well
+cp /usr/src/app/package.json /usr/src/processing/helpers/mu/
+cp /usr/src/app/babel.config.json /usr/src/processing/helpers/mu/
+
 mkdir /usr/src/processing/built-mu
 /usr/src/app/node_modules/.bin/babel \
   /usr/src/processing/helpers/mu/ \
@@ -114,7 +118,11 @@ mkdir /usr/src/processing/built-mu
 
 cp -R /usr/src/processing/built-mu /usr/src/build/node_modules/mu
 
+## Put the package.json file in the mu package to make it a proper looking package (also for specifics like `"type": "module"`)
+cp /usr/src/app/package.json /usr/src/build/node_modules/mu/
 
+## Finish by putting the package.json file in the final build to make it a proper module
+cp /usr/src/app/package.json /usr/src/build
 
 ## Clean temporary folders
 ##

tsconfig-base.json

@@ -1,19 +1,18 @@
 {
-  "$schema": "https://json.schemastore.org/tsconfig",
-  "display": "Node 14",
-
-  "compilerOptions": {
-    "lib": ["es2020"],
-    "module": "commonjs",
-    "target": "es2020",
-    "allowJs": true,
-    "noEmit": true,
-
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "declaration": true,
-    "isolatedModules": true
+    "$schema": "https://json.schemastore.org/tsconfig",
+    "display": "Node 16",
+  
+    "compilerOptions": {
+      "lib": ["es2020"],
+      "module": "es2020",
+      "target": "es2020",
+      "allowJs": true,
+      "noEmit": true,
+      "strict": true,
+      "esModuleInterop": true,
+      "skipLibCheck": true,
+      "forceConsistentCasingInFileNames": true,
+      "declaration": true,
+      "isolatedModules": true
+    }
   }
-}