1 files changed, 77 insertions, 20 deletions

diff --git a/packages/server/build_npm.ts b/packages/server/build_npm.ts
index 3124e87..8dfcf6f 100644
--- a/packages/server/build_npm.ts
+++ b/packages/server/build_npm.ts
@@ -1,22 +1,61 @@
-import { build, emptyDir } from "https://deno.land/x/dnt@0.38.0/mod.ts";
+import {
+  build,
+  BuildOptions,
+  emptyDir,
+} from "https://deno.land/x/dnt@0.38.0/mod.ts";
 
-const outDir = "./npm";
+const outDir = {
+  publish: "./npm",
+  test: "./npm-test",
+} as const;
 const lernaPackageJSON: { version: string } = JSON.parse(
   await Deno.readTextFile("./package.json"),
 );
 
-await emptyDir(outDir);
+// Clear both build directories
+await Promise.all([
+  await emptyDir(outDir.publish),
+  await emptyDir(outDir.test),
+]);
 
+/**
+ * Maintain a separate build just for testing, as we need to shim crypto only
+ * when test_runner.js runs to test the ESM and CJS output. The test environment
+ * currently lacks `globalThis.crypto` and so shimming it is the only way to
+ * get the tests to successfully execute. But we don't want the shim in the
+ * build we post up to NPM so that the runtime's native Crypto can be used.
+ *
+ * See https://github.com/denoland/dnt/issues/181
+ */
+console.log("Building for testing...");
 await build({
-  entryPoints: [
-    { name: ".", path: "./src/index.ts" },
-    { name: "./helpers", path: "./src/helpers/index.ts" },
-  ],
-  outDir,
+  entryPoints: getEntryPoints(),
+  outDir: outDir.test,
   shims: {
-    deno: "dev",
-    crypto: false,
+    deno: {
+      test: "dev",
+    },
+    crypto: true,
+  },
+  test: true,
+  // TODO: Re-enable if https://github.com/denoland/dnt/issues/331 can get resolved
+  typeCheck: false,
+  package: {
+    name: "for-testing-only",
+    version: "0.0.0",
   },
+  // Map from Deno package to NPM package for Node build
+  mappings: getMappings(),
+  // TypeScript tsconfig.json config
+  compilerOptions: getCompilerOptions(),
+});
+
+console.log("Building for publishing...");
+await build({
+  entryPoints: getEntryPoints(),
+  outDir: outDir.publish,
+  shims: {},
+  test: false,
   // TODO: Re-enable if https://github.com/denoland/dnt/issues/331 can get resolved
   typeCheck: false,
   // package.json values
@@ -58,10 +97,29 @@ await build({
     },
   },
   // Map from Deno package to NPM package for Node build
-  mappings: {
+  mappings: getMappings(),
+  // TypeScript tsconfig.json config
+  compilerOptions: getCompilerOptions(),
+});
+
+// Deno.copyFileSync('LICENSE', 'npm/LICENSE');
+Deno.copyFileSync("README.md", `${outDir.publish}/README.md`);
+
+/**
+ * Settings we can reuse across the two build configs
+ */
+function getEntryPoints(): BuildOptions["entryPoints"] {
+  return [
+    { name: ".", path: "./src/index.ts" },
+    { name: "./helpers", path: "./src/helpers/index.ts" },
+  ];
+}
+
+function getMappings(): BuildOptions["mappings"] {
+  return {
     "https://deno.land/x/b64@1.1.27/src/base64.js": {
       name: "@hexagon/base64",
-      version: "^1.1.25",
+      version: "^1.1.27",
     },
     "https://deno.land/x/cbor@v1.5.2/index.js": {
       name: "cbor-x",
@@ -106,12 +164,11 @@ await build({
       name: "@simplewebauthn/typescript-types",
       version: "^7.4.0",
     },
-  },
-  // TypeScript tsconfig.json config
-  compilerOptions: {
-    lib: ["ES2021"],
-  },
-});
+  };
+}
 
-// Deno.copyFileSync('LICENSE', 'npm/LICENSE');
-Deno.copyFileSync("README.md", `${outDir}/README.md`);
+function getCompilerOptions(): BuildOptions["compilerOptions"] {
+  return {
+    lib: ["ES2021"],
+  };
+}