Switch to ESM (#19)

Author: surol

.github/workflows/build.yml

@@ -40,4 +40,6 @@ jobs:
       run: pnpm install
 
     - name: Build the project
+      env:
+        NODE_OPTIONS: --experimental-vm-modules --no-warnings
       run: pnpm ci:all

core/package.json

@@ -1,5 +1,4 @@
 {
-  "main": "../dist/hatsy.core.cjs",
-  "module": "../dist/hatsy.core.js",
+  "main": "../dist/hatsy.core.js",
   "types": "./index.d.ts"
 }

jest.config.cjs jest.config.jsjest.config.cjs renamed to jest.config.js

@@ -1,5 +1,5 @@
-module.exports = {
-  preset: 'ts-jest',
+export default {
+  preset: 'ts-jest/presets/default-esm',
   collectCoverage: true,
   collectCoverageFrom: [
     'src/**/*.ts',
@@ -18,6 +18,7 @@ module.exports = {
       lines: 100,
     },
   },
+  extensionsToTreatAsEsm: ['.ts'],
   reporters: [
     'default',
     [
@@ -32,9 +33,11 @@ module.exports = {
       },
     ],
   ],
+  testEnvironment: 'node',
   globals: {
     'ts-jest': {
       tsconfig: 'tsconfig.spec.json',
+      useESM: true,
     },
   },
 };

package.json

@@ -24,23 +24,13 @@
     "url": "https://github.com/hatsyjs/hatsy/issues"
   },
   "type": "module",
-  "main": "./dist/hatsy.cjs",
-  "module": "./dist/hatsy.js",
+  "main": "./dist/hatsy.js",
   "types": "./index.d.ts",
   "exports": {
-    ".": {
-      "import": "./dist/hatsy.js",
-      "require": "./dist/hatsy.cjs"
-    },
-    "./core": {
-      "import": "./dist/hatsy.core.js",
-      "require": "./dist/hatsy.core.cjs"
-    },
+    ".": "./dist/hatsy.js",
+    "./core": "./dist/hatsy.core.js",
     "./package.json": "./package.json",
-    "./testing": {
-      "import": "./dist/hatsy.testing.js",
-      "require": "./dist/hatsy.testing.cjs"
-    }
+    "./testing": "./dist/hatsy.testing.js"
   },
   "dependencies": {
     "@frontmeans/httongue": "^2.2.0",
@@ -51,26 +41,27 @@
     "node": ">=12"
   },
   "devDependencies": {
+    "@jest/globals": "^27.0.1",
     "@rollup/plugin-commonjs": "^19.0.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@run-z/eslint-config": "^1.2.1",
     "@run-z/rollup-helpers": "^1.1.0",
-    "@types/jest": "^26.0.23",
     "@types/node": "^12.20.13",
     "@typescript-eslint/eslint-plugin": "^4.25.0",
     "@typescript-eslint/parser": "^4.25.0",
     "eslint": "^7.27.0",
     "eslint-plugin-jest": "^24.3.6",
     "gh-pages": "^3.2.0",
-    "jest": "^26.6.3",
+    "jest": "^27.0.1",
     "jest-junit": "^12.1.0",
-    "rollup": "^2.50.0",
+    "jest-mock": "^27.0.1",
+    "rollup": "^2.50.1",
     "rollup-plugin-flat-dts": "^1.2.1",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "rollup-plugin-typescript2": "^0.30.0",
     "run-z": "^1.7.2",
     "shx": "^0.3.3",
-    "ts-jest": "^26.5.6",
+    "ts-jest": "^27.0.0",
     "tslib": "^2.2.0",
     "typedoc": "^0.20.36",
     "typescript": "^4.3.1-rc"

rollup.config.js

@@ -37,37 +37,28 @@ export default {
     }
     return 'hatsy';
   },
-  output: [
-    {
-      dir: 'dist',
-      format: 'cjs',
-      sourcemap: true,
-      entryFileNames: '[name].cjs',
-      chunkFileNames: '_[name].cjs',
-    },
-    {
-      dir: '.',
-      format: 'esm',
-      sourcemap: true,
-      entryFileNames: 'dist/[name].js',
-      chunkFileNames: 'dist/_[name].js',
-      plugins: [
-        flatDts({
-          tsconfig: 'tsconfig.main.json',
-          lib: true,
-          compilerOptions: {
-            declarationMap: true,
+  output: {
+    dir: '.',
+    format: 'esm',
+    sourcemap: true,
+    entryFileNames: 'dist/[name].js',
+    chunkFileNames: 'dist/_[name].js',
+    plugins: [
+      flatDts({
+        tsconfig: 'tsconfig.main.json',
+        lib: true,
+        compilerOptions: {
+          declarationMap: true,
+        },
+        entries: {
+          core: {
+            file: 'core/index.d.ts',
           },
-          entries: {
-            core: {
-              file: 'core/index.d.ts',
-            },
-            testing: {
-              file: 'testing/index.d.ts',
-            },
+          testing: {
+            file: 'testing/index.d.ts',
           },
-        }),
-      ],
-    },
-  ],
+        },
+      }),
+    ],
+  },
 };

src/core/logging/logging.spec.ts

@@ -1,4 +1,6 @@
+import { beforeEach, describe, expect, it, jest } from '@jest/globals';
 import { noop } from '@proc7ts/primitives';
+import type { Mock } from 'jest-mock';
 import type { RequestContext } from '../request-context';
 import type { RequestHandler } from '../request-handler';
 import type { RequestProcessor } from '../request-processor';
@@ -9,7 +11,7 @@ import type { RequestLogger } from './request-logger';
 
 describe('Logging', () => {
 
-  let handler: jest.Mock<void, [RequestContext<LoggerMeans>]>;
+  let handler: Mock<void, [RequestContext<LoggerMeans>]>;
 
   beforeEach(() => {
     handler = jest.fn();

src/core/request-handler.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from '@jest/globals';
 import { valueProvider } from '@proc7ts/primitives';
 import type { ServerResponse } from 'http';
 import type { RequestContext } from './request-context';

src/http/dispatch/dispatch-by-accepted.handler.spec.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from '@jest/globals';
 import type { RequestContext } from '../../core';
 import { Logging } from '../../core';
 import { suppressedLog, TestHttpServer } from '../../testing';

src/http/dispatch/dispatch-by-language.handler.spec.ts

@@ -1,4 +1,5 @@
-import { Logging } from '../../core/logging';
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from '@jest/globals';
+import { Logging } from '../../core';
 import { suppressedLog, TestHttpServer } from '../../testing';
 import { Rendering } from '../render';
 import { dispatchByLanguage } from './dispatch-by-language.handler';

src/http/dispatch/dispatch-by-method.handler.spec.ts

@@ -1,3 +1,4 @@
+import { afterAll, afterEach, beforeAll, describe, expect, it } from '@jest/globals';
 import { noop } from '@proc7ts/primitives';
 import { Logging, RequestContext, requestHandler } from '../../core';
 import { suppressedLog, TestHttpServer } from '../../testing';