Switch to ESM

Makefile

@@ -30,7 +30,7 @@ dist/build: ${SOURCE_FILES}
 	./node_modules/.bin/tsc
 	touch dist/build
 
-browser/oauth2-client.min.js: ${SOURCE_FILES}
+browser/oauth2-client.min.js: ${SOURCE_FILES} webpack.config.js
 	mkdir -p browser
 	./node_modules/.bin/webpack
 

src/client.ts

@@ -1,4 +1,4 @@
-import { OAuth2Token } from './token';
+import { OAuth2Token } from './token.js';
 import {
   AuthorizationCodeRequest,
   ClientCredentialsRequest,
@@ -10,9 +10,9 @@ import {
   RevocationRequest,
   ServerMetadataResponse,
   TokenResponse,
-} from './messages';
-import { OAuth2HttpError } from './error';
-import { OAuth2AuthorizationCodeClient } from './client/authorization-code';
+} from './messages.js';
+import { OAuth2HttpError } from './error.js';
+import { OAuth2AuthorizationCodeClient } from './client/authorization-code.js';
 
 
 type ClientCredentialsParams = {

src/client/authorization-code.ts

@@ -1,7 +1,7 @@
-import { OAuth2Client } from '../client';
-import { OAuth2Token } from '../token';
-import { AuthorizationCodeRequest } from '../messages';
-import { OAuth2Error } from '../error';
+import { OAuth2Client } from '../client.js';
+import { OAuth2Token } from '../token.js';
+import { AuthorizationCodeRequest } from '../messages.js';
+import { OAuth2Error } from '../error.js';
 
 type GetAuthorizeUrlParams = {
   /**
@@ -238,8 +238,8 @@ async function getWebCrypto(): Promise<typeof window.crypto> {
   }
   // Node
   // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const crypto = require('crypto');
-  return crypto.webcrypto;
+  const crypto = await import('crypto');
+  return crypto.webcrypto as typeof window.crypto;
 
 }
 

src/error.ts

@@ -1,4 +1,4 @@
-import { OAuth2ErrorCode } from './messages';
+import { OAuth2ErrorCode } from './messages.js';
 
 /**
  * An error class for any error the server emits.

src/fetch-wrapper.ts

@@ -1,5 +1,5 @@
-import { OAuth2Token } from './token';
-import { OAuth2Client } from './client';
+import { OAuth2Token } from './token.js';
+import { OAuth2Client } from './client.js';
 
 type FetchMiddleware = (request: Request, next: (request: Request) => Promise<Response>) => Promise<Response>;
 

src/index.ts

@@ -1,7 +1,7 @@
-export { OAuth2Client } from './client';
-export { OAuth2AuthorizationCodeClient, generateCodeVerifier } from './client/authorization-code';
-export { OAuth2Fetch } from './fetch-wrapper';
-export { OAuth2Token } from './token';
-export { OAuth2Error, OAuth2HttpError } from './error';
+export { OAuth2Client } from './client.js';
+export { OAuth2AuthorizationCodeClient, generateCodeVerifier } from './client/authorization-code.js';
+export { OAuth2Fetch } from './fetch-wrapper.js';
+export { OAuth2Error, OAuth2HttpError } from './error.js';
 
-export { IntrospectionResponse } from './messages';
+export type { IntrospectionResponse } from './messages.js';
+export type { OAuth2Token } from './token.js';

webpack.config.js

@@ -4,11 +4,17 @@ export default [
     output: {
       path: import.meta.dirname + '/browser',
       filename: 'oauth2-client.min.js',
-      library: 'OAuth2Client',
-      libraryTarget: 'umd'
+      library: {
+        type: 'module',
+      },
+    },
+    experiments: {
+      outputModule: true,
     },
-
     resolve: {
+      extensionAlias: {
+        '.js': ['.ts', '.js']
+      },
       extensions: ['.web.ts', '.web.js', '.ts', '.js', '.json'],
       fallback: { 'crypto': false }
     },