Merge branch 'main' into fix/mobula-graceful-unresolvable-symbols

Author: FionnL

packages/scripts/src/new/index.ts

@@ -25,17 +25,39 @@ if (process.argv[2] == 'tsconfig') {
   }
 
   execSync(`rm -rf ./.yarn/cache/node_modules`)
-
-  const result = execSync(`find . -name "@chainlink-external-adapter-framework*"`, {
-    encoding: 'utf-8',
-  })
-
-  execSync(`unzip ${result.trimEnd()} -d ./.yarn/cache`, { maxBuffer: 1024 * 1024 * 500 })
+  // This should give either something like 'npm:1.2.3' or
+  // 'portal:some/local/path:...'
+  const frameworkVersion = execSync(
+    `yarn --cwd packages/scripts info @chainlink/external-adapter-framework --json | jq -r '.value'`,
+    {
+      encoding: 'utf-8',
+    },
+  )
+    .trim()
+    .split('@')[2]
+
+  let generatorIndexPath = ''
+
+  if (frameworkVersion.startsWith('portal:')) {
+    generatorIndexPath =
+      frameworkVersion.split(':')[1] + '/generator-adapter/generators/app/index.js'
+  } else if (frameworkVersion.startsWith('npm:')) {
+    const result = execSync(
+      `find . -name "@chainlink-external-adapter-framework-${frameworkVersion.replace(':', '-')}*"`,
+      {
+        encoding: 'utf-8',
+      },
+    )
+    execSync(`unzip ${result.trimEnd()} -d ./.yarn/cache`, { maxBuffer: 1024 * 1024 * 500 })
+
+    generatorIndexPath =
+      './.yarn/cache/node_modules/@chainlink/external-adapter-framework/generator-adapter/generators/app/index.js'
+  } else {
+    throw new Error(`Unsupported framework version format: '${frameworkVersion}'`)
+  }
 
   execSync(`npm install -g [email protected] > /dev/null 2>&1`)
 
   console.log('Run the following command:')
-  console.log(
-    `  yo ./.yarn/cache/node_modules/@chainlink/external-adapter-framework/generator-adapter/generators/app/index.js ${path} && yarn new tsconfig`,
-  )
+  console.log(`  yo ${generatorIndexPath} ${path} && yarn new tsconfig`)
 }