Fix build paths (hopefully for good this time!)

enketo · Mar 1, 2023 · 69109d0 · 69109d0
1 parent 51595b4
commit 69109d0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "type": "module",
     "main": "./dist/enketo-transformer/transformer.cjs",
     "module": "./dist/enketo-transformer/enketo-transformer.js",
-    "browser": "./dist/@enketo/transformer-web/transformer.js",
+    "browser": "./dist/enketo-transformer/web/transformer.js",
     "types": "./dist/types/src/transformer.d.ts",
     "files": [
         "app.js",
@@ -16,7 +16,7 @@
         ".": {
             "import": "./dist/enketo-transformer/enketo-transformer.js",
             "require": "./dist/enketo-transformer/transformer.cjs",
-            "browser": "./dist/@enketo/transformer-web/transformer.js",
+            "browser": "./dist/enketo-transformer/web/transformer.js",
             "types": "./dist/types/src/transformer.d.ts"
         },
         "./dom": {
@@ -26,14 +26,14 @@
             "types": "./dist/types/src/dom/node/index.d.ts"
         },
         "./web": {
-            "default": "./dist/@enketo/transformer-web/transformer.js",
-            "types": "./dist/@enketo/transformer-web/src/transformer.d.ts"
+            "default": "./dist/enketo-transformer/web/transformer.js",
+            "types": "./dist/enketo-transformer/web/src/transformer.d.ts"
         }
     },
     "typesVersions": {
         "*": {
             "web": [
-                "./dist/types/src/transformer.d.ts"
+                "./dist/enketo-transformer/web/src/transformer.d.ts"
             ]
         }
     },

diff --git a/tsconfig.web.json b/tsconfig.web.json
@@ -4,7 +4,7 @@
         "declaration": true,
         "emitDeclarationOnly": true,
         "noEmit": false,
-        "outDir": "./dist/@enketo/transformer-web",
+        "outDir": "./dist/enketo-transformer/web",
         "paths": {
             "enketo-transformer/dom": ["src/dom/web/index.ts"]
         }

diff --git a/vite.config.ts b/vite.config.ts
@@ -74,32 +74,20 @@ export default defineConfig(async () => {
               },
           ];
 
+    const baseName = isWeb ? 'enketo-transformer/web' : 'enketo-transformer';
+
     return {
         assetsInclude: ['**/*.xml', '**/*.xsl'],
         build: {
             lib: {
                 entry,
                 formats,
-                name: 'enketo-transformer',
+                name: baseName,
+                // Note: this is only called for Node builds.
                 fileName(format, entryName) {
                     const extension = format === 'es' ? '.js' : '.cjs';
 
-                    if (isWeb) {
-                        const resolved = entryName
-                            .replace('src/', '@enketo/transformer-web/')
-                            .replace(
-                                'node_modules/.vite/deps_build-dist/',
-                                '@enketo/transformer-web/deps/'
-                            )
-                            .replace(
-                                'node_modules/',
-                                '@enketo/transformer-web/deps/'
-                            );
-
-                        return `${resolved}${extension}`;
-                    }
-
-                    return `enketo-transformer/${entryName.replace(
+                    return `${baseName}/${entryName.replace(
                         'src/',
                         ''
                     )}${extension}`;