Skip to content

Commit c08e362

Browse files
triniwiztriniwiz
committed
chore: webgpu.2
1 parent 753d691 commit c08e362

File tree

280 files changed

+50909
-49105
lines changed

Some content is hidden

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

280 files changed

+50909
-49105
lines changed

‎.eslintrc.json

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
4+
"plugins": ["@nx"],
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
88
"rules": {
9-
"@nrwl/nx/enforce-module-boundaries": [
9+
"@nx/enforce-module-boundaries": [
1010
"error",
1111
{
1212
"enforceBuildableLibDependency": true,
@@ -23,13 +23,19 @@
2323
},
2424
{
2525
"files": ["*.ts", "*.tsx"],
26-
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nrwl/nx/typescript"],
27-
"rules": {}
26+
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nx/typescript"],
27+
"rules": {
28+
"@typescript-eslint/no-extra-semi": "error",
29+
"no-extra-semi": "off"
30+
}
2831
},
2932
{
3033
"files": ["*.js", "*.jsx"],
31-
"extends": ["plugin:@nrwl/nx/javascript"],
32-
"rules": {}
34+
"extends": ["plugin:@nx/javascript"],
35+
"rules": {
36+
"@typescript-eslint/no-extra-semi": "error",
37+
"no-extra-semi": "off"
38+
}
3339
},
3440
{
3541
"files": ["references.d.ts"],

‎.github/workflows/pull-request.yml

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Canvas Native
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
workflow_dispatch:
9+
10+
env:
11+
CARGO_TERM_COLOR: always
12+
13+
env:
14+
NPM_TAG: "pr"
15+
EMULATOR_NAME: "runtime-emu"
16+
NDK_VERSION: r23c
17+
ANDROID_API: 29
18+
ANDROID_ABI: x86_64
19+
NDK_ARCH: linux
20+
21+
22+
jobs:
23+
build:
24+
name: Build
25+
runs-on: ubuntu-22.04
26+
outputs:
27+
npm_version: ${{ steps.npm_version_output.outputs.NPM_VERSION }}
28+
npm_tag: ${{ steps.npm_version_output.outputs.NPM_TAG }}
29+
steps:
30+
- name: Install rust
31+
run: |
32+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
33+
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
34+
- uses: actions/checkout@v3
35+
with:
36+
fetch-depth: 0
37+
submodules: true
38+
- uses: actions/setup-node@v3
39+
with:
40+
node-version: 20
41+
registry-url: "https://registry.npmjs.org"
42+
- uses: actions/setup-java@v3
43+
with:
44+
distribution: "temurin"
45+
java-version: "17"
46+
cache: gradle
47+
- name: Setup Android SDK
48+
uses: android-actions/setup-android@v2
49+
- name: Setup NDK
50+
run: |
51+
echo "y" | sdkmanager "cmake;3.6.4111459"
52+
wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-$NDK_ARCH.zip
53+
chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip
54+
unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip
55+
rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip
56+
export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION
57+
echo ANDROID_NDK_HOME=${ANDROID_NDK_HOME} >> $GITHUB_ENV
58+
echo ANDROID_NDK=${ANDROID_NDK_HOME} >> $GITHUB_ENV
59+
echo ${ANDROID_NDK_HOME} >> $GITHUB_PATH
60+

‎.github/workflows/rust.yml

-15
This file was deleted.

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,6 @@ rust-skia
4848
/target
4949
/**/*.rs.bk
5050
/Cargo.lock
51+
52+
.nx/cache
53+
.nx/workspace-data

‎.prettierignore

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
/dist
44
/coverage
55
native-src
6+
7+
/.nx/cache
8+
/.nx/workspace-data

‎CanvasNative.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22

33
s.name = "CanvasNative"
44

5-
s.version = "1.0.0"
5+
s.version = "2.0.0"
66

77
s.summary = "A Canvas library"
88

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
1919

2020
s.pod_target_xcconfig = {
2121
'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}/dist"',
22-
'ENABLE_BITCODE' => 'YES'
22+
'ENABLE_BITCODE' => 'NO'
2323
}
2424
s.swift_versions = ['4.0','4.2', '5.0']
2525
s.vendored_frameworks = 'packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework'

‎Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ canvas-core = { path = "./crates/canvas-core" }
3535
canvas-webgl = { path = "./crates/canvas-webgl" }
3636
gl-bindings = { path = "./crates/gl-bindings" }
3737
canvas-c = { path = "./crates/canvas-c" }
38-
skia-safe = { version = "0.75.0", features = ["textlayout"] }
38+
skia-safe = { version = "0.73.0", features = ["textlayout"] }
3939
itertools = "0.13.0"
40-
wgpu-core = { version = "22.0.0", features = ["wgsl", "raw-window-handle"] }
40+
wgpu-core = { version = "22.1.0", features = ["wgsl", "vulkan", "metal", "raw-window-handle"] }

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ GENERATE_HEADERS:
2121
# PHONY keyword on make means this is not a file, just an identifier for a target
2222
.PHONY: $(ARCHS_IOS)
2323
$(ARCHS_IOS): %:
24-
cargo +nightly build -Z build-std='std,panic_abort' -Z build-std-features=panic_immediate_abort --target $@ --release -p canvas-ios
24+
RUSTFLAGS="-Zlocation-detail=none -C panic=abort" cargo +nightly build -Z build-std='std,panic_abort' -Z build-std-features=panic_immediate_abort --target $@ --release -p canvas-svg
2525

2626
$(XCFRAMEWORK): $(ARCHS_IOS)
2727

‎apps/demo-angular/package.json

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
2-
"main": "./src/main.ts",
3-
"dependencies": {
4-
"@nativescript/canvas": "file:../../dist/packages/canvas",
5-
"@nativescript/canvas-babylon": "file:../../dist/packages/canvas-babylon",
6-
"@nativescript/canvas-media": "file:../../dist/packages/canvas-media",
7-
"@nativescript/canvas-phaser": "file:../../dist/packages/canvas-phaser",
8-
"@nativescript/canvas-phaser-ce": "file:../../dist/packages/canvas-phaser-ce",
9-
"@nativescript/canvas-pixi": "file:../../dist/packages/canvas-pixi",
10-
"@nativescript/canvas-polyfill": "file:../../dist/packages/canvas-polyfill",
11-
"@nativescript/canvas-three": "file:../../dist/packages/canvas-three",
12-
"@nativescript/core": "file:../../node_modules/@nativescript/core",
13-
"three": "file:../../node_modules/three",
14-
"@nativescript/canvas-chartjs": "file:../../dist/packages/canvas-chartjs",
15-
"@nativescript/canvas-svg": "file:../../dist/packages/canvas-svg"
16-
},
17-
"devDependencies": {
18-
"@nativescript/android": "~8.5.0",
19-
"@nativescript/ios": "8.5.1-dev.0"
20-
}
2+
"main": "./src/main.ts",
3+
"dependencies": {
4+
"@nativescript/canvas": "file:../../dist/packages/canvas",
5+
"@nativescript/canvas-babylon": "file:../../dist/packages/canvas-babylon",
6+
"@nativescript/canvas-media": "file:../../dist/packages/canvas-media",
7+
"@nativescript/canvas-phaser": "file:../../dist/packages/canvas-phaser",
8+
"@nativescript/canvas-phaser-ce": "file:../../dist/packages/canvas-phaser-ce",
9+
"@nativescript/canvas-pixi": "file:../../dist/packages/canvas-pixi",
10+
"@nativescript/canvas-polyfill": "file:../../dist/packages/canvas-polyfill",
11+
"@nativescript/canvas-three": "file:../../dist/packages/canvas-three",
12+
"@nativescript/core": "file:../../node_modules/@nativescript/core",
13+
"three": "file:../../node_modules/three",
14+
"@nativescript/canvas-chartjs": "file:../../dist/packages/canvas-chartjs",
15+
"@nativescript/canvas-svg": "file:../../dist/packages/canvas-svg"
16+
},
17+
"devDependencies": {
18+
"@nativescript/android": "~8.7.0",
19+
"@nativescript/ios": "~8.7.0"
20+
}
2121
}

‎apps/demo-angular/project.json

+4-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"dependsOn": [
1818
{
1919
"target": "build.all",
20-
"projects": "dependencies"
20+
"dependencies": true
2121
}
2222
]
2323
},
@@ -30,7 +30,7 @@
3030
"dependsOn": [
3131
{
3232
"target": "build.all",
33-
"projects": "dependencies"
33+
"dependencies": true
3434
}
3535
]
3636
},
@@ -43,7 +43,7 @@
4343
"dependsOn": [
4444
{
4545
"target": "build.all",
46-
"projects": "dependencies"
46+
"dependencies": true
4747
}
4848
]
4949
},
@@ -54,10 +54,7 @@
5454
}
5555
},
5656
"lint": {
57-
"executor": "@nrwl/linter:eslint",
58-
"options": {
59-
"lintFilePatterns": ["apps/demo-angular/**/*.ts"]
60-
}
57+
"executor": "@nx/eslint:lint"
6158
}
6259
}
6360
}

