Merge pull request #98 from aminya/esm

This commit is contained in:
Amin Yahyaabadi 2022-07-05 22:58:18 -07:00 committed by GitHub
commit 09018b0e8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 33 additions and 12 deletions

View File

@ -26,6 +26,7 @@ words:
- devel
- dyld
- eabi
- esmodule
- execa
- ftxui
- gcovr

2
dist/actions_python.aa574a9a.js vendored Normal file

File diff suppressed because one or more lines are too long

1
dist/actions_python.aa574a9a.js.map vendored Normal file

File diff suppressed because one or more lines are too long

2
dist/setup_cpp.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
dist/setup_cpp.mjs vendored Normal file

File diff suppressed because one or more lines are too long

1
dist/setup_cpp.mjs.map vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -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/"],

View File

@ -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"
}
}
}

View File

@ -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"])
}
})

View File

@ -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) {

View File

@ -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))
}

View File

@ -22,7 +22,7 @@
"allowJs": true,
"esModuleInterop": true,
"resolveJsonModule": true,
"module": "commonjs",
"module": "esnext",
"moduleResolution": "node",
"importHelpers": false,
"outDir": "./dist"