Merge pull request #229 from oneblink/ON-34238

ON-34238 # Removed @blinkmobile/blinkmrc dependency

package.json

@@ -17,8 +17,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.379.1",
     "@aws-sdk/lib-storage": "^3.379.1",
-    "@blinkmobile/blinkmrc": "^2.0.0",
     "@hapi/boom": "^10.0.1",
+    "appdirectory": "^0.1.0",
     "archiver": "^5.3.1",
     "base64url": "^3.0.1",
     "chalk": "^5.3.0",
@@ -29,6 +29,7 @@
     "glob": "^10.3.1",
     "inquirer": "^9.2.7",
     "jsonwebtoken": "^9.0.1",
+    "load-json-file": "^7.0.1",
     "log-symbols": "^5.1.0",
     "meow": "^12.0.1",
     "mime-types": "^2.1.35",

src/api/types.ts

@@ -77,11 +77,6 @@ export type LambdaEvent =
 
 export type MapObject = Record<string, any>
 
-export type ProjectConfig = {
-  load: () => Promise<BlinkMRC>
-  update: (fn: (config: BlinkMRC) => BlinkMRC) => Promise<BlinkMRC>
-}
-
 export type Protocol = OneBlinkAPIHostingRequest['url']['protocol']
 
 export type RouteConfiguration = APITypes.APIEnvironmentRoute & {

src/api/utils/project-meta.ts

@@ -1,19 +1,19 @@
-import type { BlinkMRC, ProjectConfig } from '../types.js'
+import type { BlinkMRC } from '../types.js'
 
-import configLoader from '@blinkmobile/blinkmrc'
-import pkg from '../../package.js'
+import * as configLoader from '../../blinkmrc.js'
 
-function projectConfig(cwd: string): ProjectConfig {
-  return configLoader.projectConfig({
-    name: pkg.name,
-    cwd: cwd,
+function projectConfig(cwd: string) {
+  return configLoader.projectConfig<BlinkMRC>({
+    cwd,
   })
 }
 
-function read(cwd: string): Promise<BlinkMRC> {
-  return projectConfig(cwd)
-    .load()
-    .catch(() => ({}))
+async function read(cwd: string): Promise<BlinkMRC> {
+  try {
+    return await projectConfig(cwd).load()
+  } catch {
+    return {}
+  }
 }
 
 async function write(