‎apps/demo-vue/app/package.json

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
2-
"main": "app.js",
3-
"android": {
4-
"v8Flags": "--expose_gc",
5-
"requireModules": ["@nativescript/imagepicker"],
6-
"markingMode": "none"
7-
}
2+
"main": "app.js",
3+
"android": {
4+
"v8Flags": "--expose_gc",
5+
"requireModules": [
6+
"@nativescript/imagepicker"
7+
],
8+
"markingMode": "none"
9+
}
810
}

‎apps/demo-vue/package.json

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
2-
"main": "./app/app.ts",
3-
"dependencies": {
4-
"nativescript-vue": "file:../../node_modules/nativescript-vue",
5-
"@nativescript/core": "file:../../node_modules/@nativescript/core",
6-
"@nativescript/canvas-media": "file:../../packages/canvas-media",
7-
"@nativescript/canvas": "file:../../packages/canvas",
8-
"@nativescript/canvas-babylon": "file:../../packages/canvas-babylon",
9-
"@nativescript/canvas-phaser": "file:../../packages/canvas-phaser",
10-
"@nativescript/canvas-phaser-ce": "file:../../packages/canvas-phaser-ce",
11-
"@nativescript/canvas-pixi": "file:../../packages/canvas-pixi",
12-
"@nativescript/canvas-polyfill": "file:../../packages/canvas-polyfill",
13-
"@nativescript/canvas-three": "file:../../packages/canvas-three",
14-
"@nativescript/canvas-chartjs": "file:../../packages/canvas-chartjs",
15-
"@nativescript/canvas-svg": "file:../../packages/canvas-svg"
16-
},
17-
"devDependencies": {
18-
"@nativescript/android": "~8.5.0",
19-
"@nativescript/ios": "8.5.1-dev.0"
20-
}
2+
"main": "./app/app.ts",
3+
"dependencies": {
4+
"nativescript-vue": "file:../../node_modules/nativescript-vue",
5+
"@nativescript/core": "file:../../node_modules/@nativescript/core",
6+
"@nativescript/canvas-media": "file:../../packages/canvas-media",
7+
"@nativescript/canvas": "file:../../packages/canvas",
8+
"@nativescript/canvas-babylon": "file:../../packages/canvas-babylon",
9+
"@nativescript/canvas-phaser": "file:../../packages/canvas-phaser",
10+
"@nativescript/canvas-phaser-ce": "file:../../packages/canvas-phaser-ce",
11+
"@nativescript/canvas-pixi": "file:../../packages/canvas-pixi",
12+
"@nativescript/canvas-polyfill": "file:../../packages/canvas-polyfill",
13+
"@nativescript/canvas-three": "file:../../packages/canvas-three",
14+
"@nativescript/canvas-chartjs": "file:../../packages/canvas-chartjs",
15+
"@nativescript/canvas-svg": "file:../../packages/canvas-svg"
16+
},
17+
"devDependencies": {
18+
"@nativescript/android": "~8.7.0",
19+
"@nativescript/ios": "~8.7.0"
20+
}
2121
}

‎apps/demo-vue/project.json

+4-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"dependsOn": [
1818
{
1919
"target": "build.all",
20-
"projects": "dependencies"
20+
"dependencies": true
2121
}
2222
]
2323
},
@@ -29,7 +29,7 @@
2929
"dependsOn": [
3030
{
3131
"target": "build.all",
32-
"projects": "dependencies"
32+
"dependencies": true
3333
}
3434
]
3535
},
@@ -41,7 +41,7 @@
4141
"dependsOn": [
4242
{
4343
"target": "build.all",
44-
"projects": "dependencies"
44+
"dependencies": true
4545
}
4646
]
4747
},
@@ -52,10 +52,7 @@
5252
}
5353
},
5454
"lint": {
55-
"executor": "@nrwl/linter:eslint",
56-
"options": {
57-
"lintFilePatterns": ["apps/demo-vue/**/*.ts"]
58-
}
55+
"executor": "@nx/eslint:lint"
5956
}
6057
}
6158
}

0 commit comments

Comments
 (0)