Better handle file: deps

Author: jamesdaniels

package-lock.json

@@ -21,7 +21,7 @@
     "ssr"
   ],
   "scripts": {
-    "build": "rm -rf dist && tsc && ts-node ./tools/build.ts && npm pack .",
+    "build": "rm -rf dist && tsc && ts-node ./tools/build.ts",
     "test": "echo \"Error: no test specified\" && exit 1",
     "e2e:build-next": "rm -rf e2e && npx create-next-app e2e --use-npm --ts",
     "e2e:build-nuxt": "rm -rf e2e && npx create-nuxt-app e2e --answers '$(cat ./tools/create-nuxt-answers.json)'",

package.json

@@ -2,13 +2,11 @@ import { NodeJsAsyncHost } from '@angular-devkit/core/node';
 import { workspaces, logging } from '@angular-devkit/core';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { Target, Architect, targetFromTargetString, targetStringFromTarget } from '@angular-devkit/architect';
-import { promises } from 'fs';
+import { mkdir } from 'fs/promises';
 import { join } from 'path';
 
 import { DeployConfig, exec, findDependency, PathFactory, spawn } from '../../utils';
 
-const { mkdir } = promises;
-
 export const build = async (config: DeployConfig | Required<DeployConfig>, getProjectPath: PathFactory) => {
 
     // TODO log to firebase-tools

src/frameworks/angular/index.ts

@@ -12,13 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { promises as fsPromises } from 'fs';
+import { readFile, mkdir } from 'fs/promises';
 import { join } from 'path';
 
 import { DeployConfig, PathFactory, exec, spawn } from '../../utils';
 
-const { readFile, rm, mkdir, copyFile } = fsPromises;
-
 export const build = async (config: DeployConfig | Required<DeployConfig>, getProjectPath: PathFactory) => {
 
     const packageJsonBuffer = await readFile(getProjectPath('package.json'));

src/frameworks/express/index.ts

@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { promises as fsPromises } from 'fs';
+import { readFile, mkdir, copyFile } from 'fs/promises';
 import { dirname, join, relative } from 'path';
 import type { NextConfig } from 'next/dist/server/config-shared';
 import type { Header, Rewrite, Redirect } from 'next/dist/lib/load-custom-routes';
 import nextBuild from 'next/dist/build';
 
 import { DeployConfig, PathFactory, exec } from '../../utils';
 
-const { readFile, rm, mkdir, writeFile, copyFile } = fsPromises;
-
 export const build = async (config: DeployConfig | Required<DeployConfig>, getProjectPath: PathFactory) => {
 
     await nextBuild(getProjectPath(), null, false, false, true);

src/frameworks/next.js/index.ts

@@ -12,14 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { promises as fsPromises } from 'fs'
+import { readFile, mkdir } from 'fs/promises'
 import { join } from 'path';
 
 import { DeployConfig, PathFactory, exec } from '../../utils';
 import { build as buildNuxt3 } from '../nuxt3';
 
-const { readFile, rm, mkdir } = fsPromises;
-
 export const build = async (config: DeployConfig | Required<DeployConfig>, getProjectPath: PathFactory) => {
 
     let nuxt;

src/frameworks/nuxt/index.ts

@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { promises as fsPromises, existsSync } from 'fs'
+import { existsSync } from 'fs';
+import { readFile, mkdir, readdir } from 'fs/promises';
 import { join } from 'path';
 
 import { DeployConfig, PathFactory, exec } from '../../utils';
 
-const { readFile, rm, mkdir, readdir } = fsPromises;
-
 export const build = async (config: DeployConfig | Required<DeployConfig>, getProjectPath: PathFactory) => {
 
     const { loadNuxt, buildNuxt } = await import('@nuxt/kit');

src/frameworks/nuxt3/index.ts

@@ -12,15 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { basename, join } from 'path';
+import { basename, join, relative } from 'path';
 import { exit } from 'process';
-import { promises as fs } from 'fs';
+import { writeFile, copyFile, stat } from 'fs/promises';
 
 import { build } from './frameworks';
-import { defaultFirebaseToolsOptions, DEFAULT_REGION, shortSiteName, spawn } from './utils';
+import { defaultFirebaseToolsOptions, DEFAULT_REGION, exec, shortSiteName, spawn } from './utils';
 import { getFirebaseTools, normalizedHostingConfigs, getInquirer, needProjectId } from './firebase';
-
-const { writeFile, copyFile } = fs;
+import { spawnSync } from 'child_process';
 
 const NODE_VERSION = parseInt(process.versions.node, 10).toString();
 const FIREBASE_ADMIN_VERSION = '__FIREBASE_ADMIN_VERSION__';
@@ -123,13 +122,22 @@ export const prepare = async (targetNames: string[], context: any, options: any)
             packageJson.main = 'server.js';
             delete packageJson.devDependencies;
             packageJson.dependencies ||= {};
-            if (FIREBASE_FRAMEWORKS_VERSION.startsWith('file:')) {
-                const file = FIREBASE_FRAMEWORKS_VERSION.split(':')[1];
-                const filename = basename(file);
-                await copyFile(file, join(functionsDist, filename));
-                packageJson.dependencies['firebase-frameworks'] = `file:${filename}`;
-            } else {
-                packageJson.dependencies['firebase-frameworks'] = FIREBASE_FRAMEWORKS_VERSION;
+            packageJson.dependencies['firebase-frameworks'] = FIREBASE_FRAMEWORKS_VERSION;
+            for (const [name, version] of Object.entries(packageJson.dependencies as Record<string, string>)) {
+                if (version.startsWith('file:')) {
+                    const path = version.split(':')[1];
+                    const stats = await stat(path);
+                    if (stats.isDirectory()) {
+                        const result = spawnSync('npm', ['pack', relative(functionsDist, path)], { cwd: functionsDist });
+                        if (!result.stdout) continue;
+                        const filename = result.stdout.toString().trim();
+                        packageJson.dependencies[name] = `file:${filename}`;
+                    } else {
+                        const filename = basename(path);
+                        await copyFile(path, join(functionsDist, filename));
+                        packageJson.dependencies[name] = `file:${filename}`;
+                    }
+                }
             }
             // TODO test these with semver, error if already set out of range
             packageJson.dependencies['firebase-admin'] ||= FIREBASE_ADMIN_VERSION;
@@ -149,11 +157,10 @@ export const prepare = async (targetNames: string[], context: any, options: any)
             // Welp, that didn't work, since firebase-tools checks that they have a minimum firebase-frameworks SDK installed...
             // TODO explore symlinks and ways to make this faster, better, stronger
             //      log to firebase-tools
-            await spawn('npm', ['i', '--only', 'production', '--no-audit', '--no-fund', '--silent'], { cwd: functionsDist }, stdoutChunk => {
-                console.log(stdoutChunk.toString());
-            }, errChunk => {
-                console.error(errChunk.toString());
-            });
+            const npmInstall = spawnSync('npm', ['i', '--only', 'production', '--no-audit', '--no-fund', '--silent'], { cwd: functionsDist });
+            if (npmInstall.status) {
+                console.error(npmInstall.output.toString());
+            }
 
             // TODO allow configuration of the Cloud Function
             await writeFile(join(functionsDist, 'settings.js'), `exports.HTTPS_OPTIONS = {};

src/index.ts

@@ -46,10 +46,9 @@ const main = async () => {
         to: LOCAL_NODE_MODULES.map(mod => `import(\`\${process.cwd()}/node_modules/${mod}\`)`),
     });
 
-    const { version } = require('../package.json');
     const npmList = JSON.parse(spawnSync('npm', ['list', '--json=true'], { encoding: 'utf8' }).stdout.toString());
     const from = ['__FIREBASE_FRAMEWORKS_VERSION__'];
-    const to = [`file:${process.cwd()}/firebase-frameworks-${version}.tgz`];
+    const to = [`file:${process.cwd()}`];
     for (const [dep, { version }] of Object.entries<Record<string, string>>(npmList.dependencies)) {
         from.push(`__${dep.toUpperCase().replace(/[^A-Z]/g, '_')}_VERSION__`);
         to.push(`^${version}`);