Switch env var for isVSCE check (#8257)

* Switch env var for isVSCE check

* Make it a string instead;

* Need to actually access process.env for this plugin to work

* actually call the function

* Refactor to not use a env var

* A cleaner approach - touching webpack is scary

Author: joehan

CHANGELOG.md

@@ -1,6 +1,7 @@
-- Add initial delay when loading python functions (#8239)
-- Enforce webframeworks enablement only on webframeworks sites (#8168)
-- Fix issue where `apps:init` throws an error upon app creation
+- Replaced `VSCODE_CWD` check to address issues running in VSCode environments. (#7471)
+- Added initial delay when loading python functions (#8239)
+- Enforced webframeworks enablement only on webframeworks sites (#8168)
+- Fixed issue where `apps:init` throws an error upon app creation.
 - Update Firebase Data Connect local toolkit to v1.8.3, which includes the following changes: (#8263)
   - Adds a `_metadata.distance` field to vector similarity search results
   - Fixes `auth` and `request.auth` when the request is unauthenticated

firebase-vscode/src/extension.ts

@@ -25,6 +25,7 @@ import {
 import { env } from "./core/env";
 
 import { suggestGraphqlSyntaxExtension } from "./data-connect/graphql-syntax-highlighter";
+import { setIsVSCodeExtension } from "../../src/vsCodeUtils";
 
 // This method is called when your extension is activated
 export async function activate(context: vscode.ExtensionContext) {
@@ -93,6 +94,7 @@ async function checkCLIInstallation(): Promise<void> {
     const latestVersion = (await latestVersionRes.json())?.["dist-tags"]?.[
       "latest"
     ];
+    setIsVSCodeExtension(true);
     const env = { ...process.env, VSCODE_CWD: "" };
     const versionRes = spawnSync("firebase", ["--version"], {
       env,

src/deploy/lifecycleHooks.ts

@@ -10,9 +10,8 @@ import { isVSCodeExtension } from "../vsCodeUtils";
 
 function runCommand(command: string, childOptions: childProcess.SpawnOptions) {
   const escapedCommand = command.replace(/\"/g, '\\"');
-  const isVSCode = isVSCodeExtension();
-  const nodeExecutable = isVSCode ? "node" : process.execPath;
-  const crossEnvShellPath = isVSCode
+  const nodeExecutable = isVSCodeExtension() ? "node" : process.execPath;
+  const crossEnvShellPath = isVSCodeExtension()
     ? path.resolve(__dirname, "./cross-env/dist/bin/cross-env-shell.js")
     : path.resolve(require.resolve("cross-env"), "..", "bin", "cross-env-shell.js");
   const translatedCommand =

src/emulator/hub.ts

@@ -54,7 +54,7 @@ export class EmulatorHub extends ExpressBasedEmulator {
     const locator = JSON.parse(data) as Locator;
 
     // TODO: In case the locator file format is changed, handle issues with format incompatability
-    if (!isVSCodeExtension && locator.version !== this.CLI_VERSION) {
+    if (!isVSCodeExtension() && locator.version !== this.CLI_VERSION) {
       logger.debug(`Found locator with mismatched version, ignoring: ${JSON.stringify(locator)}`);
       return undefined;
     }

src/hosting/implicitInit.ts

@@ -8,8 +8,6 @@ import { EmulatorRegistry } from "../emulator/registry";
 import { EMULATORS_SUPPORTED_BY_USE_EMULATOR, Emulators } from "../emulator/types";
 import { readTemplateSync } from "../templates";
 
-const INIT_TEMPLATE = readTemplateSync("hosting/init.js");
-
 export interface TemplateServerResponse {
   // __init.js content with only initializeApp()
   js: string;
@@ -77,14 +75,13 @@ export async function implicitInit(options: any): Promise<TemplateServerResponse
   }
   const emulatorsJson = JSON.stringify(emulators, null, 2);
 
-  const js = INIT_TEMPLATE.replace("/*--CONFIG--*/", `var firebaseConfig = ${configJson};`).replace(
-    "/*--EMULATORS--*/",
-    "var firebaseEmulators = undefined;",
-  );
-  const emulatorsJs = INIT_TEMPLATE.replace(
-    "/*--CONFIG--*/",
-    `var firebaseConfig = ${configJson};`,
-  ).replace("/*--EMULATORS--*/", `var firebaseEmulators = ${emulatorsJson};`);
+  const initTemplate = readTemplateSync("hosting/init.js");
+  const js = initTemplate
+    .replace("/*--CONFIG--*/", `var firebaseConfig = ${configJson};`)
+    .replace("/*--EMULATORS--*/", "var firebaseEmulators = undefined;");
+  const emulatorsJs = initTemplate
+    .replace("/*--CONFIG--*/", `var firebaseConfig = ${configJson};`)
+    .replace("/*--EMULATORS--*/", `var firebaseEmulators = ${emulatorsJson};`);
   return {
     js,
     emulatorsJs,

src/vsCodeUtils.ts

@@ -1,8 +1,11 @@
-import { env } from "process";
-
+let _IS_WEBPACKED_FOR_VSCE = false;
 /**
  * Detect if code is running in a VSCode Extension
  */
 export function isVSCodeExtension(): boolean {
-  return !!env.VSCODE_CWD;
+  return _IS_WEBPACKED_FOR_VSCE;
+}
+
+export function setIsVSCodeExtension(v: boolean) {
+  _IS_WEBPACKED_FOR_VSCE = v;
 }