Skip to content

Commit

Permalink
chore: updates
Browse files Browse the repository at this point in the history
  • Loading branch information
triniwiz committed Oct 28, 2024
1 parent 63479bf commit 3ae90a8
Show file tree
Hide file tree
Showing 12 changed files with 73 additions and 67 deletions.
2 changes: 1 addition & 1 deletion apps/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"devDependencies": {
"@nativescript/android": "~8.8.0",
"@nativescript/devtools": "~0.0.1",
"@nativescript/ios": "~8.8.1",
"@nativescript/ios": "~8.8.0",
"@nativescript/visionos": "~8.8.0"
}
}
7 changes: 1 addition & 6 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
{
"migrations": [
{ "cli": "nx", "version": "5.2.0", "description": "Migrate tools to 5.2.0", "implementation": "./src/migrations/update-5-2-0/update-5-2-0", "package": "@nativescript/plugin-tools", "name": "update-to-5.2.0" },
{ "cli": "nx", "version": "5.3.0", "description": "Migrate tools to 5.3.0", "implementation": "./src/migrations/update-5-3-0/update-5-3-0", "package": "@nativescript/plugin-tools", "name": "update-to-5.3.0" }
]
}
{ "migrations": [{ "cli": "nx", "version": "5.4.0", "description": "Migrate tools to 5.4.0", "implementation": "./src/migrations/update-5-4-0/update-5-4-0", "package": "@nativescript/plugin-tools", "name": "update-to-5.4.0" }] }
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@angular/router": "^18.0.0",
"@nativescript/angular": "^18.0.0",
"@nativescript/core": "~8.8.0",
"@nativescript/plugin-tools": "5.3.1",
"@nativescript/plugin-tools": "5.4.1",
"@nativescript/types": "~8.8.0",
"@nativescript/webpack": "~5.0.22",
"@ngtools/webpack": "^18.0.0",
Expand All @@ -53,7 +53,7 @@
"eslint": "~9.8.0",
"eslint-config-prettier": "~9.1.0",
"gl-matrix": "^3.4.3",
"husky": "~9.1.0",
"husky": "~9.0.0",
"matter-js": "^0.19.0",
"nativescript-theme-core": "~1.0.4",
"nativescript-vue": "~2.9.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/canvas-pixi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"bootstrapper": "nativescript-plugin-seed",
"dependencies": {
"@nativescript/canvas-polyfill": "webgpu",
"pixi.js": "~7.3.1",
"pixi.js-legacy": "~7.3.1",
"pixi-filters": "~5.3.0"
"pixi.js": "~8.5.2",
"pixi.js-legacy": "~7.4.2",
"pixi-filters": "~6.0.5"
}
}
4 changes: 2 additions & 2 deletions packages/canvas/Canvas/common.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CSSType, View, Property, booleanConverter, widthProperty, heightProperty } from '@nativescript/core';
import { CanvasRenderingContext } from '../common';
import { CSSType, View, Property, booleanConverter } from '@nativescript/core';
import type { CanvasRenderingContext } from '../common';
import { removeItemFromArray } from './utils';

export interface ICanvasBase {
Expand Down
3 changes: 2 additions & 1 deletion packages/canvas/Canvas2D/CanvasRenderingContext2D/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { Canvas } from '../../Canvas';

import { Helpers } from '../../helpers';
import { DOMMatrix } from '../DOMMatrix';
import type { CanvasRenderingContext } from '../../common';
declare const NSCCanvasRenderingContext2D;

function ruleToEnum(rule: string): number {
Expand Down Expand Up @@ -153,7 +154,7 @@ function drawNativeImage(args: any[], image, context: any) {
}
}

export class CanvasRenderingContext2D {
export class CanvasRenderingContext2D implements CanvasRenderingContext {
public static isDebug = true;
private context;
private contextPtr: any;
Expand Down
2 changes: 1 addition & 1 deletion packages/canvas/WebGL/WebGLRenderingContext/common.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CanvasRenderingContext } from '../../common';
import type { CanvasRenderingContext } from '../../common';
import { WebGLShader } from '../WebGLShader';
import { WebGLFramebuffer } from '../WebGLFramebuffer';
import { WebGLTexture } from '../WebGLTexture';
Expand Down
3 changes: 2 additions & 1 deletion packages/canvas/WebGPU/GPUCanvasContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import type { GPUDevice } from './GPUDevice';
import { GPUTexture } from './GPUTexture';
import type { GPUAdapter } from './GPUAdapter';
import type { GPUCanvasAlphaMode, GPUCanvasPresentMode, GPUExtent3D, GPUTextureFormat } from './Types';
export class GPUCanvasContext {
import type { CanvasRenderingContext } from '../common';
export class GPUCanvasContext implements CanvasRenderingContext {
_type;
_canvas: any;
static {
Expand Down
18 changes: 2 additions & 16 deletions packages/canvas/common.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
(Set as any).prototype.remove = function (value) {
this.delete(value);
this.delete(value);
};


export interface CanvasRenderingContext {
}












export interface CanvasRenderingContext {}
3 changes: 2 additions & 1 deletion packages/canvas/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,5 @@ export { ImageBitmap } from './ImageBitmap';
export { CanvasRenderingContext2D } from './Canvas2D/CanvasRenderingContext2D';
export { WebGLRenderingContext } from './WebGL/WebGLRenderingContext';
export { WebGL2RenderingContext } from './WebGL2/WebGL2RenderingContext';
export { Canvas, createSVGMatrix, TouchEvent, PointerEvent } from './Canvas';
export { Canvas, createSVGMatrix } from './Canvas';
export { TouchEvent, PointerEvent } from './Canvas/common';
2 changes: 2 additions & 0 deletions packages/canvas/references.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/// <reference path="../../references.d.ts" />
/// <reference path="./typings/android.d.ts" />
/// <reference path="./typings/objc!CanvasNative.d.ts" />
86 changes: 53 additions & 33 deletions packages/canvas/typings/android.d.ts

Large diffs are not rendered by default.

0 comments on commit 3ae90a8

Please sign in to comment.