Skip to content

Commit 8c72d55

Browse files
authored
Merge pull request #99 from aminya/esm
2 parents 6fe2667 + 00c09d2 commit 8c72d55

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+554
-240
lines changed

cspell.config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ words:
7575
- tsbuildinfo
7676
- ucrt
7777
- untildify
78+
- upleveled
7879
- vbatts
7980
- vcpkg
8081
- vcvarsall

dev/scripts/pack-exe.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable import/no-extraneous-dependencies */
2-
import { node } from "execa"
2+
import { execaNode } from "execa"
33

44
function getPlatformName() {
55
switch (process.platform) {
@@ -27,7 +27,7 @@ function main() {
2727

2828
return Promise.all(
2929
exes.map((exe) =>
30-
node("./node_modules/caxa/build/index.mjs", [
30+
execaNode("./node_modules/caxa/build/index.mjs", [
3131
"--input",
3232
"./dist/node16",
3333
"--output",

dist/node12/actions_python.5b1184cd.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node12/actions_python.5b1184cd.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node12/actions_python.67b034ac.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

dist/node12/actions_python.67b034ac.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/node12/setup-cpp.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node12/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/actions_python.06ec7b4d.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/actions_python.06ec7b4d.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/actions_python.9a1d11b3.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

dist/node16/actions_python.9a1d11b3.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/node16/setup-cpp.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
"build.docker.arch": "pnpm build && docker build -f ./dev/docker/arch_node.dockerfile -t setup-cpp:arch .",
3232
"build.docker.fedora": "pnpm build && docker build -f ./dev/docker/fedora_node.dockerfile -t setup-cpp:fedora .",
3333
"build.docker.ubuntu": "pnpm build && docker build -f ./dev/docker/ubuntu_node.dockerfile -t setup-cpp:ubuntu .",
34-
"build.parcel": "cross-env NODE_ENV=production parcel build",
35-
"bump": "ncu -u -x execa,numerous,path-exists && pnpm update",
34+
"build.parcel": "cross-env NODE_ENV=production parcel build && babel ./dist --out-dir dist --plugins @upleveled/babel-plugin-remove-node-prefix --compact --no-babelrc --source-maps true",
35+
"bump": "ncu -u -x numerous && pnpm update",
3636
"clean": "shx rm -rf .parcel-cache dist exe",
3737
"copy.matchers": "shx cp ./src/gcc/gcc_matcher.json ./dist/node12/ && shx cp ./src/msvc/msvc_matcher.json ./dist/node12/ && shx cp ./src/python/python_matcher.json ./dist/node12/ && shx cp ./src/llvm/llvm_matcher.json ./dist/node12/ && shx cp ./dist/node12/*.json ./dist/node16/",
3838
"dev": "cross-env NODE_ENV=development parcel watch",
@@ -64,15 +64,17 @@
6464
"@actions/exec": "^1.1.1",
6565
"@actions/io": "^1.1.3",
6666
"@actions/tool-cache": "^2.0.1",
67+
"@babel/cli": "^7.21.0",
6768
"@types/cross-spawn": "^6.0.2",
6869
"@types/eslint": "^8.37.0",
6970
"@types/jest": "^29.5.1",
7071
"@types/mri": "^1.1.1",
71-
"@types/node": "^18.15.13",
72+
"@types/node": "^18.16.0",
7273
"@types/npmcli__ci-detect": "^2.0.0",
7374
"@types/prettier": "2.7.2",
7475
"@types/semver": "^7.3.13",
7576
"@types/which": "^3.0.0",
77+
"@upleveled/babel-plugin-remove-node-prefix": "github:aminya/babel-plugin-remove-node-prefix#95fcbd92405b99a6eece48c493548996f12e6519",
7678
"admina": "^0.1.3",
7779
"caxa": "^3.0.1",
7880
"ci-info": "^3.8.0",
@@ -86,7 +88,8 @@
8688
"eslint": "^8.39.0",
8789
"eslint-config-atomic": "^1.18.3",
8890
"exec-powershell": "workspace:*",
89-
"execa": "^5.1.1",
91+
"execa": "^7.1.1",
92+
"fast-glob": "^3.2.12",
9093
"gen-readme": "^1.6.0",
9194
"is-url-online": "^1.5.0",
9295
"jest": "^29.5.0",
@@ -96,14 +99,14 @@
9699
"npm-run-all2": "^6.0.5",
97100
"numerous": "1.0.3",
98101
"parcel": "2.8.3",
99-
"path-exists": "^4.0.0",
102+
"path-exists": "^5.0.0",
100103
"patha": "^0.4.1",
101-
"prettier": "2.7.1",
104+
"prettier": "2.8.8",
102105
"prettier-config-atomic": "^3.1.0",
103106
"quote-unquote": "^1.0.0",
104107
"readme-md-generator": "^1.0.0",
105108
"retry-as-promised": "^7.0.4",
106-
"semver": "7.3.8",
109+
"semver": "7.5.0",
107110
"setup-python": "github:actions/setup-python#v4.6.0",
108111
"shx": "0.3.4",
109112
"terser-config-atomic": "^0.1.1",
@@ -144,20 +147,6 @@
144147
"patha": "patha/dist/index.node.mjs"
145148
},
146149
"main.actions": "./dist/node16/setup-cpp.js",
147-
"pnpm": {
148-
"overrides": {
149-
"semver": "7.3.8",
150-
"eslint": "^8.28.0",
151-
"prettier": "2.7.1",
152-
"core-js": "*",
153-
"babel-eslint": "npm:@babel/eslint-parser"
154-
},
155-
"peerDependencyRules": {
156-
"allowedVersions": {
157-
"eslint": "*"
158-
}
159-
}
160-
},
161150
"targets": {
162151
"main": {
163152
"context": "node",

packages/exec-powershell/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Execute a powershell command.
3838

3939
- command (`string`) - The powershell command to execute
4040
- startupFlags (`string[]`) - The optional startup flags to be passed to powershell. Defaults to `["-NoProfile", "-NoLogo", "-NonInteractive"]`. This means that the Powershell profile is not sourced first.
41-
- execOptions (`execa.SyncOptions`) - The options passed to `execa`. Defaults to `{ stdio: "inherit" }`
41+
- execOptions (`execaSyncOptions`) - The options passed to `execa`. Defaults to `{ stdio: "inherit" }`
4242

4343
**returns:** execa.ExecaSyncReturnValue<string>
4444

packages/exec-powershell/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"build": "tsc"
1212
},
1313
"dependencies": {
14-
"execa": "^5.1.1",
14+
"execa": "^7.1.1",
1515
"which": "^2.0.2"
1616
},
1717
"devDependencies": {

packages/exec-powershell/src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import execa from "execa"
1+
import * as execa from "execa"
22
import which from "which"
33

44
/** The cached powershell path */
@@ -19,7 +19,7 @@ export function execPowershell(
1919
startupFlags: string[] = ["-NoProfile", "-NoLogo", "-NonInteractive"],
2020
execOptions: execa.Options = { stdio: "inherit" }
2121
): execa.ExecaChildProcess<string> {
22-
return execa(getPowerShell(), [...startupFlags, "-c", command], execOptions)
22+
return execa.execa(getPowerShell(), [...startupFlags, "-c", command], execOptions)
2323
}
2424

2525
/**
@@ -37,7 +37,7 @@ export function execPowershellSync(
3737
startupFlags: string[] = ["-NoProfile", "-NoLogo", "-NonInteractive"],
3838
execOptions: execa.SyncOptions = { stdio: "inherit" }
3939
): execa.ExecaSyncReturnValue<string> {
40-
return execa.sync(getPowerShell(), [...startupFlags, "-c", command], execOptions)
40+
return execa.execaSync(getPowerShell(), [...startupFlags, "-c", command], execOptions)
4141
}
4242

4343
/**

0 commit comments

Comments
 (0)