Merge pull request web-fragments#7 from 1000hz/infra-cleanup

Infra cleanup

Author: dario-piotrowicz

e2e/qwik-app/package.json

@@ -36,6 +36,7 @@
     "eslint": "^8.57.0",
     "eslint-plugin-qwik": "^1.5.7",
     "prettier": "^3.2.5",
+    "reframed": "workspace:*",
     "typescript": "5.4.5",
     "undici": "*",
     "vite": "^5.2.10",

e2e/qwik-app/vite.config.ts

@@ -1,4 +1,3 @@
-import {resolve} from "node:path";
 /**
  * This is the base config for vite.
  * When building, the adapter config is used which loads this file and extends it.
@@ -20,7 +19,7 @@ errorOnDuplicatesPkgDeps(devDependencies, dependencies);
 /**
  * Note that Vite normally starts from `index.html` but the qwikCity plugin makes start at `src/entry.ssr.tsx` instead.
  */
-export default defineConfig(({ command, mode }): UserConfig => {
+export default defineConfig((): UserConfig => {
   return {
     plugins: [qwikCity(), qwikVite(), tsconfigPaths()],
     // This tells Vite which dependencies to pre-build in dev mode.
@@ -34,11 +33,9 @@ export default defineConfig(({ command, mode }): UserConfig => {
     appType: "mpa", // so that Vite returns 404 on fetch to an non-existent .html file
     resolve: {
       alias: {
-        reframed: resolve(__dirname, "../../packages/reframed/index.ts"),
-
         // cross-repo development only!
         // requires writable-dom checked out as a sibling to `reframed`
-        "writable-dom": resolve(__dirname, "../../../writable-dom/src/index.ts"),
+        "writable-dom": new URL("../../../writable-dom/src/index.ts", import.meta.url).pathname,
       },
     },
 

e2e/remix-app/package.json

@@ -16,7 +16,8 @@
     "@remix-run/serve": "^2.9.2",
     "isbot": "^4.1.0",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "reframed": "workspace:*"
   },
   "devDependencies": {
     "@remix-run/dev": "^2.9.2",
@@ -40,4 +41,4 @@
   "engines": {
     "node": ">=20.0.0"
   }
-}
+}

e2e/remix-app/vite.config.ts

@@ -1,5 +1,4 @@
 import { vitePlugin as remix } from "@remix-run/dev";
-import { resolve } from "node:path";
 import { defineConfig } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
 
@@ -16,11 +15,9 @@ export default defineConfig({
   ],
   resolve: {
     alias: {
-      reframed: resolve(__dirname, "../../packages/reframed/index.ts"),
-
       // cross-repo development only!
       // requires writable-dom checked out as a sibling to `reframed`
-      "writable-dom": resolve(__dirname, "../../../writable-dom/src/index.ts"),
+      "writable-dom": new URL("../../../writable-dom/src/index.ts", import.meta.url).pathname,
     },
   },
 });

e2e/simple-spa/vite.config.ts

@@ -1,15 +1,12 @@
-import {resolve} from "node:path";
 import { defineConfig } from "vite";
 
 export default defineConfig({
   appType: "mpa", // so that Vite returns 404 on fetch to an non-existent .html file
   resolve: {
     alias: {
-      reframed: resolve(__dirname, "../../packages/reframed/index.ts"),
-
       // cross-repo development only!
       // requires writable-dom checked out as a sibling to `reframed`
-      "writable-dom": resolve(__dirname, "../../../writable-dom/src/index.ts"),
+      "writable-dom": new URL("../../../writable-dom/src/index.ts", import.meta.url).pathname,
     },
   },
 });

package.json

@@ -13,6 +13,10 @@
     "typescript": "^5.2.2",
     "vite": "^5.2.0"
   },
+  "engines": {
+    "pnpm": ">=9"
+  },
+  "engineStrict": true,
   "license": "MIT",
   "author": "Igor Minar <[email protected]> (https://igor.dev)",
   "contributors": [

packages/reframed/package.json

@@ -2,7 +2,10 @@
   "name": "reframed",
   "version": "0.0.5",
   "type": "module",
-  "module": "dist/reframed.js",
+  "module": "index.ts",
+  "publishConfig": {
+    "module": "dist/reframed.js"
+  },
   "files": [
     "dist"
   ],

packages/web-fragments/package.json

@@ -3,15 +3,25 @@
   "description": "",
   "type": "module",
   "exports": {
-		"./gateway": {
-			"import": "./dist/gateway.js",
-			"types": "./dist/gateway.d.ts"
-		},
-		"./elements": {
-			"import": "./dist/elements.js",
-			"types": "./dist/elements.d.ts"
-		}
-	},
+    "./gateway": {
+      "import": "./src/gateway/index.ts"
+    },
+    "./elements": {
+      "import": "./src/elements/index.ts"
+    }
+  },
+  "publishConfig": {
+    "exports": {
+      "./gateway": {
+        "import": "./dist/gateway.js",
+        "types": "./dist/gateway.d.ts"
+      },
+      "./elements": {
+        "import": "./dist/elements.js",
+        "types": "./dist/elements.d.ts"
+      }
+    }
+  },
   "version": "0.0.1",
   "scripts": {
     "dev": "vite",

packages/web-fragments/vite.config.ts

@@ -1,4 +1,3 @@
-import path from 'node:path';
 import { defineConfig } from 'vite';
 import dts from 'vite-plugin-dts';
 import react from '@vitejs/plugin-react';
@@ -14,8 +13,8 @@ export default defineConfig({
     emptyOutDir: false,
     lib: {
       entry: {
-        gateway: path.resolve(__dirname, 'src/gateway/index.ts'),
-        elements: path.resolve(__dirname, 'src/elements/index.ts'),
+        gateway: new URL('src/gateway/index.ts', import.meta.url).pathname,
+        elements: new URL('src/elements/index.ts', import.meta.url).pathname,
       },
       formats: ['es'],
     },
@@ -34,7 +33,7 @@ export default defineConfig({
       // cross-repo development only!
       // requires writable-dom checked out as a sibling to `reframed`
       // TODO: this is incorrect here and should be addressed as fragment-elements should be able to be standalone
-      "writable-dom": path.resolve(__dirname, "../../../writable-dom/src/index.ts"),
+      "writable-dom": new URL("../../../writable-dom/src/index.ts", import.meta.url).pathname,
     },
   },
 });