Do not bundle library packages

sillsdev · Nov 12, 2024 · c2d278f · c2d278f
1 parent 6f7ec74
commit c2d278f
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -20,7 +20,7 @@
   },
   "scripts": {
     "build": "tsup-node",
-    "dev": "tsup-node --watch",
+    "dev": "tsup-node --watch --sourcemap",
     "check-types": "tsc --noEmit",
     "lint": "eslint .",
     "test": "vitest",
@@ -37,6 +37,7 @@
     "@repo/eslint-config": "*",
     "@repo/typescript-config": "*",
     "@vitest/coverage-v8": "^2.1.4",
+    "esbuild-fix-imports-plugin": "^1.0.6",
     "eslint": "^9.9.1",
     "tsup": "^8.3.0",
     "typescript": "^5.5.4",

diff --git a/packages/core/src/workspace/localizer.ts b/packages/core/src/workspace/localizer.ts
@@ -26,7 +26,7 @@ export class Localizer {
     await this.i18n.loadNamespaces(Array.from(this.backend.namespaces));
   }
 
-  addNamespace(namespace: string, loader: (language: string) => Promise<unknown>): void {
+  addNamespace(namespace: string, loader: (language: string) => unknown): void {
     if (this.i18n.hasLoadedNamespace(namespace)) {
       return;
     }
@@ -43,7 +43,7 @@ export class Localizer {
 }
 
 class LocalBackend {
-  private readonly namespaceLoaders = new Map<string, (language: string) => Promise<unknown>>();
+  private readonly namespaceLoaders = new Map<string, (language: string) => unknown>();
   readonly type = 'backend';
 
   get namespaces(): Iterable<string> {
@@ -54,7 +54,7 @@ class LocalBackend {
     // do nothing
   }
 
-  addNamespace(namespace: string, loader: (language: string) => Promise<unknown>): void {
+  addNamespace(namespace: string, loader: (language: string) => unknown): void {
     this.namespaceLoaders.set(namespace, loader);
   }
 
@@ -64,8 +64,11 @@ class LocalBackend {
       callback(new Error(`No loader for namespace ${namespace}`));
       return;
     }
-    loader(language)
+    Promise.resolve(loader(language))
       .then((data) => {
+        if (data != null && typeof data === 'object' && 'default' in data) {
+          data = data.default;
+        }
         callback(null, data);
       })
       .catch(callback);

diff --git a/packages/core/tsup.config.js b/packages/core/tsup.config.js
@@ -1,10 +1,11 @@
+import { fixImportsPlugin } from 'esbuild-fix-imports-plugin';
 import { defineConfig } from 'tsup';
 
 export default defineConfig({
-  entry: ['src/index.ts'],
+  entry: ['src/**/*.ts', '!src/**/*.test.ts'],
   dts: true,
   clean: true,
   format: ['esm', 'cjs'],
-  bundle: true,
-  sourcemap: true,
+  bundle: false,
+  esbuildPlugins: [fixImportsPlugin()],
 });
diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -20,7 +20,7 @@
   },
   "scripts": {
     "build": "tsup-node",
-    "dev": "tsup-node --watch",
+    "dev": "tsup-node --watch --sourcemap",
     "check-types": "tsc --noEmit",
     "lint": "eslint .",
     "test": "vitest",
@@ -36,6 +36,8 @@
     "@repo/eslint-config": "*",
     "@repo/typescript-config": "*",
     "@vitest/coverage-v8": "^2.1.4",
+    "copy-folder-util": "^1.1.4",
+    "esbuild-fix-imports-plugin": "^1.0.6",
     "eslint": "^9.9.1",
     "tsup": "^8.3.0",
     "typescript": "^5.5.4",

diff --git a/packages/examples/src/verse-order-diagnostic-provider.ts b/packages/examples/src/verse-order-diagnostic-provider.ts
@@ -48,7 +48,10 @@ export class VerseOrderDiagnosticProvider implements DiagnosticProvider {
   }
 
   init(): Promise<void> {
-    this.localizer.addNamespace('verseOrder', (language: string) => import(`./locales/${language}/verse-order.json`));
+    this.localizer.addNamespace(
+      'verseOrder',
+      (language: string) => import(`./locales/${language}/verse-order.json`, { with: { type: 'json' } }),
+    );
     return Promise.resolve();
   }
 

diff --git a/packages/examples/tsconfig.json b/packages/examples/tsconfig.json
@@ -3,7 +3,6 @@
 
   "compilerOptions": {
     "outDir": "dist",
-    "rootDir": "src",
-    "resolveJsonModule": true
+    "rootDir": "src"
   }
 }
diff --git a/packages/examples/tsup.config.js b/packages/examples/tsup.config.js
@@ -1,10 +1,17 @@
+import { fixImportsPlugin } from 'esbuild-fix-imports-plugin';
 import { defineConfig } from 'tsup';
 
 export default defineConfig({
-  entry: ['src/index.ts'],
+  entry: ['src/**/*.ts', '!src/**/*.test.ts'],
   dts: true,
   clean: true,
   format: ['esm', 'cjs'],
-  bundle: true,
-  sourcemap: true,
+  bundle: false,
+  onSuccess: 'copy-folder src/locales dist/locales',
+  esbuildPlugins: [fixImportsPlugin()],
+  esbuildOptions(options) {
+    options.supported = {
+      'import-attributes': true,
+    };
+  },
 });
diff --git a/packages/usfm/package.json b/packages/usfm/package.json
@@ -20,7 +20,7 @@
   },
   "scripts": {
     "build": "tsup-node",
-    "dev": "tsup-node --watch",
+    "dev": "tsup-node --watch --sourcemap",
     "check-types": "tsc --noEmit",
     "lint": "eslint .",
     "test": "vitest",
@@ -37,6 +37,7 @@
     "@repo/eslint-config": "*",
     "@repo/typescript-config": "*",
     "@vitest/coverage-v8": "^2.1.4",
+    "esbuild-fix-imports-plugin": "^1.0.6",
     "eslint": "^9.9.1",
     "tsup": "^8.3.0",
     "typescript": "^5.5.4",

diff --git a/packages/usfm/tsup.config.js b/packages/usfm/tsup.config.js
@@ -1,10 +1,11 @@
+import { fixImportsPlugin } from 'esbuild-fix-imports-plugin';
 import { defineConfig } from 'tsup';
 
 export default defineConfig({
-  entry: ['src/index.ts'],
+  entry: ['src/**/*.ts', '!src/**/*.test.ts'],
   dts: true,
   clean: true,
   format: ['esm', 'cjs'],
-  bundle: true,
-  sourcemap: true,
+  bundle: false,
+  esbuildPlugins: [fixImportsPlugin()],
 });