Skip to content

Commit

Permalink
Merge pull request #280 from aminya/vite [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya authored Sep 4, 2024
2 parents ab36eab + 6e3b572 commit 57e4019
Show file tree
Hide file tree
Showing 47 changed files with 224 additions and 1,889 deletions.
17 changes: 7 additions & 10 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,11 @@ jobs:
env:
RUNNER_OS_NAME: ${{ matrix.os }}

- name: Modern Integration Tests
- name: Setup Node 20
uses: actions/setup-node@v4
with:
node-version: 20
- name: Smoke Test Modern Bundle
if: ${{ !contains(github.event.head_commit.message, '[skip test]') }}
run: |
node ./dist/modern/setup-cpp.mjs --help
Expand All @@ -215,17 +219,10 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 12
- name: Smoke Test Node 12
- name: Smoke Test Legacy Bundle
run: |
node ./dist/legacy/setup-cpp.js --help
- name: Setup Node 16
uses: actions/setup-node@v4
with:
node-version: 16
- name: Smoke Test Node 16
run: |
node ./dist/modern/setup-cpp.mjs --help
node ./dist/legacy/setup-cpp.js --gcc true --cmake true
Docker:
name: Docker-${{ matrix.container.image }}
Expand Down
12 changes: 12 additions & 0 deletions babel.config.mts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import type { TransformOptions } from "@babel/core"
// @ts-ignore
import RemoveNodePrefix from "@upleveled/babel-plugin-remove-node-prefix"

const babelConfig: TransformOptions = {
plugins: [
RemoveNodePrefix,
],
sourceMaps: true,
sourceType: "module",
}
export default babelConfig
3 changes: 0 additions & 3 deletions dist/legacy/actions_python.0b2a8a9a.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/legacy/actions_python.0b2a8a9a.js.map

This file was deleted.

2 changes: 2 additions & 0 deletions dist/legacy/assets/actions_python-BF80bhWt.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/legacy/assets/actions_python-BF80bhWt.js.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions dist/legacy/assets/hdi-Ca-ZsNp_.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/legacy/assets/hdi-Ca-ZsNp_.js.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions dist/legacy/assets/proxy-agent-B6ncb0bd.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/legacy/assets/proxy-agent-B6ncb0bd.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/legacy/github_brechtsanders_winlibs_mingw.json

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions dist/legacy/hdi.619de66c.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/legacy/hdi.619de66c.js.map

This file was deleted.

31 changes: 0 additions & 31 deletions dist/legacy/proxy-agent.5536f8bd.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/legacy/proxy-agent.5536f8bd.js.map

This file was deleted.

46 changes: 2 additions & 44 deletions dist/legacy/setup-cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/legacy/setup-cpp.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/assets/actions_python-mhNRejTS.mjs.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/github_brechtsanders_winlibs_mingw.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/setup-cpp.mjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/setup-cpp.mjs.map

Large diffs are not rendered by default.

