Skip to content
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.

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

[wip] feat: linux and windows cfg options #729

Merged
merged 43 commits into from
Dec 25, 2022
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
757b7d4
set defaults for remaining options
ayushmanchhabra Dec 11, 2022
81545c5
link cfg docs
ayushmanchhabra Dec 11, 2022
aa190b1
fix cache issue
ayushmanchhabra Dec 12, 2022
7620640
generate cjs on npm publish only
ayushmanchhabra Dec 12, 2022
ffb4e9e
add desktop entry options to `app` argument
ayushmanchhabra Dec 12, 2022
f8c0cbc
Merge branch 'main' of github.com:nwutils/nw-builder into feat-cfg-op…
ayushmanchhabra Dec 15, 2022
9f36dea
format
ayushmanchhabra Dec 15, 2022
e4649de
fix tests
ayushmanchhabra Dec 22, 2022
e2cbc41
cfg wip
ayushmanchhabra Dec 22, 2022
0f0caf0
add config options to rcedit
ayushmanchhabra Dec 22, 2022
8f9b29b
add links to docs in code comments
ayushmanchhabra Dec 22, 2022
8a90d4a
add win cfg options to nwbuild
ayushmanchhabra Dec 22, 2022
bf6921e
add note about latest stable version
ayushmanchhabra Dec 22, 2022
05d80d8
actually fix test
ayushmanchhabra Dec 22, 2022
37f7020
remove all undefined properties which implies they are optional
ayushmanchhabra Dec 22, 2022
0c92ab4
update option names to create parity with msdn docs
ayushmanchhabra Dec 22, 2022
cd178ea
add windows demo to ci
ayushmanchhabra Dec 22, 2022
97a7195
seperate demos into separate files
ayushmanchhabra Dec 22, 2022
95ee59d
assert win bld fail on linux without wine
ayushmanchhabra Dec 22, 2022
1c261fa
revert ci
ayushmanchhabra Dec 22, 2022
b4e999e
Merge branch 'main' of github.com:nwutils/nw-builder into feat-cfg-op…
ayushmanchhabra Dec 23, 2022
81e2e3f
build cjs in ci
ayushmanchhabra Dec 23, 2022
3e6bfa2
typo
ayushmanchhabra Dec 23, 2022
24baba7
remove cjs build command from ci
ayushmanchhabra Dec 23, 2022
7f5dd43
Update test/demo/nwapp/package.json
ayushmanchhabra Dec 23, 2022
3a43577
Update src/util/parse.js
ayushmanchhabra Dec 23, 2022
b6dc484
Merge branch 'feat-cfg-options' of github.com:nwutils/nw-builder into…
ayushmanchhabra Dec 23, 2022
87935e7
Update docs/index.md
ayushmanchhabra Dec 23, 2022
2dff1b1
Merge branch 'feat-cfg-options' of github.com:nwutils/nw-builder into…
ayushmanchhabra Dec 23, 2022
3a355e4
rename from `flavour` to `flavor`
ayushmanchhabra Dec 23, 2022
fc58a22
rename `nux` to `linux`
ayushmanchhabra Dec 23, 2022
a418442
remove requested execution level
ayushmanchhabra Dec 23, 2022
5bd26d0
set default platform and arch to current
ayushmanchhabra Dec 23, 2022
d740a34
resolve merge conflicts
ayushmanchhabra Dec 24, 2022
3e5d8a8
format
ayushmanchhabra Dec 24, 2022
72bcb92
fix tests
ayushmanchhabra Dec 24, 2022
bd57a33
remove checklist command
ayushmanchhabra Dec 24, 2022
b890183
remove redundant platform arch checks
ayushmanchhabra Dec 24, 2022
087b802
remove unused imports
ayushmanchhabra Dec 24, 2022
b8e9a7a
move mode check inside validate function
ayushmanchhabra Dec 24, 2022
85132ba
revert osx cfg changes
ayushmanchhabra Dec 24, 2022
15c32c1
revert
ayushmanchhabra Dec 25, 2022
e484a21
fix validation function
ayushmanchhabra Dec 25, 2022
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
1 change: 1 addition & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
node-version: "18"

