Skip to content

feat: add bundle for windows #1575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sorrycc merged 6 commits into from
Sep 9, 2024
Merged

feat: add bundle for windows #1575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8990551
feat: support windows
sorrycc Sep 6, 2024
a46171b
release: @umijs/mako@0.8.9-canary.20240906.1
sorrycc Sep 6, 2024
918b5f7
chore: bundler-mako@0.8.9-canary.20240906.1
sorrycc Sep 6, 2024
ff5cdba
chore: support windows
sorrycc Sep 6, 2024
a340f95
release: @umijs/mako@0.8.9-canary.20240906.2
sorrycc Sep 6, 2024
9a8b5fd
chore: bundler-mako@0.8.9-canary.20240906.2
sorrycc Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/node-bind-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,18 @@ jobs:
set -e &&
rustup target add aarch64-unknown-linux-musl &&
pnpm --filter @umijs/mako build --target aarch64-unknown-linux-musl
- host: windows-latest
build: |
rustup target add x86_64-pc-windows-msvc
pnpm --filter @umijs/mako build --target x86_64-pc-windows-msvc
strip -x ./packages/mako/*.node
target: x86_64-pc-windows-msvc
- host: windows-latest
build: |
rustup target add i686-pc-windows-msvc
pnpm --filter @umijs/mako build --target i686-pc-windows-msvc
strip -x ./packages/mako/*.node
target: i686-pc-windows-msvc
name: stable - ${{ matrix.settings.target }} - node@20
runs-on: ${{ matrix.settings.host }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions packages/bundler-mako/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@umijs/bundler-mako",
"version": "0.8.8",
"version": "0.8.9-canary.20240906.2",
"dependencies": {
"@umijs/bundler-utils": "^4.0.81",
"@umijs/mako": "0.8.8",
"@umijs/mako": "0.8.9-canary.20240906.2",
"chalk": "^4.1.2",
"compression": "^1.7.4",
"connect-history-api-fallback": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/mako/npm/darwin-arm64/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@umijs/mako-darwin-arm64",
"version": "0.8.8",
"version": "0.8.9-canary.20240906.2",
"os": [
"darwin"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/mako/npm/darwin-x64/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@umijs/mako-darwin-x64",
"version": "0.8.8",
"version": "0.8.9-canary.20240906.2",
"os": [
"darwin"
],
Expand Down
4 changes: 2 additions & 2 deletions packages/mako/npm/linux-arm64-gnu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@umijs/mako-linux-arm64-gnu",
"version": "0.0.0",
"version": "0.8.9-canary.20240906.2",
"os": [
"linux"
],
Expand All @@ -18,4 +18,4 @@
"libc": [
"glibc"
]
}
}
2 changes: 1 addition & 1 deletion packages/mako/npm/linux-arm64-musl/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@umijs/mako-linux-arm64-musl",
"version": "0.8.8",
"version": "0.8.9-canary.20240906.2",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/mako/npm/linux-x64-gnu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@umijs/mako-linux-x64-gnu",
"version": "0.8.8",
"version": "0.8.9-canary.20240906.2",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/mako/npm/linux-x64-musl/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@umijs/mako-linux-x64-musl",
"version": "0.8.8",
"version": "0.8.9-canary.20240906.2",
"os": [
"linux"
],
Expand Down
4 changes: 2 additions & 2 deletions packages/mako/npm/win32-ia32-msvc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@umijs/mako-win32-ia32-msvc",
"version": "0.0.0",
"version": "0.8.9-canary.20240906.2",
"os": [
"win32"
],
Expand All @@ -15,4 +15,4 @@
"engines": {
"node": ">= 10"
}
}
}
4 changes: 2 additions & 2 deletions packages/mako/npm/win32-x64-msvc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@umijs/mako-win32-x64-msvc",
"version": "0.0.0",
"version": "0.8.9-canary.20240906.2",
"os": [
"win32"
],
Expand All @@ -15,4 +15,4 @@
"engines": {
"node": ">= 10"
}
}
}
19 changes: 12 additions & 7 deletions packages/mako/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@umijs/mako",
"version": "0.8.8",
"version": "0.8.9-canary.20240906.2",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"bin": {
Expand All @@ -14,7 +14,9 @@
"aarch64-apple-darwin",
"aarch64-unknown-linux-gnu",
"aarch64-unknown-linux-musl",
"i686-pc-windows-msvc",
"x86_64-apple-darwin",
"x86_64-pc-windows-msvc",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-linux-musl"
]
Expand Down Expand Up @@ -75,11 +77,14 @@
"src:build": "father build"
},
"optionalDependencies": {
"@umijs/mako-darwin-arm64": "0.8.8",
"@umijs/mako-linux-arm64-musl": "0.8.8",
"@umijs/mako-darwin-x64": "0.8.8",
"@umijs/mako-linux-x64-gnu": "0.8.8",
"@umijs/mako-linux-x64-musl": "0.8.8"
"@umijs/mako-darwin-arm64": "0.8.9-canary.20240906.2",
"@umijs/mako-linux-arm64-gnu": "0.8.9-canary.20240906.2",
"@umijs/mako-linux-arm64-musl": "0.8.9-canary.20240906.2",
"@umijs/mako-win32-ia32-msvc": "0.8.9-canary.20240906.2",
"@umijs/mako-darwin-x64": "0.8.9-canary.20240906.2",
"@umijs/mako-win32-x64-msvc": "0.8.9-canary.20240906.2",
"@umijs/mako-linux-x64-gnu": "0.8.9-canary.20240906.2",
"@umijs/mako-linux-x64-musl": "0.8.9-canary.20240906.2"
},
"repository": "git@github.com:umijs/mako.git"
}
}
8 changes: 0 additions & 8 deletions packages/mako/src/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ import yParser from 'yargs-parser';
import { check } from './checker';

(async () => {
let isWin = process.platform === 'win32';
if (isWin) {
console.error(
'mako is not supported on Windows yet, please visit https://makojs.dev/ to subscribe for updates',
);
process.exit(1);
}

// use MAKO_CLI to identify if it's running in mako cli standalone
// so that we can print extra information
process.env.MAKO_CLI = '1';
Expand Down
78 changes: 57 additions & 21 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.