38 changes: 8 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,15 @@
"tsconfig.json"
],
"scripts": {
"build": "turbo build && run-p lint.root.tsc build.parcel build.vite && run-p build.babel copy.json",
"build.parcel": "cross-env NODE_ENV=production parcel build",
"build": "turbo build && run-p lint.root.tsc build.vite build.vite.legacy && run-p copy.json",
"build.vite": "cross-env NODE_ENV=production vite build",
"build.babel": "babel ./dist/legacy --out-dir ./dist/legacy --plugins @upleveled/babel-plugin-remove-node-prefix --plugins @babel/plugin-transform-private-methods --compact --no-babelrc --source-maps true",
"build.vite.legacy": "cross-env NODE_ENV=production TARGET=legacy vite build",
"bump": "ncu -u -x numerous,execa,prettier,@types/node,eslint,@types/eslint && pnpm update && pnpx typesync && pnpm run clean",
"clean": "shx rm -rf ./dist ./packages/*/dist ./exe ./.parcel-cache && shx mkdir -p ./dist/legacy ./dist/modern ./dist/modern ",
"copy.json": "shx cp ./src/*/*.json ./dist/legacy/ && shx cp ./dist/legacy/*.json ./dist/modern",
"dev.parcel": "cross-env NODE_ENV=development parcel watch",
"dev.vite": "cross-env NODE_ENV=development vite build --watch",
"dev.packages": "turbo dev",
"dev": "run-p dev.packages dev.parcel",
"dev": "run-p dev.packages dev.vite",
"docs": "shx rm -rf packages/*/README.md && pnpm -r exec readme --path ../../dev/readme/template.md -y && pnpm -r exec ts-readme",
"format": "run-s lint.dprint",
"lint": "turbo lint && run-p --aggregate-output --continue-on-error lint.**",
Expand All @@ -60,8 +59,7 @@
"@actions/http-client": "^2.2.3",
"@actions/io": "^1.1.3",
"@actions/tool-cache": "^2.0.1",
"@babel/cli": "^7.25.6",
"@babel/plugin-transform-private-methods": "^7.25.4",
"@babel/core": "^7.25.2",
"@biomejs/biome": "^1.8.3",
"@iarna/toml": "^2.2.5",
"@liuli-util/vite-plugin-node": "^0.9.0",
Expand All @@ -73,7 +71,9 @@
"@octokit/types": "^13.5.0",
"@shockpkg/archive-files": "github:aminya/archive-files#54ec59fad46aca736ac6feb6c7bb526528141b9d",
"@swc/jest": "^0.2.36",
"@types/babel__core": "~7.20.5",
"@types/cross-spawn": "^6.0.6",
"@types/escape-quotes": "~1.0.0",
"@types/eslint": "^8.56.12",
"@types/iarna__toml": "~2.0.5",
"@types/jest": "^29.5.12",
Expand Down Expand Up @@ -112,7 +112,6 @@
"npm-run-all2": "^6.2.2",
"numerous": "1.0.3",
"p-timeout": "^6.1.2",
"parcel": "2.12.0",
"path-exists": "^5.0.0",
"patha": "^0.4.1",
"prettier": "3.2.2",
Expand All @@ -138,7 +137,7 @@
"untildify-user": "workspace:*",
"util.types": "^0.0.2",
"vite": "^5.4.3",
"vite-plugin-node": "^3.1.0",
"vite-plugin-babel": "^1.2.0",
"web-streams-polyfill": "^4.0.0",
"which": "^4.0.0"
},
Expand Down Expand Up @@ -206,27 +205,6 @@
"ninja",
"meson"
],
"alias": {
"electron": false,
"patha": "patha/dist/index.node.mjs",
"admina": "admina/dist/index.mjs",
"fs/promises": "./src/utils/compat/fs/promises.ts",
"stream/promises": "./src/utils/compat/stream/promises.ts",
"stream/web": "web-streams-polyfill/dist/ponyfill.mjs",
"util/types": "util.types/index.js",
"diagnostics_channel": "diagnostics_channel/index.js"
},
"targets": {
"main": {
"context": "node",
"engines": {
"node": ">=12.x"
},
"includeNodeModules": true,
"optimize": true,
"outputFormat": "commonjs"
}
},
"pnpm": {
"patchedDependencies": {
"@actions/[email protected]": "patches/@[email protected]"
Expand Down
1 change: 1 addition & 0 deletions packages/envosman/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"macos"
],
"devDependencies": {
"@types/escape-quotes": "~1.0.0",
"@types/memoizee": "0.4.11"
}
}
17 changes: 0 additions & 17 deletions packages/envosman/src/escape-quotes.d.ts

This file was deleted.

3 changes: 2 additions & 1 deletion packages/setup-apt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"apt-key"
],
"devDependencies": {
"@types/memoizee": "0.4.11"
"@types/memoizee": "0.4.11",
"@types/which": "~3.0.4"
}
}
6 changes: 4 additions & 2 deletions packages/setup-brew/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@
"node-downloader-helper": "2.1.9"
},
"devDependencies": {
"@types/cross-spawn": "~6.0.6",
"@types/which": "~3.0.4",
"cross-spawn": "7.0.3",
"path-exists": "5.0.0",
"patha": "0.4.1",
"cross-spawn": "7.0.3"
"patha": "0.4.1"
},
"engines": {
"node": ">=12"
Expand Down
Loading

0 comments on commit 57e4019

Please sign in to comment.