Update upscaler to build while leveraging shared folder (#1181)

thekevinscott · Oct 8, 2023 · e02c846 · e02c846
1 parent 980ee4b
commit e02c846
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 905 deletions.
diff --git a/packages/upscalerjs/package.json b/packages/upscalerjs/package.json
@@ -4,23 +4,23 @@
   "description": "Enhance Images with Javascript and AI. Increase resolution, retouch, denoise, and more. Open Source, Browser and Node Compatible, MIT License.",
   "exports": {
     "./node": {
-      "types": "./dist/node/node/cjs/index.d.ts",
-      "require": "./dist/node/node/cjs/index.js"
+      "types": "./dist/node/upscalerjs/src/node/cjs/index.d.ts",
+      "require": "./dist/node/upscalerjs/src/node/cjs/index.js"
     },
     "./node-gpu": {
-      "types": "./dist/node-gpu/node-gpu/cjs/index.d.ts",
-      "require": "./dist/node-gpu/node-gpu/cjs/index.js"
+      "types": "./dist/node-gpu/upscalerjs/src/node-gpu/cjs/index.d.ts",
+      "require": "./dist/node-gpu/upscalerjs/src/node-gpu/cjs/index.js"
     },
     ".": {
-      "types": "./dist/browser/esm/browser/esm/index.d.ts",
-      "import": "./dist/browser/esm/browser/esm/index.js"
+      "types": "./dist/browser/esm/upscalerjs/src/browser/esm/index.d.ts",
+      "import": "./dist/browser/esm/upscalerjs/src/browser/esm/index.js"
     }
   },
   "engines": {
     "node": ">=16.0"
   },
-  "module": "dist/browser/esm/browser/esm/index.js",
-  "types": "dist/browser/esm/browser/esm/index.d.ts",
+  "module": "dist/browser/esm/upscalerjs/src/browser/esm/index.js",
+  "types": "dist/browser/esm/upscalerjs/src/browser/esm/index.d.ts",
   "umd:main": "dist/browser/umd/upscaler.min.js",
   "keywords": [
     "image enhancement",
@@ -116,7 +116,7 @@
       "command": "tsc -p ./tsconfig.browser.umd.json --outDir ./dist/browser/tmp"
     },
     "build:browser:umd:rollup": {
-      "command": "rollup -c ./rollup.config.mjs --input ./dist/browser/tmp/browser/umd/index.js --file ./dist/browser/umd/upscaler.js --name Upscaler --format umd"
+      "command": "rollup -c ./rollup.config.mjs --input ./dist/browser/tmp/upscalerjs/src/browser/umd/index.js --file ./dist/browser/umd/upscaler.js --name Upscaler --format umd"
     },
     "build:browser:umd:uglify": {
       "command": "uglifyjs ./dist/browser/umd/upscaler.js --output ./dist/browser/umd/upscaler.min.js --compress --mangle --source-map"
@@ -183,7 +183,7 @@
       "command": "vitest --config vite.node.ts"
     },
     "validate:build": {
-      "command": "pnpm --filter @upscalerjs/scripts validate:build packages/upscalerjs -c './dist/node/node/cjs/cjs.js' -c './dist/node/node/cjs/cjs.d.ts' -c './dist/node-gpu/node-gpu/cjs/cjs.js' -c './dist/node-gpu/node-gpu/cjs/cjs.d.ts' -c './dist/browser/esm/browser/esm/index.js' -c './dist/browser/esm/browser/esm/index.d.ts' -c './dist/browser/umd/upscaler.js' -c './dist/browser/umd/upscaler.min.js'"
+      "command": "pnpm --filter @upscalerjs/scripts validate:build packages/upscalerjs -c './dist/node/upscalerjs/src/node/cjs/index.js' -c './dist/node/upscalerjs/src/node/cjs/index.d.ts' -c './dist/node-gpu/upscalerjs/src/node-gpu/cjs/index.js' -c './dist/node-gpu/upscalerjs/src/node-gpu/cjs/index.d.ts' -c './dist/browser/esm/upscalerjs/src/browser/esm/index.js' -c './dist/browser/esm/upscalerjs/src/browser/esm/index.d.ts' -c './dist/browser/umd/upscaler.js' -c './dist/browser/umd/upscaler.min.js'"
     }
   },
   "scripts": {

diff --git a/packages/upscalerjs/src/shared/upscaler.ts b/packages/upscalerjs/src/shared/upscaler.ts
@@ -30,7 +30,7 @@ import type {
 } from './types';
 import { cancellableWarmup, } from './warmup';
 import { cancellableUpscale, } from './upscale';
-import type { TF, ModelDefinitionObjectOrFn, } from '@upscalerjs/core';
+import type { TF, ModelDefinitionObjectOrFn, } from '../../../shared/src/types';
 import { getModel, } from './model-utils';
 
 // TODO: Why do we need to explicitly cast this to ModelDefinition?

diff --git a/packages/upscalerjs/tsconfig.json b/packages/upscalerjs/tsconfig.json
@@ -6,7 +6,6 @@
     "declaration": true,
     "declarationMap": true,
     "outDir": "./dist",
-    "rootDir": "./src",
     "baseUrl": "./src",
     "skipLibCheck": true,
     "strict": true,
@@ -18,7 +17,8 @@
     "removeComments": true,
     "noUnusedParameters": true,
     "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "rootDirs": ["./src", "../shared/src"],
   },
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules", "**/*.test.ts"]

diff --git a/scripts/package-scripts/clean-model.ts b/scripts/package-scripts/clean-model.ts