Revamp build process

.github/workflows/CI.yml

@@ -16,7 +16,7 @@ jobs:
         working-directory: ./shared
     strategy:
       matrix:
-        node: ['20.x', '22.x']
+        node: ['22.x', '24.x']
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:

navigator-html-injectables/package.json

@@ -30,16 +30,14 @@
     "clean": "rimraf types dist",
     "build": "pnpm clean && tsc && vite build"
   },
-  "main": "./dist/index.umd.cjs",
-  "module": "./dist/index.js",
   "types": "./types/src/index.d.ts",
   "exports": {
     ".": {
       "types": "./types/src/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.umd.cjs"
+      "import": "./dist/index.js"
     }
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "src",
@@ -48,10 +46,12 @@
   "engines": {
     "node": ">=18"
   },
+  "dependencies": {
+    "@readium/shared": "workspace:*"
+  },
   "devDependencies": {
-    "@readium/shared": "workspace:*",
     "css-selector-generator": "^3.8.0",
-    "rimraf": "^6.1.2",
+    "rimraf": "^6.1.3",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
     "vite": "^7.3.1"

navigator-html-injectables/src/index.ts

@@ -1,3 +1,5 @@
+export { __htmlLocations } from "@readium/shared/html";
+
 export * from './comms/index.ts';
 export * from './modules/index.ts';
 export * from './Loader.ts';

navigator-html-injectables/tsconfig.json

@@ -24,7 +24,7 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     // use Node's module resolution algorithm, instead of the legacy TS one
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     // transpile JSX to React.createElement
     "jsx": "react",
     // interop between ESM and CJS modules. Recommended by TS

navigator-html-injectables/vite.config.js

@@ -4,20 +4,21 @@ import packageJson from "./package.json";
 
 export default defineConfig({
   build: {
-    lib: {
-      entry: resolve(__dirname, "src/index.ts"),
-      name: "navigator-html-injectables",
-      fileName: "index"
+    rollupOptions: {
+      input: resolve(__dirname, "src/index.ts"),
+      external: [/^@readium\/shared(\/.*)?$/],
+      preserveEntrySignatures: "strict",
+      output: {
+        format: "es",
+        preserveModules: true,
+        preserveModulesRoot: resolve(__dirname, "src"),
+        dir: "dist",
+        entryFileNames: "[name].js",
+      }
     }
   },
   define: {
     "import.meta.env.PACKAGE_NAME": JSON.stringify(packageJson.name),
     "import.meta.env.PACKAGE_VERSION": JSON.stringify(packageJson.version),
-  },
-  resolve: {
-    alias: {
-      // Treat shared as internal source code when building standalone
-      "@readium/shared": resolve(__dirname, "../shared/src")
-    }
   }
 });

navigator/package.json

@@ -26,16 +26,14 @@
     "reader",
     "viewer"
   ],
-  "main": "./dist/index.umd.cjs",
-  "module": "./dist/index.js",
   "types": "./types/src/index.d.ts",
   "exports": {
     ".": {
       "types": "./types/src/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.umd.cjs"
+      "import": "./dist/index.js"
     }
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "src",
@@ -49,18 +47,19 @@
     "build": "pnpm clean && node scripts/generate-css-selector.js && tsc && vite build",
     "generate:css-selector": "node scripts/generate-css-selector.js"
   },
+  "dependencies": {
+    "@readium/navigator-html-injectables": "workspace:*",
+    "@readium/shared": "workspace:*"
+  },
   "devDependencies": {
     "@readium/css": "^2.0.5",
-    "@readium/navigator-html-injectables": "workspace:*",
-    "@readium/shared": "workspace:*",
     "@types/path-browserify": "^1.0.3",
     "css-selector-generator": "^3.8.0",
     "path-browserify": "^1.0.1",
-    "rimraf": "^6.1.2",
+    "rimraf": "^6.1.3",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
-    "typescript-plugin-css-modules": "^5.2.0",
-    "user-agent-data-types": "^0.4.2",
+    "user-agent-data-types": "^0.4.3",
     "vite": "^7.3.1"
   }
 }

navigator/src/index.ts

@@ -1,3 +1,5 @@
+export { __htmlLocations } from "@readium/shared/html";
+
 export * from './Navigator.ts';
 export * from './webpub/index.ts';
 export * from './epub/index.ts';

navigator/tsconfig.json

@@ -12,11 +12,7 @@
       "dom",
       "dom.iterable"
     ],
-    "plugins": [
-      {
-        "name": "typescript-plugin-css-modules"
-      }
-    ],
+
     "importHelpers": true,
     // output .d.ts declaration files for consumers
     "declaration": true,

navigator/vite.config.js

@@ -4,21 +4,21 @@ import packageJson from "./package.json";
 
 export default defineConfig({
   build: {
-    lib: {
-      entry: resolve(__dirname, "src/index.ts"),
-      name: "navigator",
-      fileName: "index"
+    rollupOptions: {
+      input: resolve(__dirname, "src/index.ts"),
+      external: [/^@readium\/shared(\/.*)?$/, "@readium/navigator-html-injectables"],
+      preserveEntrySignatures: "strict",
+      output: {
+        format: "es",
+        preserveModules: true,
+        preserveModulesRoot: resolve(__dirname, "src"),
+        dir: "dist",
+        entryFileNames: "[name].js",
+      }
     }
   },
   define: {
     "import.meta.env.PACKAGE_NAME": JSON.stringify(packageJson.name),
     "import.meta.env.PACKAGE_VERSION": JSON.stringify(packageJson.version),
-  },
-  resolve: {
-    alias: {
-      // Treat both packages as internal source code to eliminate duplication
-      "@readium/navigator-html-injectables": resolve(__dirname, "../navigator-html-injectables/src"),
-      "@readium/shared": resolve(__dirname, "../shared/src")
-    }
   }
 });

package.json

@@ -11,5 +11,5 @@
         "navigator-html-injectables",
         "shared"
     ],
-    "packageManager": "pnpm@10.28.2"
+    "packageManager": "pnpm@11.1.0"
 }