Skip to content

Commit ec826fd

Browse files
bvanjoibvanjoi
authored
Merge pull request #29 from bvanjoi/next
release: 0.0.24
2 parents a77e8de + 5bd4ee8 commit ec826fd

File tree

5 files changed

+44
-50
lines changed

5 files changed

+44
-50
lines changed

‎.github/workflows/Publish.yml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,23 @@ jobs:
6868
- host: ubuntu-latest
6969
target: aarch64-linux-android
7070
build: |
71-
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
72-
export CC="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
73-
export CXX="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++"
74-
export AR="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
75-
export PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
71+
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
72+
export CC="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
73+
export CXX="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++"
74+
export AR="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
75+
export PATH="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
7676
yarn build --target aarch64-linux-android
77-
${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
77+
${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
7878
- host: ubuntu-latest
7979
target: armv7-linux-androideabi
8080
build: |
81-
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
82-
export CC="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
83-
export CXX="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang++"
84-
export AR="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
85-
export PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
81+
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
82+
export CC="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
83+
export CXX="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang++"
84+
export AR="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
85+
export PATH="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
8686
yarn build --target armv7-linux-androideabi
87-
${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
87+
${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
8888
- host: ubuntu-latest
8989
target: aarch64-unknown-linux-musl
9090
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
@@ -122,9 +122,7 @@ jobs:
122122
~/.cargo/registry/index/
123123
~/.cargo/registry/cache/
124124
~/.cargo/git/db/
125-
.cargo-cache/registry/index/
126-
.cargo-cache/registry/cache/
127-
.cargo-cache/git/db/
125+
.cargo-cache
128126
target/
129127
key: ${{ matrix.settings.target }}-cargo-registry
130128
- name: Cache NPM dependencies
@@ -155,7 +153,7 @@ jobs:
155153
if: ${{ matrix.settings.docker }}
156154
with:
157155
image: ${{ matrix.settings.docker }}
158-
options: --user 0:0 -v ${{ github.workspace }}/.cargo-cache/git/db:/root/.cargo/git/db -v ${{ github.workspace }}/.cargo/registry/cache:/root/.cargo/registry/cache -v ${{ github.workspace }}/.cargo/registry/index:/root/.cargo/registry/index -v ${{ github.workspace }}:/build -w /build
156+
options: --user 0:0 -v ${{ github.workspace }}/.cargo-cache/git/db:/usr/local/cargo/git/db -v ${{ github.workspace }}/.cargo/registry/cache:/usr/local/cargo/registry/cache -v ${{ github.workspace }}/.cargo/registry/index:/usr/local/cargo/registry/index -v ${{ github.workspace }}:/build -w /build
159157
run: ${{ matrix.settings.build }}
160158
- name: Build
161159
run: ${{ matrix.settings.build }}
@@ -168,13 +166,13 @@ jobs:
168166
path: ${{ env.APP_NAME }}.*.node
169167
if-no-files-found: error
170168
build-freebsd:
171-
runs-on: macos-10.15
169+
runs-on: macos-12
172170
name: Build FreeBSD
173171
steps:
174172
- uses: actions/checkout@v3
175173
- name: Build
176174
id: build
177-
uses: vmactions/freebsd-vm@v0.1.6
175+
uses: vmactions/freebsd-vm@v0.2.3
178176
env:
179177
DEBUG: napi:*
180178
RUSTUP_HOME: /usr/local/rustup
@@ -472,7 +470,7 @@ jobs:
472470
- name: Cache NPM dependencies
473471
uses: actions/cache@v3
474472
with:
475-
path: node_modules
473+
path: .yarn/cache
476474
key: npm-cache-ubuntu-latest-publish
477475
restore-keys: |
478476
npm-cache-

‎.github/workflows/Test.yml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -76,23 +76,23 @@ jobs:
7676
- host: ubuntu-latest
7777
target: aarch64-linux-android
7878
build: |
79-
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
80-
export CC="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
81-
export CXX="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++"
82-
export AR="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
83-
export PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
79+
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
80+
export CC="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
81+
export CXX="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++"
82+
export AR="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
83+
export PATH="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
8484
yarn build --target aarch64-linux-android
85-
${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
85+
${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
8686
- host: ubuntu-latest
8787
target: armv7-linux-androideabi
8888
build: |
89-
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
90-
export CC="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
91-
export CXX="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang++"
92-
export AR="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
93-
export PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
89+
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
90+
export CC="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
91+
export CXX="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang++"
92+
export AR="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
93+
export PATH="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
9494
yarn build --target armv7-linux-androideabi
95-
${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
95+
${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
9696
- host: ubuntu-latest
9797
target: aarch64-unknown-linux-musl
9898
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
@@ -130,9 +130,7 @@ jobs:
130130
~/.cargo/registry/index/
131131
~/.cargo/registry/cache/
132132
~/.cargo/git/db/
133-
.cargo-cache/registry/index/
134-
.cargo-cache/registry/cache/
135-
.cargo-cache/git/db/
133+
.cargo-cache
136134
target/
137135
key: ${{ matrix.settings.target }}-cargo-registry
138136
- name: Cache NPM dependencies
@@ -163,7 +161,7 @@ jobs:
163161
if: ${{ matrix.settings.docker }}
164162
with:
165163
image: ${{ matrix.settings.docker }}
166-
options: --user 0:0 -v ${{ github.workspace }}/.cargo-cache/git/db:/root/.cargo/git/db -v ${{ github.workspace }}/.cargo/registry/cache:/root/.cargo/registry/cache -v ${{ github.workspace }}/.cargo/registry/index:/root/.cargo/registry/index -v ${{ github.workspace }}:/build -w /build
164+
options: --user 0:0 -v ${{ github.workspace }}/.cargo-cache/git/db:/usr/local/cargo/git/db -v ${{ github.workspace }}/.cargo/registry/cache:/usr/local/cargo/registry/cache -v ${{ github.workspace }}/.cargo/registry/index:/usr/local/cargo/registry/index -v ${{ github.workspace }}:/build -w /build
167165
run: ${{ matrix.settings.build }}
168166
- name: Build
169167
run: ${{ matrix.settings.build }}
@@ -176,13 +174,13 @@ jobs:
176174
path: ${{ env.APP_NAME }}.*.node
177175
if-no-files-found: error
178176
build-freebsd:
179-
runs-on: macos-10.15
177+
runs-on: macos-12
180178
name: Build FreeBSD
181179
steps:
182180
- uses: actions/checkout@v3
183181
- name: Build
184182
id: build
185-
uses: vmactions/freebsd-vm@v0.1.6
183+
uses: vmactions/freebsd-vm@v0.2.3
186184
env:
187185
DEBUG: napi:*
188186
RUSTUP_HOME: /usr/local/rustup

‎Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ crate-type = ["cdylib"]
1212
[dependencies]
1313
napi = "2.6.3"
1414
napi-derive = "2.6.0"
15-
nodejs-resolver = "0.0.33"
16-
serde = { version = "1.0.139", features = ["derive"] }
15+
nodejs-resolver = "0.0.34"
16+
serde = { version = "1.0.140", features = ["derive"] }
1717

1818
[build-dependencies]
1919
napi-build = "2.0.1"

‎index.d.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,19 @@ export interface RawResolverOptions {
2727
preferRelative?: boolean
2828
tsconfigPath?: string
2929
}
30-
export interface ResolverInternal {}
30+
export interface ResolverInternal {
31+
32+
}
3133
export function create(options: RawResolverOptions): ExternalObject<ResolverInternal>
32-
export interface ResolverCacheInternal {}
34+
export interface ResolverCacheInternal {
35+
36+
}
3337
export function createExternalCache(): ExternalObject<ResolverCacheInternal>
34-
export function createWithExternalCache(
35-
options: RawResolverOptions,
36-
external_cache: ExternalObject<ResolverCacheInternal>,
37-
): ExternalObject<ResolverInternal>
38+
export function createWithExternalCache(options: RawResolverOptions, external_cache: ExternalObject<ResolverCacheInternal>): ExternalObject<ResolverInternal>
3839
export function resolve(resolver: ExternalObject<ResolverInternal>, base_dir: string, id: string): string
3940
export interface SideEffectsStats {
4041
boolVal?: boolean
4142
arrayVal?: Array<string>
4243
pkgFilePath: string
4344
}
44-
export function loadSideEffects(
45-
resolver: ExternalObject<ResolverInternal>,
46-
path: string,
47-
): { boolVal?: boolean; arrayVal?: string[]; pkgFilePath: string } | undefined
45+
export function loadSideEffects(resolver: ExternalObject<ResolverInternal>, path: string): {boolVal?: boolean, arrayVal?: string[], pkgFilePath: string} | undefined

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nodejs-resolver",
3-
"version": "0.0.23",
3+
"version": "0.0.24",
44
"description": "node binding for nodejs-resolver",
55
"main": "index.js",
66
"license": "MIT",

0 commit comments

Comments
 (0)