Working concept on moving router things to /core so it's included in …

…deployed code. (#377) Moved infrastructure handlers from devtools to core package and updated serverless paths. Next is to test it in the deployed environment, and eventually roll in webpack.
friggframework · Feb 18, 2025 · 88ef5ee · 88ef5ee
2 parents d9beefb + b07626c
commit 88ef5ee
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/...ols/infrastructure/app-handler-helpers.js → ...ages/core/handlers/app-handler-helpers.js b/...ols/infrastructure/app-handler-helpers.js → ...ages/core/handlers/app-handler-helpers.js
diff --git a/.../devtools/infrastructure/backend-utils.js → packages/core/handlers/backend-utils.js b/.../devtools/infrastructure/backend-utils.js → packages/core/handlers/backend-utils.js
@@ -1,7 +1,7 @@
 const { createFriggBackend, Worker } = require('@friggframework/core');
 const {
     findNearestBackendPackageJson,
-} = require('../frigg-cli/utils/backend-path');
+} = require('../../devtools/frigg-cli/utils/backend-path');
 const path = require('node:path');
 const fs = require('fs-extra');
 

diff --git a/...s/devtools/infrastructure/routers/auth.js → packages/core/handlers/routers/auth.js b/...s/devtools/infrastructure/routers/auth.js → packages/core/handlers/routers/auth.js
diff --git a/...re/routers/integration-defined-routers.js → ...rs/routers/integration-defined-routers.js b/...re/routers/integration-defined-routers.js → ...rs/routers/integration-defined-routers.js
diff --git a/...astructure/routers/middleware/loadUser.js → ...e/handlers/routers/middleware/loadUser.js b/...astructure/routers/middleware/loadUser.js → ...e/handlers/routers/middleware/loadUser.js
diff --git a/...routers/middleware/requireLoggedInUser.js → ...routers/middleware/requireLoggedInUser.js b/...routers/middleware/requireLoggedInUser.js → ...routers/middleware/requireLoggedInUser.js
diff --git a/...s/devtools/infrastructure/routers/user.js → packages/core/handlers/routers/user.js b/...s/devtools/infrastructure/routers/user.js → packages/core/handlers/routers/user.js
diff --git a/...tools/infrastructure/routers/websocket.js → packages/core/handlers/routers/websocket.js b/...tools/infrastructure/routers/websocket.js → packages/core/handlers/routers/websocket.js
diff --git a/...re/workers/integration-defined-workers.js → ...rs/workers/integration-defined-workers.js b/...re/workers/integration-defined-workers.js → ...rs/workers/integration-defined-workers.js
@@ -1,5 +1,5 @@
 const { createHandler } = require('@friggframework/core');
-const { integrationFactory, createQueueWorker } = require('./../backend-utils');
+const { integrationFactory, createQueueWorker } = require('../backend-utils');
 
 const handlers = {};
 integrationFactory.integrationClasses.forEach((IntegrationClass) => {

diff --git a/packages/devtools/infrastructure/serverless-template.js b/packages/devtools/infrastructure/serverless-template.js
@@ -30,6 +30,7 @@ const composeServerlessDefinition = (AppDefinition) => {
             ],
         },
         plugins: [
+            // 'serverless-webpack',
             'serverless-dotenv-plugin',
             'serverless-offline-sqs',
             'serverless-offline',
@@ -61,8 +62,7 @@ const composeServerlessDefinition = (AppDefinition) => {
         },
         functions: {
             defaultWebsocket: {
-                handler:
-                    '/../node_modules/@friggframework/devtools/infrastructure/routers/websocket.handler',
+                handler: 'node_modules/@friggframework/core/handlers/routers/websocket.handler',
                 events: [
                     {
                         websocket: {
@@ -82,8 +82,7 @@ const composeServerlessDefinition = (AppDefinition) => {
                 ],
             },
             auth: {
-                handler:
-                    '/../node_modules/@friggframework/devtools/infrastructure/routers/auth.handler',
+                handler: 'node_modules/@friggframework/core/handlers/routers/auth.handler',
                 events: [
                     {
                         http: {
@@ -109,8 +108,7 @@ const composeServerlessDefinition = (AppDefinition) => {
                 ],
             },
             user: {
-                handler:
-                    '/../node_modules/@friggframework/devtools/infrastructure/routers/user.handler',
+                handler: 'node_modules/@friggframework/core/handlers/routers/user.handler',
                 events: [
                     {
                         http: {
@@ -218,14 +216,7 @@ const composeServerlessDefinition = (AppDefinition) => {
 
         // Add function for the integration
         definition.functions[integrationName] = {
-            handler: `/../node_modules/@friggframework/devtools/infrastructure/routers/integration-defined-routers.handlers.${integrationName}.handler`,
-            // events: integration.Definition.routes.map((route) => ({
-            //     http: {
-            //         path: `/api/${integrationName}-integration${route.path}`,
-            //         method: route.method || 'ANY',
-            //         cors: true,
-            //     },
-            // })),
+            handler: `node_modules/@friggframework/core/handlers/routers/integration-defined-routers.handlers.${integrationName}.handler`,
             events: [
                 {
                     http: {
@@ -260,7 +251,7 @@ const composeServerlessDefinition = (AppDefinition) => {
         // Add Queue Worker for the integration
         const queueWorkerName = `${integrationName}QueueWorker`;
         definition.functions[queueWorkerName] = {
-            handler: `/../node_modules/@friggframework/devtools/infrastructure/workers/integration-defined-workers.handlers.${integrationName}.queueWorker`,
+            handler: `node_modules/@friggframework/core/handlers/workers/integration-defined-workers.handlers.${integrationName}.queueWorker`,
             reservedConcurrency: 5,
             events: [
                 {

diff --git a/packages/devtools/infrastructure/webpack.config.js b/packages/devtools/infrastructure/webpack.config.js
@@ -0,0 +1,20 @@
+const slsw = require('serverless-webpack');
+const webpack = require('webpack');
+const path = require('path');
+const CopyPlugin = require('copy-webpack-plugin');
+
+
+module.exports = {
+    devtool: 'source-map',
+    entry: slsw.lib.entries,
+    mode: slsw.lib.webpack.isLocal ? 'development' : 'production',
+    target: 'node',
+    externals: ['mongoose', 'express', 'node-fetch'],
+    plugins: [
+        // This defines the window global (with value of `undefined`).
+        new webpack.ProvidePlugin({
+            window: path.resolve(path.join(__dirname, 'src/utils/webpackFakeWindow')),
+        }),
+    ]
+
+};
diff --git a/packages/devtools/package.json b/packages/devtools/package.json
@@ -6,7 +6,6 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "^2.0.0-next.0",
     "@friggframework/test": "^2.0.0-next.0",
     "@hapi/boom": "^7.4.11",
     "@inquirer/prompts": "^5.3.8",
@@ -30,11 +29,11 @@
   "devDependencies": {
     "@friggframework/eslint-config": "^2.0.0-next.0",
     "@friggframework/prettier-config": "^2.0.0-next.0",
+    "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
     "serverless-offline": "^13.8.0",
     "serverless-offline-sqs": "^8.0.0",
-    "serverless-webpack": "^5.14.1",
-    "serverless": "3.39.0"
+    "serverless-webpack": "^5.14.1"
   },
   "scripts": {
     "lint:fix": "prettier --write --loglevel error . && eslint . --fix",