- run: npm ci
- run: npm run cjs
- uses: JS-DevTools/npm-publish@v1
with:
token: ${{ secrets.NPM_TOKEN }}
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v1
with:
node-version: ${{ matrix.node-version }}
npm-version: '8.5.0'
- run: npm ci
- run: npm run format
- run: npm run lint
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ coverage
# project files
build
cache
dist
*.zip
nwbuild.log
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

Build [NW.js](https://github.com/nwjs/nw.js) applications for Mac, Windows and Linux.

> Please note that the latest stable version is [v3.8.6](https://github.com/nwutils/nw-builder/tree/v3.8.6).

## Contributing

1. Pick and install a Node version manager
Expand Down
26 changes: 13 additions & 13 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ nwbuild({
srcDir: "./nwapp",
mode: "run",
version: "0.70.1",
flavour: "sdk",
flavor: "sdk",
});
```

CLI usage

```shell
nwbuild ./nwapp --mode=run --version=0.70.1 --flavour=sdk
nwbuild ./nwapp --mode=run --version=0.70.1 --flavor=sdk
```

package.json usage
Expand All @@ -45,7 +45,7 @@ package.json usage
"srcDir": "./nwapp",
"mode": "run",
"version": "0.70.1",
"flavour": "sdk"
"flavor": "sdk"
}
}
```
Expand All @@ -61,7 +61,7 @@ nwbuild({
srcDir: "./nwapp",
mode: "build",
version: "0.70.1",
flavour: "normal",
flavor: "normal",
platform: "linux",
arch: "x64",
outDir: "./out",
Expand All @@ -71,7 +71,7 @@ nwbuild({
CLI usage

```shell
nwbuild ./nwapp --mode=build --version=0.70.1 --flavour=normal --platform=linux --arch=x64 --outDir=./out
nwbuild ./nwapp --mode=build --version=0.70.1 --flavor=normal --platform=linux --arch=x64 --outDir=./out
```

package.json usage
Expand All @@ -86,7 +86,7 @@ package.json usage
"srcDir": "./nwapp",
"mode": "build",
"version": "0.70.1",
"flavour": "normal",
"flavor": "normal",
"platform": "linux",
"arch": "x64",
"outDir": "./out"
Expand All @@ -102,13 +102,13 @@ package.json usage

| Name | Type | Default | Description |
| ----------- | ----------------------------------- | -------------------------- | ------------------------------------------------------------------------------ |
| srcDir | `string` | | Directory to hold NW app files |
| mode | `run \| build` | | Run or build application |
| version | `latest \| stable \| string \| lts` | | NW runtime version |
| flavour | `sdk \| normal` | | NW runtime build flavour. |
| platform | `linux \| osx \| win` | | NW supported platforms |
| arch | `ia32 \| x64` | | NW supported architectures |
| outDir | `string` | | Directory to store build artifacts |
| srcDir | `string` | `./` | Directory to hold NW app files |
| mode | `run \| build` | `build` | Run or build application |
| version | `latest \| stable \| string \| lts` | `latest` | NW runtime version |
| flavor | `sdk \| normal` | `normal` | NW runtime build flavor. |
| platform | `linux \| osx \| win` | `<current platform>` | NW supported platforms |
| arch | `ia32 \| x64` | `<current architecture>` | NW supported architectures |
| outDir | `string` | `./out` | Directory to store build artifacts |
| cacheDir | `string` | `./cacheDir` | Directory to store NW binaries |
| downloadUrl | `string` | `https://dl.nwjs.io` | URI to download NW binaries from |
| manifestUrl | `string` | `https://nwjs.io/versions` | URI to download manifest from |
Expand Down
Loading