Merge pull request #98 from aminya/esm

aminya · Jul 6, 2022 · 09018b0 · 09018b0
2 parents 2c84fbf + 97b3cce
commit 09018b0
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 12 deletions.
diff --git a/cspell.config.yaml b/cspell.config.yaml
@@ -26,6 +26,7 @@ words:
   - devel
   - dyld
   - eabi
+  - esmodule
   - execa
   - ftxui
   - gcovr

diff --git a/dist/actions_python.aa574a9a.js b/dist/actions_python.aa574a9a.js
diff --git a/dist/actions_python.aa574a9a.js.map b/dist/actions_python.aa574a9a.js.map
diff --git a/dist/setup_cpp.js b/dist/setup_cpp.js
diff --git a/dist/setup_cpp.js.map b/dist/setup_cpp.js.map
diff --git a/dist/setup_cpp.mjs b/dist/setup_cpp.mjs
diff --git a/dist/setup_cpp.mjs.map b/dist/setup_cpp.mjs.map
diff --git a/jest.config.js b/jest.config.js
@@ -1,5 +1,7 @@
 module.exports = {
-  preset: "ts-jest/presets/default-esm",
+  preset: "ts-jest/presets/js-with-ts-esm",
+  extensionsToTreatAsEsm: [".ts"],
+  transformIgnorePatterns: [], // transform everything
   testEnvironment: "node",
   testMatch: ["**/*.test.ts"],
   testPathIgnorePatterns: ["<rootDir>/src/python/setup-python/"],

diff --git a/package.json b/package.json
@@ -5,7 +5,12 @@
   "repository": "https://github.com/aminya/setup-cpp",
   "license": "Apache-2.0",
   "author": "Amin Yahyaabadi",
+  "exports": {
+    "import": "./dist/setup-cpp.mjs",
+    "require": "./dist/setup-cpp.js"
+  },
   "main": "./dist/setup_cpp.js",
+  "module": "./dist/setup_cpp.mjs",
   "source": "./src/main.ts",
   "bin": {
     "setup-cpp": "./dist/setup_cpp.js",
@@ -121,7 +126,14 @@
     "main": {
       "context": "node",
       "includeNodeModules": true,
-      "optimize": true
+      "optimize": true,
+      "outputFormat": "commonjs"
+    },
+    "module": {
+      "context": "node",
+      "includeNodeModules": true,
+      "optimize": true,
+      "outputFormat": "esmodule"
     }
   }
 }
diff --git a/src/python/__tests__/python.test.ts b/src/python/__tests__/python.test.ts
@@ -3,6 +3,7 @@ import { cleanupTmpDir, setupTmpDir, testBin } from "../../utils/tests/test-help
 import { getVersion } from "../../default_versions"
 import { ubuntuVersion } from "../../utils/env/ubuntu_version"
 import { isGitHubCI } from "../../utils/env/isci"
+import { info } from "../../utils/io/io"
 
 jest.setTimeout(300000)
 describe("setup-python", () => {
@@ -13,13 +14,11 @@ describe("setup-python", () => {
 
   it("should setup python in GitHub Actions", async () => {
     if (isGitHubCI()) {
-      const installInfo = await setupPython(
-        getVersion("python", "true", await ubuntuVersion()),
-        directory,
-        process.arch
-      )
+      info("Installing python in GitHub Actions")
+      const { setupActionsPython } = await import("../actions_python")
+      await setupActionsPython(getVersion("python", "true", await ubuntuVersion()), directory, process.arch)
 
-      await testBin("python", ["--version"], installInfo?.binDir)
+      await testBin("python", ["--version"])
     }
   })
 

diff --git a/src/python/python.ts b/src/python/python.ts
@@ -16,6 +16,7 @@ export async function setupPython(version: string, setupDir: string, arch: strin
     return setupPythonViaSystem(version, setupDir, arch)
   }
   try {
+    info("Installing python in GitHub Actions")
     const { setupActionsPython } = await import("./actions_python")
     return setupActionsPython(version, setupDir, arch)
   } catch (err) {

diff --git a/src/utils/tests/test-helpers.ts b/src/utils/tests/test-helpers.ts
@@ -49,5 +49,5 @@ export async function testBin(
     expect(status).toBe(0)
   }
 
-  expect(await io.which(name, true)).toBe(bin)
+  expect((await io.which(name, true)).includes(bin))
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -22,7 +22,7 @@
     "allowJs": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
-    "module": "commonjs",
+    "module": "esnext",
     "moduleResolution": "node",
     "importHelpers": false,
     "outDir": "./dist"