From 5e2a2ec39089c77181c0f6de194e1106601eef34 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Fri, 24 Feb 2023 09:10:11 +0100 Subject: [PATCH] add env to turn on and off extension mocking --- src/Umbraco.Web.UI.Client/.env | 1 + src/Umbraco.Web.UI.Client/src/core/mocks/browser-handlers.ts | 4 ++-- src/Umbraco.Web.UI.Client/src/core/mocks/e2e-handlers.ts | 2 +- src/Umbraco.Web.UI.Client/src/vite-env.d.ts | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/.env b/src/Umbraco.Web.UI.Client/.env index dadbe466c0..6042061013 100644 --- a/src/Umbraco.Web.UI.Client/.env +++ b/src/Umbraco.Web.UI.Client/.env @@ -3,3 +3,4 @@ VITE_UMBRACO_USE_MSW=on # on = turns on MSW, off = disables all mock handlers VITE_UMBRACO_API_URL=http://localhost:11000 VITE_UMBRACO_INSTALL_STATUS=running # running or must-install or must-upgrade VITE_MSW_QUIET=off # on = turns off MSW console logs, off = turns on MSW console logs +VITE_UMBRACO_EXTENSION_MOCKS=off # on = turns on extension mocks, off = turns off extension mocks diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/browser-handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/browser-handlers.ts index e4c4db32d2..42d9c200ce 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/browser-handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/browser-handlers.ts @@ -64,8 +64,8 @@ switch (import.meta.env.VITE_UMBRACO_INSTALL_STATUS) { handlers.push(serverHandlers.serverRunningHandler); } -switch (import.meta.env.MODE) { - case 'development': +switch (import.meta.env.VITE_UMBRACO_EXTENSION_MOCKS) { + case 'on': handlers.push(manifestsHandlers.manifestDevelopmentHandler); break; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/e2e-handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/e2e-handlers.ts index bc02257b50..2c9ab05627 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/e2e-handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/e2e-handlers.ts @@ -17,7 +17,7 @@ import { handlers as redirectManagementHandlers } from './domains/redirect-manag export const handlers = [ serverHandlers.serverRunningHandler, serverHandlers.serverVersionHandler, - manifestsHandlers.manifestDevelopmentHandler, + manifestsHandlers.manifestEmptyHandler, ...installHandlers, ...upgradeHandlers, ...userHandlers, diff --git a/src/Umbraco.Web.UI.Client/src/vite-env.d.ts b/src/Umbraco.Web.UI.Client/src/vite-env.d.ts index b045b61a0c..d91f137aea 100644 --- a/src/Umbraco.Web.UI.Client/src/vite-env.d.ts +++ b/src/Umbraco.Web.UI.Client/src/vite-env.d.ts @@ -5,4 +5,5 @@ interface ImportMetaEnv { VITE_UMBRACO_API_URL: string; VITE_UMBRACO_USE_MSW: 'on' | 'off'; VITE_MSW_QUIET: 'on' | 'off'; + VITE_UMBRACO_EXTENSION_MOCKS: 'on' | 'off'; }