fix(containers): remove @redwoodjs/api-server's @redwoodjs/internal requirement

packages/api-server/package.json

@@ -38,6 +38,7 @@
     "chalk": "4.1.2",
     "chokidar": "3.5.3",
     "core-js": "3.30.2",
+    "fast-glob": "3.2.12",
     "fast-json-parse": "1.0.3",
     "fastify": "4.17.0",
     "fastify-raw-body": "4.2.0",

packages/api-server/src/__tests__/withWebServer.test.ts

@@ -12,9 +12,8 @@ const FIXTURE_PATH = path.resolve(
 
 // Mock the dist folder from fixtures,
 // because its gitignored
-jest.mock('@redwoodjs/internal/dist/files', () => {
+jest.mock('../plugins/findPrerenderedHtml', () => {
   return {
-    ...jest.requireActual('@redwoodjs/internal/dist/files'),
     findPrerenderedHtml: () => {
       return ['about.html', 'mocked.html', 'posts/new.html', 'index.html']
     },

packages/api-server/src/plugins/findPrerenderedHtml.ts

@@ -0,0 +1,9 @@
+import fg from 'fast-glob'
+
+import { getPaths } from '@redwoodjs/project-config'
+
+// NOTE: This function was copied from @redwoodjs/internal/dist/files to avoid depending on @redwoodjs/internal.
+// import { findPrerenderedHtml } from '@redwoodjs/internal/dist/files'
+export function findPrerenderedHtml(cwd = getPaths().web.dist) {
+  return fg.sync('**/*.html', { cwd, ignore: ['200.html', '404.html'] })
+}

packages/api-server/src/plugins/lambdaLoader.ts

@@ -2,10 +2,11 @@ import path from 'path'
 
 import c from 'ansi-colors'
 import type { Handler } from 'aws-lambda'
+import fg from 'fast-glob'
 import { FastifyReply, FastifyRequest, RequestGenericInterface } from 'fastify'
 import escape from 'lodash.escape'
 
-import { findApiDistFunctions } from '@redwoodjs/internal/dist/files'
+import { getPaths } from '@redwoodjs/project-config'
 
 import { requestHandler } from '../requestHandlers/awsLambdaFastify'
 
@@ -61,6 +62,16 @@ export const loadFunctionsFromDist = async () => {
   await setLambdaFunctions(serverFunctions)
 }
 
+// NOTE: Copied from @redwoodjs/internal/dist/files to avoid depending on @redwoodjs/internal.
+// import { findApiDistFunctions } from '@redwoodjs/internal/dist/files'
+function findApiDistFunctions(cwd: string = getPaths().api.base) {
+  return fg.sync('dist/functions/**/*.{ts,js}', {
+    cwd,
+    deep: 2, // We don't support deeply nested api functions, to maximise compatibility with deployment providers
+    absolute: true,
+  })
+}
+
 interface LambdaHandlerRequest extends RequestGenericInterface {
   Params: {
     routeName: string

packages/api-server/src/plugins/withWebServer.ts

@@ -4,12 +4,13 @@ import path from 'path'
 import fastifyStatic from '@fastify/static'
 import { FastifyInstance, FastifyReply } from 'fastify'
 
-import { findPrerenderedHtml } from '@redwoodjs/internal/dist/files'
 import { getPaths } from '@redwoodjs/project-config'
 
 import { loadFastifyConfig } from '../fastify'
 import { WebServerArgs } from '../types'
 
+import { findPrerenderedHtml } from './findPrerenderedHtml'
+
 export const getFallbackIndexPath = () => {
   const prerenderIndexPath = path.join(getPaths().web.dist, '/200.html')
 

yarn.lock

@@ -6739,6 +6739,7 @@ __metadata:
     chalk: 4.1.2
     chokidar: 3.5.3
     core-js: 3.30.2
+    fast-glob: 3.2.12
     fast-json-parse: 1.0.3
     fastify: 4.17.0
     fastify-raw-body: 4.2.0