wirejs-deploy-amplify-basic 0.0.114-realtime → 0.0.116-realtime

package/amplify-hosting-assets/compute/default/package.json

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.1",
 		"wirejs-dom": "^1.0.41",
-		"wirejs-resources": "^0.1.82-realtime"
+		"wirejs-resources": "^0.1.84-realtime"
 	}
 }

package/build.js

@@ -5,8 +5,7 @@ import path from 'path';
 import fs from 'fs';
 import { rimraf } from 'rimraf';
 import copy from 'recursive-copy';
-import esbuild from 'esbuild';
-import { exec, execSync } from 'child_process';
+import { execSync } from 'child_process';
 
 const CWD = process.cwd();
 const __filename = import.meta.url.replace(/^file:/, '');
@@ -85,53 +84,16 @@ async function installDeps() {
  * 
  * @returns {Promise<string>} output filename
  */
-async function buildApiBundle() {
-	console.log("building api")
-	// looks like cruft at the moment, but we'll see ...
-	// await import(path.join(PROJECT_API_DIR, 'index.js'));
-
-	const outputPath = path.join(BACKEND_DIR, 'api.js');
-
-	// intermediate build of the resource overrides. this includes any deps we have
-	// on the original `wirejs-resources` into the intermediate bundle. doing this
-	// allows us to completely override (alias) `wirejs-resources` in the final build
-	// without creating a circular alias.
-	// console.log("creating intermediate wirejs-resources overrides");
-	// await esbuild.build({
-	// 	entryPoints: [path.join(SELF_DIR, 'wirejs-resources-overrides', 'index.js')],
-	// 	bundle: true,
-	// 	outfile: RESOURCE_OVERRIDES_BUILD,
-	// 	platform: 'node',
-	// 	format: 'esm',
-	// 	external: ['@aws-sdk/client-s3']
-	// });
-
-	// exploratory build. builds using our overrides, which will emit a manifest of
-	// resources required by the API when imported.
-	console.log("creating api bundle using platform overrides");
-	await esbuild.build({
-		entryPoints: [path.join('.', 'api', 'index.ts')],
-		bundle: false,
-		outfile: outputPath,
-		platform: 'node',
-		format: 'esm',
-		// alias: {
-		// 	'wirejs-resources': RESOURCE_OVERRIDES_BUILD
-		// },
-		// external: ['@aws-sdk/client-s3']
-	});
-
-	// exploratory import. not strictly necessary until we're actually using the manifest
-	// to direct construction of backend resources. for now, this is just informational/
-	// confirmational that we're building things properly.
-	await import(outputPath);
+async function discoverResources() {
+	console.log("discovering resources")
+	// exploratory import. resources will emit to globalThis.wirejsResources
+	execSync(`cd api && npm run prebuild`);
+	await import(path.join(CWD, 'api', 'dist', 'index.js'));
 	console.log('discovered resources', globalThis.wirejsResources);
 	await fs.promises.writeFile(
 		path.join(BACKEND_DIR, 'generated-resources.ts'),
 		`export default ${JSON.stringify(globalThis.wirejsResources, null, 2)}`
 	);
-
-	return outputPath;
 }
 
 async function deployFrontend() {
@@ -164,7 +126,7 @@ if (action === 'prebuild') {
 	console.log("starting prebuild");
 	await createSkeleton();
 	await installDeps();
-	await buildApiBundle();
+	await discoverResources();
 
 	console.log("prebuild done");
 } else if (action === 'inject-backend') {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.0.114-realtime",
+	"version": "0.0.116-realtime",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -41,7 +41,7 @@
 		"recursive-copy": "^2.0.14",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.41",
-		"wirejs-resources": "^0.1.82-realtime"
+		"wirejs-resources": "^0.1.84-realtime"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",