@friggframework/devtools 2.0.0--canary.378.e85bec1.0 → 2.0.0--canary.381.335a2a0.0

package/frigg-cli/build-command/index.js

@@ -1,8 +1,9 @@
-const { spawn } = require('child_process');
+const { spawnSync } = require('child_process');
 const path = require('path');
 
 function buildCommand(options) {
     console.log('Building the serverless application...');
+    console.log('Hello from npm link world')
     const backendPath = path.resolve(process.cwd());
     const infrastructurePath = 'infrastructure.js';
     const command = 'serverless';
@@ -14,20 +15,38 @@ function buildCommand(options) {
         options.stage
     ];
 
-    const childProcess = spawn(command, serverlessArgs, {
+    // Add support for --verbose option
+    if (options.verbose) {
+        serverlessArgs.push('--verbose');
+    }
+
+    console.log('Running command from ', backendPath);
+    console.log('Serverless Command:', command, serverlessArgs.join(' '));
+
+    const result = spawnSync(command, serverlessArgs, {
         cwd: backendPath,
         stdio: 'inherit',
+        shell: true,
+        env: {
+            ...process.env,
+            NODE_PATH: path.resolve(backendPath, 'node_modules'),
+        }
     });
 
-    childProcess.on('error', (error) => {
-        console.error(`Error executing command: ${error.message}`);
-    });
+    if (result.status !== 0) {
+        console.error(`Serverless build failed with code ${result.status}`);
+        process.exit(1);
+    }
 
-    childProcess.on('close', (code) => {
-        if (code !== 0) {
-            console.log(`Child process exited with code ${code}`);
-        }
-    });
+    // childProcess.on('error', (error) => {
+    //     console.error(`Error executing command: ${error.message}`);
+    // });
+
+    // childProcess.on('close', (code) => {
+    //     if (code !== 0) {
+    //         console.log(`Child process exited with code ${code}`);
+    //     }
+    // });
 }
 
 module.exports = { buildCommand };

package/frigg-cli/index.js

@@ -22,6 +22,7 @@ program
     .command('build')
     .description('Build the serverless application')
     .option('-s, --stage <stage>', 'deployment stage', 'dev')
+    .option('-v, --verbose', 'enable verbose output')
     .action(buildCommand);
 
 program

package/frigg-cli/index.test.js

@@ -1,10 +1,7 @@
 const { Command } = require('commander');
 const { installCommand } = require('./index');
 const { validatePackageExists } = require('./install-command/validate-package');
-const {
-    findNearestBackendPackageJson,
-    validateBackendPath,
-} = require('./utils/backend-path');
+const { findNearestBackendPackageJson, validateBackendPath } = require('@friggframework/core');
 const { installPackage } = require('./install-command/install-package');
 const { createIntegrationFile } = require('./install-command/integration-file');
 const { updateBackendJsFile } = require('./install-command/backend-js');

package/frigg-cli/install-command/index.js

@@ -4,15 +4,12 @@ const { resolve } = require('node:path');
 const { updateBackendJsFile } = require('./backend-js');
 const { logInfo, logError } = require('./logger');
 const { commitChanges } = require('./commit-changes');
-const {
-    findNearestBackendPackageJson,
-    validateBackendPath,
-} = require('../utils/backend-path');
 const { handleEnvVariables } = require('./environment-variables');
 const {
     validatePackageExists,
     searchAndSelectPackage,
 } = require('./validate-package');
+const { findNearestBackendPackageJson, validateBackendPath } = require('@friggframework/core');
 
 const installCommand = async (apiModuleName) => {
     try {

package/infrastructure/create-frigg-infrastructure.js

@@ -2,9 +2,7 @@ const path = require('path');
 const fs = require('fs-extra');
 const { composeServerlessDefinition } = require('./serverless-template');
 
-const {
-    findNearestBackendPackageJson,
-} = require('../frigg-cli/utils/backend-path');
+const { findNearestBackendPackageJson } = require('@friggframework/core');
 
 function createFriggInfrastructure() {
     const backendPath = findNearestBackendPackageJson();

package/infrastructure/serverless-template.js

@@ -7,6 +7,7 @@ const composeServerlessDefinition = (AppDefinition) => {
         service: AppDefinition.name || 'create-frigg-app',
         package: {
             individually: true,
+            exclude: ["!**/node_modules/aws-sdk/**", "!**/node_modules/@aws-sdk/**", "!package.json"],
         },
         useDotenv: true,
         provider: {
@@ -30,7 +31,7 @@ const composeServerlessDefinition = (AppDefinition) => {
             ],
         },
         plugins: [
-            // 'serverless-webpack',
+            'serverless-jetpack',
             'serverless-dotenv-plugin',
             'serverless-offline-sqs',
             'serverless-offline',
@@ -51,13 +52,8 @@ const composeServerlessDefinition = (AppDefinition) => {
                 secretAccessKey: 'root',
                 skipCacheInvalidation: false,
             },
-            webpack: {
-                webpackConfig: 'webpack.config.js',
-                includeModules: {
-                    forceExclude: ['aws-sdk'],
-                },
-                packager: 'npm',
-                excludeFiles: ['src/**/*.test.js', 'test/'],
+            jetpack: {
+                base: '..',
             },
         },
         functions: {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.378.e85bec1.0",
+  "version": "2.0.0--canary.381.335a2a0.0",
   "dependencies": {
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/test": "2.0.0--canary.378.e85bec1.0",
+    "@friggframework/test": "2.0.0--canary.381.335a2a0.0",
     "@hapi/boom": "^7.4.11",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -27,13 +27,14 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.378.e85bec1.0",
-    "@friggframework/prettier-config": "2.0.0--canary.378.e85bec1.0",
+    "@friggframework/eslint-config": "2.0.0--canary.381.335a2a0.0",
+    "@friggframework/prettier-config": "2.0.0--canary.381.335a2a0.0",
     "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
+    "serverless-jetpack": "^0.11.2",
     "serverless-offline": "^13.8.0",
     "serverless-offline-sqs": "^8.0.0",
-    "serverless-webpack": "^5.14.1"
+    "serverless-plugin-monorepo": "^0.11.0"
   },
   "scripts": {
     "lint:fix": "prettier --write --loglevel error . && eslint . --fix",
@@ -57,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e85bec15926f5aabeec5a3f71f2410305876ccc5"
+  "gitHead": "335a2a0360c0b3d6c868975b120b738be0d6e9d3"
 }

package/frigg-cli/utils/backend-path.js

@@ -1,26 +0,0 @@
-const fs = require('fs-extra');
-const path = require('path');
-const PACKAGE_JSON = 'package.json';
-
-function findNearestBackendPackageJson() {
-    let currentDir = process.cwd();
-    while (currentDir !== path.parse(currentDir).root) {
-        const packageJsonPath = path.join(currentDir, 'backend', PACKAGE_JSON);
-        if (fs.existsSync(packageJsonPath)) {
-            return packageJsonPath;
-        }
-        currentDir = path.dirname(currentDir);
-    }
-    return null;
-}
-
-function validateBackendPath(backendPath) {
-    if (!backendPath) {
-        throw new Error('Could not find a backend package.json file.');
-    }
-}
-
-module.exports = {
-    findNearestBackendPackageJson,
-    validateBackendPath,
-};

package/infrastructure/webpack.config.js

@@ -1,20 +0,0 @@
-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')),
-        }),
-    ]
-
-};