wirejs-deploy-amplify-basic 0.1.157-llm → 0.1.159-llm

package/amplify-backend-assets/{functions/api → api}/handler.ts

@@ -10,7 +10,7 @@ import {
 } from 'wirejs-resources';
 
 // @ts-ignore
-import * as api from '../../../api/index';
+import * as api from './index.js';
 
 function deriveLocation(event: APIGatewayProxyEventV2) {
 	if (event.headers['x-wirejs-location']) {

package/amplify-backend-assets/backend.ts

@@ -4,7 +4,11 @@ import {
   defineBackend,
 } from '@aws-amplify/backend';
 import { Duration, RemovalPolicy, NestedStack } from "aws-cdk-lib";
-import { FunctionUrlAuthType, IFunction, Runtime } from 'aws-cdk-lib/aws-lambda';
+import { 
+  FunctionUrlAuthType,
+  IFunction,
+  Runtime,
+} from 'aws-cdk-lib/aws-lambda';
 import { NodejsFunction, OutputFormat } from 'aws-cdk-lib/aws-lambda-nodejs';
 import { Bucket, BlockPublicAccess } from 'aws-cdk-lib/aws-s3';
 import { Table, AttributeType, BillingMode } from 'aws-cdk-lib/aws-dynamodb';
@@ -17,6 +21,8 @@ import { auth } from './auth/resource';
 
 // @ts-ignore
 import generatedResources from './generated-resources';
+import { copyFileSync } from 'fs';
+import { cwd } from 'process';
 
 const __filename = import.meta.url.replace(/^file:/, '');
 const __dirname = path.dirname(__filename);
@@ -38,20 +44,29 @@ const SELF_INVOCATION_ID = randomUUID();
  */
 const backend = defineBackend({ auth });
 
+// const api = new Function(backend.stack, 'ApiHandler', {
+//   runtime: Runtime.NODEJS_22_X,
+//   memorySize: 2 * 1024,
+//   handler: 'handler.handler',
+//   code: Code.fromAsset(path.join(__dirname, 'api')),
+//   timeout: Duration.minutes(15),
+// });
+
+copyFileSync(
+  path.join(__dirname, 'api', 'handler.ts'),
+  path.join(cwd(), 'api', 'wirejs-handler.ts')
+);
+
 const api = new NodejsFunction(backend.stack, 'ApiHandler', {
   runtime: Runtime.NODEJS_22_X,
   memorySize: 2 * 1024,
   handler: 'handler',
-  entry: path.join(__dirname, 'functions', 'api', 'handler.ts'),
+  entry: path.join(cwd(), 'api', 'wirejs-handler.ts'),
   bundling: {
-    minify: true,
-    format: OutputFormat.ESM,
-    nodeModules: [
-      'jsdom',
-    ],
+    nodeModules: ['jsdom'],
+    format: OutputFormat.ESM
   },
-  depsLockFilePath: path.join(process.cwd(), 'package-lock.json'),
-  timeout: Duration.minutes(15),
+  depsLockFilePath: path.join(cwd(), 'package-lock.json')
 });
 
 /**

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

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.1",
 		"wirejs-dom": "^1.0.44",
-		"wirejs-resources": "^0.1.157-llm"
+		"wirejs-resources": "^0.1.159-llm"
 	}
 }

package/build.js

@@ -5,12 +5,14 @@ import path from 'path';
 import fs from 'fs';
 import { rimraf } from 'rimraf';
 import copy from 'recursive-copy';
-import { execSync } from 'child_process';
+import { exec, execSync } from 'child_process';
+import { buildSync } from 'esbuild';
+import { randomUUID } from 'crypto';
 
 const CWD = process.cwd();
 const __filename = import.meta.url.replace(/^file:/, '');
+
 const SELF_DIR = path.dirname(__filename);
-const TEMP_DIR = path.join(SELF_DIR, 'temp');
 const PROJECT_API_DIR = path.join(CWD, 'api');
 const PROJECT_DIST_DIR = path.join(CWD, 'dist');
 const BACKEND_DIR = path.join(CWD, 'amplify');
@@ -32,14 +34,14 @@ async function createSkeleton() {
 	await fs.promises.mkdir(COMPUTE_DIR, { recursive: true });
 	
 	// skeleton for backend assets
-	await copy(path.join(SELF_DIR, 'amplify-backend-assets'), path.join(BACKEND_DIR));
-	
+	await copy(path.join(SELF_DIR, 'amplify-backend-assets'), BACKEND_DIR);
+
 	// skeleton for hosting assets
-	await copy(path.join(SELF_DIR, 'amplify-hosting-assets'), path.join(HOSTING_DIR));
+	await copy(path.join(SELF_DIR, 'amplify-hosting-assets'), HOSTING_DIR);
 	console.log("done creating deployment directories")
 
 	console.log("installing SSR server deps");
-	execSync(`npm install --prefix ${COMPUTE_DIR} --no-hoist`)
+	execSync(`npm install --prefix ${COMPUTE_DIR}`)
 }
 
 /**
@@ -54,7 +56,7 @@ async function installDeps() {
 		...{
 			'@aws-amplify/backend': '^1.14.0',
 			'@aws-amplify/backend-cli': '^1.4.8',
-			"@aws-sdk/client-dynamodb": "^3.799.0",
+			"@aws-sdk/client-dynamodb": "^3.774.0", // for GSI handler
 			'aws-cdk': '^2.177.0',
 			'aws-cdk-lib': '^2.177.0',
 			'constructs': '^10.4.2',
@@ -101,6 +103,64 @@ async function discoverResources() {
 	);
 }
 
+// /**
+//  * 
+//  * @returns {string[]}
+//  */
+// function discoverApiDeps() {
+// 	return execSync(`npm ls --omit=dev --all --parseable -w ./api`)
+// 		.toString()
+// 		.split('\n')
+// 		.map(line => line.trim())
+// 		.filter(line => line.includes('node_modules'));
+// }
+
+// async function installApiDeps() {
+// 	console.log("adding deps to package.json");
+// 	// add deps used by Amplify to deploy backend
+// 	const packageData = JSON.parse(
+// 		await fs.promises.readFile(path.join(LAMBDA_BUILD_DIR, 'package.json'))
+// 	);
+// 	packageData.dependencies = {
+// 		'jose': '^6.1.0',
+// 		...(packageData.dependencies || {}),
+// 		'wirejs-resources': `file:${SELF_DIR}`
+// 	};
+// 	await fs.promises.writeFile(
+// 		path.join(LAMBDA_BUILD_DIR, 'package.json'),
+// 		JSON.stringify(packageData, null, 2)
+// 	);
+
+// 	console.log("installing all deps")
+
+// 	// install all
+// 	execSync('npm i');
+
+// 	console.log("done installing deps");
+// }
+
+// /**
+//  * 
+//  * @param {string[]} deps 
+//  */
+// async function prepareApiLambda(deps) {
+// 	await copy
+// 		(path.join(CWD, 'api', 'dist'),
+// 		path.join(LAMBDA_BUILD_DIR, 'dist')
+// 	);
+// 	await copy(
+// 		path.join(CWD, 'api', 'dist', 'package.json'),
+// 		path.join(LAMBDA_BUILD_DIR, 'dist', 'package.json')
+// 	);
+
+// 	buildSync({
+// 		entryPoints: path.join(LAMBDA_BUILD_DIR, 'handler.ts'),
+// 		bundle: true,
+// 		packages: 'external',
+// 		outfile: 'handler.js',
+// 	});
+// }
+
 async function deployFrontend() {
 	console.log("copying frontend assets");
 	await copy(PROJECT_DIST_DIR, STATIC_DIR);
@@ -132,6 +192,7 @@ if (action === 'prebuild') {
 	await createSkeleton();
 	await installDeps();
 	await discoverResources();
+	// await prepareApiLambda(discoverApiDeps());
 
 	console.log("prebuild done");
 } else if (action === 'inject-backend') {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.1.157-llm",
+	"version": "0.1.159-llm",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -44,7 +44,7 @@
 		"recursive-copy": "^2.0.14",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.44",
-		"wirejs-resources": "^0.1.157-llm"
+		"wirejs-resources": "^0.1.159-llm"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",