From b3dd117b78274b4b5152120392c4af76a2a4fb74 Mon Sep 17 00:00:00 2001 From: Will Eastcott Date: Tue, 6 Jan 2026 11:00:56 +0000 Subject: [PATCH 1/2] Switch to npm link for using local libs --- package.json | 3 --- rollup.config.mjs | 18 +----------------- src/export-panel.ts | 2 +- src/feedback-panel.ts | 2 +- src/file-tabs.ts | 2 +- src/files-browser-panel.ts | 2 +- src/index.ts | 2 +- src/info-panel.ts | 2 +- src/inspector-panel.ts | 2 +- src/main.ts | 2 +- src/render-canvas.ts | 2 +- src/reproject-panel.ts | 2 +- src/show-panel.ts | 2 +- src/viewport-panel.ts | 2 +- tsconfig.json | 6 +----- 15 files changed, 14 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index f1470ca..ebc8fcd 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "@playcanvas/eslint-config": "2.1.0", "@playcanvas/observer": "1.6.6", "@playcanvas/pcui": "5.4.1", - "@rollup/plugin-alias": "6.0.0", "@rollup/plugin-json": "6.1.0", "@rollup/plugin-node-resolve": "16.0.3", "@rollup/plugin-typescript": "12.1.4", @@ -33,7 +32,6 @@ "@typescript-eslint/eslint-plugin": "8.51.0", "@typescript-eslint/parser": "8.51.0", "concurrently": "9.2.1", - "cross-env": "10.1.0", "eslint": "9.39.2", "eslint-import-resolver-typescript": "4.4.4", "globals": "17.0.0", @@ -48,7 +46,6 @@ "build": "rollup -c", "build:watch": "rollup -c -w", "develop": "concurrently --kill-others \"npm run build:watch\" \"npm run serve\"", - "develop:local": "cross-env ENGINE_PATH=../engine npm run develop", "lint": "eslint src", "serve": "serve dist" } diff --git a/rollup.config.mjs b/rollup.config.mjs index 354ec64..f52c5d0 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -1,25 +1,10 @@ -import path from 'path'; import { copyAndWatch } from './plugins/copy-and-watch.mjs'; import resolve from '@rollup/plugin-node-resolve'; -import alias from '@rollup/plugin-alias'; import json from '@rollup/plugin-json'; import sass from 'rollup-plugin-sass'; import typescript from '@rollup/plugin-typescript'; -const PROD_BUILD = process.env.BUILD_TYPE === 'prod'; -const HREF = process.env.BASE_HREF || ''; -const ENGINE_DIR = process.env.ENGINE_PATH || 'node_modules/playcanvas'; -const PCUI_DIR = process.env.PCUI_PATH || 'node_modules/@playcanvas/pcui'; - -const ENGINE_NAME = PROD_BUILD ? 'playcanvas.mjs' : 'playcanvas.dbg.mjs'; -const ENGINE_PATH = path.resolve(ENGINE_DIR, 'build', ENGINE_NAME); -const PCUI_PATH = path.resolve(PCUI_DIR, 'dist/module/src/index.mjs'); - -// define supported module overrides -const aliasEntries = { - 'playcanvas': ENGINE_PATH, - 'pcui': PCUI_PATH -}; +const HREF = process.env.BASE_HREF || ''; const TARGETS = [ { @@ -46,7 +31,6 @@ export default { }, plugins: [ copyAndWatch(TARGETS), - alias({ entries: aliasEntries }), resolve(), typescript({ tsconfig: './tsconfig.json' diff --git a/src/export-panel.ts b/src/export-panel.ts index 9f555d5..2454ed6 100644 --- a/src/export-panel.ts +++ b/src/export-panel.ts @@ -1,4 +1,4 @@ -import { Button, Panel, Container } from 'pcui'; +import { Button, Panel, Container } from '@playcanvas/pcui'; import { RenderTarget, Texture, WebglGraphicsDevice } from 'playcanvas'; import type { EventHandle } from '@playcanvas/observer'; diff --git a/src/feedback-panel.ts b/src/feedback-panel.ts index 6339912..f7d304a 100644 --- a/src/feedback-panel.ts +++ b/src/feedback-panel.ts @@ -1,4 +1,4 @@ -import { Container, Button } from 'pcui'; +import { Container, Button } from '@playcanvas/pcui'; class FeedbackPanel extends Container { constructor(args: Record = {}) { diff --git a/src/file-tabs.ts b/src/file-tabs.ts index 8890914..4bac901 100644 --- a/src/file-tabs.ts +++ b/src/file-tabs.ts @@ -1,4 +1,4 @@ -import { Container, Label } from 'pcui'; +import { Container, Label } from '@playcanvas/pcui'; import type { TextureManager } from './texture-manager'; import type { TextureDoc } from './texture-doc'; diff --git a/src/files-browser-panel.ts b/src/files-browser-panel.ts index 12249b6..8f608c4 100644 --- a/src/files-browser-panel.ts +++ b/src/files-browser-panel.ts @@ -1,4 +1,4 @@ -import { Panel, Container, Button, TreeView, TreeViewItem, TextInput } from 'pcui'; +import { Panel, Container, Button, TreeView, TreeViewItem, TextInput } from '@playcanvas/pcui'; import { path } from 'playcanvas'; import type { TextureManager } from './texture-manager'; import type { TextureDoc } from './texture-doc'; diff --git a/src/index.ts b/src/index.ts index cf577c4..07ebb4f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,7 @@ import './main'; import './style.scss'; -import { version as pcuiVersion, revision as pcuiRevision } from 'pcui'; +import { version as pcuiVersion, revision as pcuiRevision } from '@playcanvas/pcui'; import { version as engineVersion, revision as engineRevision } from 'playcanvas'; import { version as textureToolVersion } from '../package.json'; diff --git a/src/info-panel.ts b/src/info-panel.ts index 5101663..a2bce99 100644 --- a/src/info-panel.ts +++ b/src/info-panel.ts @@ -1,4 +1,4 @@ -import { Panel, Label } from 'pcui'; +import { Panel, Label } from '@playcanvas/pcui'; import { PixelFormatTable, TextureTypeTable } from './const'; import type { TextureManager } from './texture-manager'; diff --git a/src/inspector-panel.ts b/src/inspector-panel.ts index fb68ae5..1d871ba 100644 --- a/src/inspector-panel.ts +++ b/src/inspector-panel.ts @@ -1,4 +1,4 @@ -import { Container } from 'pcui'; +import { Container } from '@playcanvas/pcui'; import { TextureExportPanel } from './export-panel'; import { FeedbackPanel } from './feedback-panel'; diff --git a/src/main.ts b/src/main.ts index 0acecce..8af3b80 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,4 +1,4 @@ -import { Container } from 'pcui'; +import { Container } from '@playcanvas/pcui'; import { path } from 'playcanvas'; import { DropHandler } from './drop-handler'; diff --git a/src/render-canvas.ts b/src/render-canvas.ts index bf86880..20b9efb 100644 --- a/src/render-canvas.ts +++ b/src/render-canvas.ts @@ -1,4 +1,4 @@ -import { Container } from 'pcui'; +import { Container } from '@playcanvas/pcui'; import type { LayerComposition } from 'playcanvas'; import type { Renderer } from './renderer'; diff --git a/src/reproject-panel.ts b/src/reproject-panel.ts index 4f6aac3..ffcf8c6 100644 --- a/src/reproject-panel.ts +++ b/src/reproject-panel.ts @@ -1,4 +1,4 @@ -import { Button, Panel, Container, SelectInput, LabelGroup, NumericInput } from 'pcui'; +import { Button, Panel, Container, SelectInput, LabelGroup, NumericInput } from '@playcanvas/pcui'; import { Texture, Asset, reprojectTexture, PIXELFORMAT_R8_G8_B8_A8, PIXELFORMAT_RGBA16F, PIXELFORMAT_RGBA32F, diff --git a/src/show-panel.ts b/src/show-panel.ts index 46e3904..5099288 100644 --- a/src/show-panel.ts +++ b/src/show-panel.ts @@ -1,4 +1,4 @@ -import { Panel, Button, Container, LabelGroup, SelectInput, SliderInput, BooleanInput } from 'pcui'; +import { Panel, Button, Container, LabelGroup, SelectInput, SliderInput, BooleanInput } from '@playcanvas/pcui'; import type { EventHandle } from '@playcanvas/observer'; import type { TextureManager } from './texture-manager'; import type { TextureDoc } from './texture-doc'; diff --git a/src/viewport-panel.ts b/src/viewport-panel.ts index 8da6055..5f85cfc 100644 --- a/src/viewport-panel.ts +++ b/src/viewport-panel.ts @@ -1,4 +1,4 @@ -import { Container } from 'pcui'; +import { Container } from '@playcanvas/pcui'; import type { EventHandle } from '@playcanvas/observer'; import { InfoPanel } from './info-panel'; diff --git a/tsconfig.json b/tsconfig.json index 335fef1..dbe2793 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,11 +13,7 @@ "resolveJsonModule": true, "sourceMap": true, "target": "es2022", - "skipLibCheck": true, - "paths": { - "pcui": ["node_modules/@playcanvas/pcui/types/index.d.ts"], - "playcanvas": ["node_modules/playcanvas/build/playcanvas.d.ts"] - } + "skipLibCheck": true }, "include": ["src/**/*.ts"], "exclude": ["node_modules", "dist"] From 4c6097b09e152cadb076a28b7de7a413d5f49a43 Mon Sep 17 00:00:00 2001 From: Will Eastcott Date: Tue, 6 Jan 2026 11:02:08 +0000 Subject: [PATCH 2/2] Update package-lock.json --- package-lock.json | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/package-lock.json b/package-lock.json index f115e14..2ac50f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,6 @@ "@playcanvas/eslint-config": "2.1.0", "@playcanvas/observer": "1.6.6", "@playcanvas/pcui": "5.4.1", - "@rollup/plugin-alias": "6.0.0", "@rollup/plugin-json": "6.1.0", "@rollup/plugin-node-resolve": "16.0.3", "@rollup/plugin-typescript": "12.1.4", @@ -20,7 +19,6 @@ "@typescript-eslint/eslint-plugin": "8.51.0", "@typescript-eslint/parser": "8.51.0", "concurrently": "9.2.1", - "cross-env": "10.1.0", "eslint": "9.39.2", "eslint-import-resolver-typescript": "4.4.4", "globals": "17.0.0", @@ -66,13 +64,6 @@ "tslib": "^2.4.0" } }, - "node_modules/@epic-web/invariant": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz", - "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==", - "dev": true, - "license": "MIT" - }, "node_modules/@es-joy/jsdoccomment": { "version": "0.50.2", "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.50.2.tgz", @@ -678,24 +669,6 @@ "react-dom": "^18.3.1 || ^19.0.0" } }, - "node_modules/@rollup/plugin-alias": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-6.0.0.tgz", - "integrity": "sha512-tPCzJOtS7uuVZd+xPhoy5W4vThe6KWXNmsFCNktaAh5RTqcLiSfT4huPQIXkgJ6YCOjJHvecOAzQxLFhPxKr+g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=20.19.0" - }, - "peerDependencies": { - "rollup": ">=4.0.0" - }, - "peerDependenciesMeta": { - "rollup": { - "optional": true - } - } - }, "node_modules/@rollup/plugin-json": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.1.0.tgz", @@ -2602,24 +2575,6 @@ "node": ">= 0.6" } }, - "node_modules/cross-env": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz", - "integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@epic-web/invariant": "^1.0.0", - "cross-spawn": "^7.0.6" - }, - "bin": { - "cross-env": "dist/bin/cross-env.js", - "cross-env-shell": "dist/bin/cross-env-shell.js" - }, - "engines": { - "node": ">=20" - } - }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",