unleash-server 4.15.0-beta.4 → 4.15.0-beta.8

package/dist/lib/app.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const unleash_frontend_1 = require("unleash-frontend");
 const express_1 = __importDefault(require("express"));
 const compression_1 = __importDefault(require("compression"));
 const serve_favicon_1 = __importDefault(require("serve-favicon"));
@@ -22,10 +21,13 @@ const oss_authentication_1 = __importDefault(require("./middleware/oss-authentic
 const no_authentication_1 = __importDefault(require("./middleware/no-authentication"));
 const secure_headers_1 = __importDefault(require("./middleware/secure-headers"));
 const load_index_html_1 = require("./util/load-index-html");
+const findPublicFolder_1 = require("./util/findPublicFolder");
+const conditional_middleware_1 = require("./middleware/conditional-middleware");
 async function getApp(config, stores, services, unleashSession) {
     const app = (0, express_1.default)();
     const baseUriPath = config.server.baseUriPath || '';
-    let indexHTML = await (0, load_index_html_1.loadIndexHTML)(config, unleash_frontend_1.publicFolder);
+    const publicFolder = (0, findPublicFolder_1.findPublicFolder)();
+    let indexHTML = await (0, load_index_html_1.loadIndexHTML)(config, publicFolder);
     app.set('trust proxy', true);
     app.disable('x-powered-by');
     app.set('port', config.server.port);
@@ -45,22 +47,19 @@ async function getApp(config, stores, services, unleashSession) {
     }
     app.use((0, secure_headers_1.default)(config));
     app.use(express_1.default.urlencoded({ extended: true }));
-    app.use((0, serve_favicon_1.default)(path_1.default.join(unleash_frontend_1.publicFolder, 'favicon.ico')));
-    app.use(baseUriPath, (0, serve_favicon_1.default)(path_1.default.join(unleash_frontend_1.publicFolder, 'favicon.ico')));
-    app.use(baseUriPath, express_1.default.static(unleash_frontend_1.publicFolder, { index: false }));
+    app.use((0, serve_favicon_1.default)(path_1.default.join(publicFolder, 'favicon.ico')));
+    app.use(baseUriPath, (0, serve_favicon_1.default)(path_1.default.join(publicFolder, 'favicon.ico')));
+    app.use(baseUriPath, express_1.default.static(publicFolder, { index: false }));
     if (config.enableOAS) {
         app.use(`${baseUriPath}/oas`, express_1.default.static('docs/api/oas'));
     }
     if (config.enableOAS && services.openApiService) {
         services.openApiService.useDocs(app);
     }
-    if (config.experimental.flags.embedProxy &&
-        config.frontendApiOrigins.length > 0) {
-        // Support CORS preflight requests for the frontend endpoints.
-        // Preflight requests should not have Authorization headers,
-        // so this must be handled before the API token middleware.
-        app.options('/api/frontend*', (0, cors_origin_middleware_1.corsOriginMiddleware)(services));
-    }
+    // Support CORS preflight requests for the frontend endpoints.
+    // Preflight requests should not have Authorization headers,
+    // so this must be handled before the API token middleware.
+    app.options('/api/frontend*', (0, conditional_middleware_1.conditionalMiddleware)(() => config.flagResolver.isEnabled('embedProxy'), (0, cors_origin_middleware_1.corsOriginMiddleware)(services)));
     switch (config.authentication.type) {
         case option_1.IAuthType.OPEN_SOURCE: {
             app.use(baseUriPath, (0, api_token_middleware_1.default)(config, services));
@@ -114,7 +113,7 @@ async function getApp(config, stores, services, unleashSession) {
     });
     app.get(`${baseUriPath}/*`, (req, res) => {
         if (req.path.startsWith(`${baseUriPath}/api`)) {
-            res.status(404).send({ message: '404 - Not found' });
+            res.status(404).send({ message: 'Not found' });
             return;
         }
         res.send(indexHTML);

package/dist/lib/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/lib/app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/lib/app.ts"],"names":[],"mappings":";;;;;AAAA,sDAA+D;AAC/D,8DAAsC;AACtC,kEAAoC;AACpC,kEAAyC;AACzC,gDAAwB;AACxB,gEAAwC;AACxC,8EAAyE;AACzE,gFAA2E;AAC3E,mFAA0D;AAC1D,6FAAmE;AAEnE,2CAA2D;AAG3D,sDAAmC;AAEnC,iFAAwD;AACxD,2FAAkE;AAClE,yFAAgE;AAChE,uFAA8D;AAC9D,iFAAwD;AAExD,4DAAuD;AACvD,8DAA2D;AAC3D,gFAA4E;AAE7D,KAAK,UAAU,MAAM,CAChC,MAAsB,EACtB,MAAsB,EACtB,QAA0B,EAC1B,cAA+B;IAE/B,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;IAEtB,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;IACpD,MAAM,YAAY,GAAG,IAAA,mCAAgB,GAAE,CAAC;IACxC,IAAI,SAAS,GAAG,MAAM,IAAA,+BAAa,EAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAE1D,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC7B,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC5B,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpC,GAAG,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;IACrC,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,QAAQ,EAAE;QAChD,GAAG,CAAC,GAAG,CAAC,IAAA,2CAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;KACjD;IAED,GAAG,CAAC,GAAG,CAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,CAAC,CAAC;IAE/B,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE;QACtC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;KACzC;IAED,GAAG,CAAC,GAAG,CAAC,IAAA,qBAAW,GAAE,CAAC,CAAC;IACvB,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAC;IACxB,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACzC,IAAI,cAAc,EAAE;QAChB,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;KAC3B;IACD,GAAG,CAAC,GAAG,CAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,CAAC,CAAC;IAC/B,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAChD,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAO,EAAC,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IACzD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAA,uBAAO,EAAC,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IACtE,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,iBAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAErE,IAAI,MAAM,CAAC,SAAS,EAAE;QAClB,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,MAAM,EAAE,iBAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;KACjE;IAED,IAAI,MAAM,CAAC,SAAS,IAAI,QAAQ,CAAC,cAAc,EAAE;QAC7C,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KACxC;IAED,8DAA8D;IAC9D,4DAA4D;IAC5D,2DAA2D;IAC3D,GAAG,CAAC,OAAO,CACP,gBAAgB,EAChB,IAAA,8CAAqB,EACjB,GAAG,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,YAAY,CAAC,EACjD,IAAA,6CAAoB,EAAC,QAAQ,CAAC,CACjC,CACJ,CAAC;IAEF,QAAQ,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;QAChC,KAAK,kBAAS,CAAC,WAAW,CAAC,CAAC;YACxB,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAA,8BAAkB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC3D,IAAA,4BAAiB,EAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM;SACT;QACD,KAAK,kBAAS,CAAC,UAAU,CAAC,CAAC;YACvB,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAA,8BAAkB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC3D,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC/D,MAAM;SACT;QACD,KAAK,kBAAS,CAAC,MAAM,CAAC,CAAC;YACnB,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAA,8BAAkB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC3D,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC/D,MAAM;SACT;QACD,KAAK,kBAAS,CAAC,IAAI,CAAC,CAAC;YACjB,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAA,8BAAkB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC3D,IAAA,6BAAkB,EACd,GAAG,EACH,MAAM,CAAC,MAAM,CAAC,WAAW,EACzB,QAAQ,EACR,MAAM,CACT,CAAC;YACF,MAAM;SACT;QACD,KAAK,kBAAS,CAAC,MAAM,CAAC,CAAC;YACnB,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAA,8BAAkB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC3D,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC/D,MAAM;SACT;QACD,KAAK,kBAAS,CAAC,IAAI,CAAC,CAAC;YACjB,IAAA,2BAAgB,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YACnC,MAAM;SACT;QACD,OAAO,CAAC,CAAC;YACL,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAA,8BAAkB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC3D,IAAA,6BAAkB,EACd,GAAG,EACH,MAAM,CAAC,MAAM,CAAC,WAAW,EACzB,QAAQ,EACR,MAAM,CACT,CAAC;YACF,MAAM;SACT;KACJ;IAED,GAAG,CAAC,GAAG,CACH,WAAW,EACX,IAAA,yBAAc,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CACzD,CAAC;IAEF,IAAI,OAAO,MAAM,CAAC,aAAa,KAAK,UAAU,EAAE;QAC5C,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;KACvD;IAED,mBAAmB;IACnB,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,GAAG,EAAE,IAAI,gBAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;IAErE,IAAI,QAAQ,CAAC,cAAc,EAAE;QACzB,QAAQ,CAAC,cAAc,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;KAChD;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;QACvC,GAAG,CAAC,GAAG,CAAC,IAAA,sBAAY,GAAE,CAAC,CAAC;KAC3B;IAED,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACnC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACrC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,WAAW,MAAM,CAAC,EAAE;YAC3C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;YAC/C,OAAO;SACV;QAED,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACf,CAAC;AA1ID,yBA0IC"}

package/dist/lib/middleware/api-token-middleware.d.ts

@@ -1,4 +1,4 @@
 import { IUnleashConfig } from '../types/option';
 export declare const TOKEN_TYPE_ERROR_MESSAGE = "invalid token: expected a different token type for this endpoint";
-declare const apiAccessMiddleware: ({ getLogger, authentication, experimental, }: Pick<IUnleashConfig, 'getLogger' | 'authentication' | 'experimental'>, { apiTokenService }: any) => any;
+declare const apiAccessMiddleware: ({ getLogger, authentication, flagResolver, }: Pick<IUnleashConfig, 'getLogger' | 'authentication' | 'flagResolver'>, { apiTokenService }: any) => any;
 export default apiAccessMiddleware;

package/dist/lib/middleware/api-token-middleware.js

@@ -7,10 +7,18 @@ const isClientApi = ({ path }) => {
     return path && path.startsWith('/api/client');
 };
 const isProxyApi = ({ path }) => {
-    return path && path.startsWith('/api/frontend');
+    if (!path) {
+        return;
+    }
+    // Handle all our current proxy paths which will redirect to the new
+    // embedded proxy endpoint
+    return (path.startsWith('/api/default/proxy') ||
+        path.startsWith('/api/development/proxy') ||
+        path.startsWith('/api/production/proxy') ||
+        path.startsWith('/api/frontend'));
 };
 exports.TOKEN_TYPE_ERROR_MESSAGE = 'invalid token: expected a different token type for this endpoint';
-const apiAccessMiddleware = ({ getLogger, authentication, experimental, }, { apiTokenService }) => {
+const apiAccessMiddleware = ({ getLogger, authentication, flagResolver, }, { apiTokenService }) => {
     const logger = getLogger('/middleware/api-token.ts');
     logger.debug('Enabling api-token middleware');
     if (!authentication.enableApiToken) {
@@ -28,7 +36,7 @@ const apiAccessMiddleware = ({ getLogger, authentication, experimental, }, { api
                 if ((apiUser.type === CLIENT && !isClientApi(req)) ||
                     (apiUser.type === FRONTEND && !isProxyApi(req)) ||
                     (apiUser.type === FRONTEND &&
-                        !experimental.flags.embedProxy)) {
+                        !flagResolver.isEnabled('embedProxy'))) {
                     res.status(403).send({ message: exports.TOKEN_TYPE_ERROR_MESSAGE });
                     return;
                 }

package/dist/lib/middleware/api-token-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-token-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/api-token-middleware.ts"],"names":[],"mappings":";;;AAAA,sEAAsE;AACtE,yDAAyD;AAGzD,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAC7B,OAAO,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAC5B,OAAO,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;AACpD,CAAC,CAAC;AAEW,QAAA,wBAAwB,GACjC,kEAAkE,CAAC;AAEvE,MAAM,mBAAmB,GAAG,CACxB,EACI,SAAS,EACT,cAAc,EACd,YAAY,GACwD,EACxE,EAAE,eAAe,EAAO,EACrB,EAAE;IACL,MAAM,MAAM,GAAG,SAAS,CAAC,0BAA0B,CAAC,CAAC;IACrD,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAE9C,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE;QAChC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;KACrC;IAED,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACtB,IAAI,GAAG,CAAC,IAAI,EAAE;YACV,OAAO,IAAI,EAAE,CAAC;SACjB;QAED,IAAI;YACA,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAC7C,MAAM,OAAO,GAAG,eAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAC1D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,wBAAY,CAAC;YAE1C,IAAI,OAAO,EAAE;gBACT,IACI,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;oBAC9C,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;oBAC/C,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ;wBACtB,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,EACrC;oBACE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gCAAwB,EAAE,CAAC,CAAC;oBAC5D,OAAO;iBACV;gBACD,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;aACtB;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACvB;QAED,IAAI,EAAE,CAAC;IACX,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,kBAAe,mBAAmB,CAAC"}
+{"version":3,"file":"api-token-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/api-token-middleware.ts"],"names":[],"mappings":";;;AAAA,sEAAsE;AACtE,yDAAyD;AAGzD,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAC7B,OAAO,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAC5B,IAAI,CAAC,IAAI,EAAE;QACP,OAAO;KACV;IAED,oEAAoE;IACpE,0BAA0B;IAC1B,OAAO,CACH,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAAC;QACzC,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CACnC,CAAC;AACN,CAAC,CAAC;AAEW,QAAA,wBAAwB,GACjC,kEAAkE,CAAC;AAEvE,MAAM,mBAAmB,GAAG,CACxB,EACI,SAAS,EACT,cAAc,EACd,YAAY,GACwD,EACxE,EAAE,eAAe,EAAO,EACrB,EAAE;IACL,MAAM,MAAM,GAAG,SAAS,CAAC,0BAA0B,CAAC,CAAC;IACrD,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAE9C,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE;QAChC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;KACrC;IAED,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACtB,IAAI,GAAG,CAAC,IAAI,EAAE;YACV,OAAO,IAAI,EAAE,CAAC;SACjB;QAED,IAAI;YACA,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAC7C,MAAM,OAAO,GAAG,eAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAC1D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,wBAAY,CAAC;YAE1C,IAAI,OAAO,EAAE;gBACT,IACI,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;oBAC9C,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;oBAC/C,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ;wBACtB,CAAC,YAAY,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,EAC5C;oBACE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gCAAwB,EAAE,CAAC,CAAC;oBAC5D,OAAO;iBACV;gBACD,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;aACtB;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACvB;QAED,IAAI,EAAE,CAAC;IACX,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,kBAAe,mBAAmB,CAAC"}

package/dist/lib/middleware/conditional-middleware.d.ts

@@ -0,0 +1,2 @@
+import { RequestHandler } from 'express';
+export declare const conditionalMiddleware: (condition: () => boolean, middleware: RequestHandler) => RequestHandler;

package/dist/lib/middleware/conditional-middleware.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.conditionalMiddleware = void 0;
+const express_1 = require("express");
+const conditionalMiddleware = (condition, middleware) => {
+    const router = (0, express_1.Router)();
+    router.use((req, res, next) => {
+        if (condition()) {
+            next();
+        }
+        else {
+            res.status(404).send({ message: 'Not found' });
+        }
+    });
+    router.use(middleware);
+    return router;
+};
+exports.conditionalMiddleware = conditionalMiddleware;
+//# sourceMappingURL=conditional-middleware.js.map

package/dist/lib/middleware/conditional-middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conditional-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/conditional-middleware.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AAE1C,MAAM,qBAAqB,GAAG,CACjC,SAAwB,EACxB,UAA0B,EACZ,EAAE;IAChB,MAAM,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;IAExB,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1B,IAAI,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,CAAC;SACV;aAAM;YACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;SAClD;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACvB,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAhBW,QAAA,qBAAqB,yBAgBhC"}

package/dist/lib/openapi/index.d.ts

@@ -9408,9 +9408,6 @@ export declare const schemas: {
             readonly versionInfo: {
                 readonly $ref: "#/components/schemas/versionSchema";
             };
-            readonly embedProxy: {
-                readonly type: "boolean";
-            };
         };
         readonly components: {
             readonly schemas: {

package/dist/lib/openapi/spec/ui-config-schema.d.ts

@@ -60,9 +60,6 @@ export declare const uiConfigSchema: {
         readonly versionInfo: {
             readonly $ref: "#/components/schemas/versionSchema";
         };
-        readonly embedProxy: {
-            readonly type: "boolean";
-        };
     };
     readonly components: {
         readonly schemas: {

package/dist/lib/openapi/spec/ui-config-schema.js

@@ -70,9 +70,6 @@ exports.uiConfigSchema = {
         versionInfo: {
             $ref: '#/components/schemas/versionSchema',
         },
-        embedProxy: {
-            type: 'boolean',
-        },
     },
     components: {
         schemas: {

package/dist/lib/openapi/spec/ui-config-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"ui-config-schema.js","sourceRoot":"","sources":["../../../../src/lib/openapi/spec/ui-config-schema.ts"],"names":[],"mappings":";;;AACA,qDAAiD;AAEpC,QAAA,cAAc,GAAG;IAC1B,GAAG,EAAE,qCAAqC;IAC1C,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,QAAQ,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC;IACjE,UAAU,EAAE;QACR,MAAM,EAAE;YACJ,IAAI,EAAE,QAAQ;SACjB;QACD,IAAI,EAAE;YACF,IAAI,EAAE,QAAQ;SACjB;QACD,OAAO,EAAE;YACL,IAAI,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,QAAQ;SACjB;QACD,UAAU,EAAE;YACR,IAAI,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,QAAQ;SACjB;QACD,mBAAmB,EAAE;YACjB,IAAI,EAAE,SAAS;SAClB;QACD,YAAY,EAAE;YACV,IAAI,EAAE,SAAS;SAClB;QACD,kBAAkB,EAAE;YAChB,IAAI,EAAE,QAAQ;SACjB;QACD,qBAAqB,EAAE;YACnB,IAAI,EAAE,QAAQ;SACjB;QACD,kBAAkB,EAAE;YAChB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;aACjB;SACJ;QACD,KAAK,EAAE;YACH,IAAI,EAAE,QAAQ;YACd,oBAAoB,EAAE;gBAClB,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,KAAK,EAAE;YACH,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;aACjB;SACJ;QACD,kBAAkB,EAAE;YAChB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE;gBACF,aAAa;gBACb,MAAM;gBACN,YAAY;gBACZ,QAAQ;gBACR,QAAQ;gBACR,MAAM;aACT;SACJ;QACD,WAAW,EAAE;YACT,IAAI,EAAE,oCAAoC;SAC7C;QACD,UAAU,EAAE;YACR,IAAI,EAAE,SAAS;SAClB;KACJ;IACD,UAAU,EAAE;QACR,OAAO,EAAE;YACL,aAAa,EAAb,8BAAa;SAChB;KACJ;CACK,CAAC"}
+{"version":3,"file":"ui-config-schema.js","sourceRoot":"","sources":["../../../../src/lib/openapi/spec/ui-config-schema.ts"],"names":[],"mappings":";;;AACA,qDAAiD;AAEpC,QAAA,cAAc,GAAG;IAC1B,GAAG,EAAE,qCAAqC;IAC1C,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,QAAQ,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC;IACjE,UAAU,EAAE;QACR,MAAM,EAAE;YACJ,IAAI,EAAE,QAAQ;SACjB;QACD,IAAI,EAAE;YACF,IAAI,EAAE,QAAQ;SACjB;QACD,OAAO,EAAE;YACL,IAAI,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,QAAQ;SACjB;QACD,UAAU,EAAE;YACR,IAAI,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,QAAQ;SACjB;QACD,mBAAmB,EAAE;YACjB,IAAI,EAAE,SAAS;SAClB;QACD,YAAY,EAAE;YACV,IAAI,EAAE,SAAS;SAClB;QACD,kBAAkB,EAAE;YAChB,IAAI,EAAE,QAAQ;SACjB;QACD,qBAAqB,EAAE;YACnB,IAAI,EAAE,QAAQ;SACjB;QACD,kBAAkB,EAAE;YAChB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;aACjB;SACJ;QACD,KAAK,EAAE;YACH,IAAI,EAAE,QAAQ;YACd,oBAAoB,EAAE;gBAClB,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,KAAK,EAAE;YACH,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;aACjB;SACJ;QACD,kBAAkB,EAAE;YAChB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE;gBACF,aAAa;gBACb,MAAM;gBACN,YAAY;gBACZ,QAAQ;gBACR,QAAQ;gBACR,MAAM;aACT;SACJ;QACD,WAAW,EAAE;YACT,IAAI,EAAE,oCAAoC;SAC7C;KACJ;IACD,UAAU,EAAE;QACR,OAAO,EAAE;YACL,aAAa,EAAb,8BAAa;SAChB;KACJ;CACK,CAAC"}

package/dist/lib/routes/admin-api/config.js

@@ -75,7 +75,6 @@ class ConfigController extends controller_1.default {
             frontendApiOrigins: frontendSettings.frontendApiOrigins,
             versionInfo: this.versionService.getVersionInfo(),
             disablePasswordAuth,
-            embedProxy: this.config.experimental.flags.embedProxy,
         };
         this.openApiService.respondWithValidation(200, res, ui_config_schema_1.uiConfigSchema.$id, response);
     }

package/dist/lib/routes/admin-api/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/config.ts"],"names":[],"mappings":"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"}

package/dist/lib/routes/index.js

@@ -12,6 +12,7 @@ const ClientApi = require('./client-api');
 const Controller = require('./controller');
 const health_check_1 = require("./health-check");
 const proxy_api_1 = __importDefault(require("./proxy-api"));
+const conditional_middleware_1 = require("../middleware/conditional-middleware");
 class IndexRouter extends Controller {
     constructor(config, services) {
         super(config);
@@ -22,9 +23,7 @@ class IndexRouter extends Controller {
         this.use('/auth/reset', new reset_password_controller_1.default(config, services).router);
         this.use('/api/admin', new AdminApi(config, services).router);
         this.use('/api/client', new ClientApi(config, services).router);
-        if (config.experimental.flags.embedProxy) {
-            this.use('/api/frontend', new proxy_api_1.default(config, services).router);
-        }
+        this.use('/api/frontend', (0, conditional_middleware_1.conditionalMiddleware)(() => config.flagResolver.isEnabled('embedProxy'), new proxy_api_1.default(config, services).router));
     }
 }
 exports.default = IndexRouter;

package/dist/lib/routes/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/routes/index.ts"],"names":[],"mappings":";;;;;AAAA,2CAAkD;AAClD,iGAAuE;AACvE,8EAAyE;AAGzE,sDAAwC;AAExC,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACxC,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,iDAAuD;AACvD,4DAA0C;AAE1C,MAAM,WAAY,SAAQ,UAAU;IAChC,YAAY,MAAsB,EAAE,QAA0B;QAC1D,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,oCAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,+BAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,CACJ,cAAc,EACd,IAAI,iDAAsB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CACtD,CAAC;QACF,IAAI,CAAC,GAAG,CACJ,aAAa,EACb,IAAI,mCAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CACvD,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QAC9D,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QAEhE,IAAI,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,EAAE;YACtC,IAAI,CAAC,GAAG,CACJ,eAAe,EACf,IAAI,mBAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAC/C,CAAC;SACL;IACL,CAAC;CACJ;AAED,kBAAe,WAAW,CAAC;AAE3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/routes/index.ts"],"names":[],"mappings":";;;;;AAAA,2CAAkD;AAClD,iGAAuE;AACvE,8EAAyE;AAGzE,sDAAwC;AAExC,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACxC,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,iDAAuD;AACvD,4DAA0C;AAC1C,iFAA6E;AAE7E,MAAM,WAAY,SAAQ,UAAU;IAChC,YAAY,MAAsB,EAAE,QAA0B;QAC1D,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,oCAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,+BAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,CACJ,cAAc,EACd,IAAI,iDAAsB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CACtD,CAAC;QACF,IAAI,CAAC,GAAG,CACJ,aAAa,EACb,IAAI,mCAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CACvD,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QAC9D,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QAEhE,IAAI,CAAC,GAAG,CACJ,eAAe,EACf,IAAA,8CAAqB,EACjB,GAAG,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,YAAY,CAAC,EACjD,IAAI,mBAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAC/C,CACJ,CAAC;IACN,CAAC;CACJ;AAED,kBAAe,WAAW,CAAC;AAE3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}

package/dist/lib/routes/proxy-api/index.js

@@ -16,11 +16,9 @@ class ProxyController extends controller_1.default {
         super(config);
         this.logger = config.getLogger('client-api/feature.js');
         this.services = services;
-        if (config.frontendApiOrigins.length > 0) {
-            // Support CORS requests for the frontend endpoints.
-            // Preflight requests are handled in `app.ts`.
-            this.app.use((0, cors_origin_middleware_1.corsOriginMiddleware)(services));
-        }
+        // Support CORS requests for the frontend endpoints.
+        // Preflight requests are handled in `app.ts`.
+        this.app.use((0, cors_origin_middleware_1.corsOriginMiddleware)(services));
         this.route({
             method: 'get',
             path: '',

package/dist/lib/routes/proxy-api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/routes/proxy-api/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/routes/proxy-api/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/client-metrics/metrics-service-v2.d.ts

@@ -6,14 +6,13 @@ import { IClientMetricsEnv } from '../../types/stores/client-metrics-store-v2';
 import ApiUser from '../../types/api-user';
 import User from '../../types/user';
 export default class ClientMetricsServiceV2 {
+    private config;
     private timers;
     private unsavedMetrics;
     private clientMetricsStoreV2;
     private featureToggleStore;
-    private batchMetricsEnabled;
-    private eventBus;
     private logger;
-    constructor({ featureToggleStore, clientMetricsStoreV2, }: Pick<IUnleashStores, 'featureToggleStore' | 'clientMetricsStoreV2'>, { experimental, eventBus, getLogger, }: Pick<IUnleashConfig, 'eventBus' | 'getLogger' | 'experimental'>, bulkInterval?: number);
+    constructor({ featureToggleStore, clientMetricsStoreV2, }: Pick<IUnleashStores, 'featureToggleStore' | 'clientMetricsStoreV2'>, config: IUnleashConfig, bulkInterval?: number);
     registerClientMetrics(data: IClientApp, clientIp: string): Promise<void>;
     bulkAdd(): Promise<void>;
     getFeatureToggleMetricsSummary(featureName: string): Promise<ToggleMetricsSummary>;

package/dist/lib/services/client-metrics/metrics-service-v2.js

@@ -10,19 +10,16 @@ const api_user_1 = __importDefault(require("../../types/api-user"));
 const api_token_1 = require("../../types/models/api-token");
 const collapseHourlyMetrics_1 = require("../../util/collapseHourlyMetrics");
 class ClientMetricsServiceV2 {
-    constructor({ featureToggleStore, clientMetricsStoreV2, }, { experimental, eventBus, getLogger, }, bulkInterval = (0, date_fns_1.secondsToMilliseconds)(5)) {
+    constructor({ featureToggleStore, clientMetricsStoreV2, }, config, bulkInterval = (0, date_fns_1.secondsToMilliseconds)(5)) {
         this.timers = [];
         this.unsavedMetrics = [];
         this.featureToggleStore = featureToggleStore;
         this.clientMetricsStoreV2 = clientMetricsStoreV2;
-        this.batchMetricsEnabled = experimental.flags.batchMetrics;
-        this.eventBus = eventBus;
-        this.logger = getLogger('/services/client-metrics/client-metrics-service-v2.ts');
-        if (this.batchMetricsEnabled) {
-            this.timers.push(setInterval(() => {
-                this.bulkAdd().catch(console.error);
-            }, bulkInterval).unref());
-        }
+        this.config = config;
+        this.logger = config.getLogger('/services/client-metrics/client-metrics-service-v2.ts');
+        this.timers.push(setInterval(() => {
+            this.bulkAdd().catch(console.error);
+        }, bulkInterval).unref());
         this.timers.push(setInterval(() => {
             this.clientMetricsStoreV2.clearMetrics(48).catch(console.error);
         }, (0, date_fns_1.hoursToMilliseconds)(12)).unref());
@@ -44,7 +41,7 @@ class ClientMetricsServiceV2 {
             no: value.bucket.toggles[name].no,
         }))
             .filter((item) => !(item.yes === 0 && item.no === 0));
-        if (this.batchMetricsEnabled) {
+        if (this.config.flagResolver.isEnabled('batchMetrics')) {
             this.unsavedMetrics = (0, collapseHourlyMetrics_1.collapseHourlyMetrics)([
                 ...this.unsavedMetrics,
                 ...clientMetrics,
@@ -53,10 +50,10 @@ class ClientMetricsServiceV2 {
         else {
             await this.clientMetricsStoreV2.batchInsertMetrics(clientMetrics);
         }
-        this.eventBus.emit(events_1.CLIENT_METRICS, value);
+        this.config.eventBus.emit(events_1.CLIENT_METRICS, value);
     }
     async bulkAdd() {
-        if (this.batchMetricsEnabled && this.unsavedMetrics.length > 0) {
+        if (this.unsavedMetrics.length > 0) {
             // Make a copy of `unsavedMetrics` in case new metrics
             // arrive while awaiting `batchInsertMetrics`.
             const copy = [...this.unsavedMetrics];

package/dist/lib/services/client-metrics/metrics-service-v2.js.map

@@ -1 +1 @@
-{"version":3,"file":"metrics-service-v2.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/metrics-service-v2.ts"],"names":[],"mappings":";;;;;AASA,qCAA+C;AAC/C,uCAAsE;AAGtE,+CAAoD;AACpD,oEAA2C;AAC3C,4DAAmD;AAEnD,4EAAyE;AAEzE,MAAqB,sBAAsB;IAevC,YACI,EACI,kBAAkB,EAClB,oBAAoB,GAC8C,EACtE,EACI,YAAY,EACZ,QAAQ,EACR,SAAS,GACqD,EAClE,YAAY,GAAG,IAAA,gCAAqB,EAAC,CAAC,CAAC;QAxBnC,WAAM,GAAqB,EAAE,CAAC;QAE9B,mBAAc,GAAwB,EAAE,CAAC;QAwB7C,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,mBAAmB,GAAG,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC;QAC3D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,SAAS,CACnB,uDAAuD,CAC1D,CAAC;QAEF,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,WAAW,CAAC,GAAG,EAAE;gBACb,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACxC,CAAC,EAAE,YAAY,CAAC,CAAC,KAAK,EAAE,CAC3B,CAAC;SACL;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,WAAW,CAAC,GAAG,EAAE;YACb,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpE,CAAC,EAAE,IAAA,8BAAmB,EAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CACtC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,qBAAqB,CACvB,IAAgB,EAChB,QAAgB;QAEhB,MAAM,KAAK,GAAG,MAAM,4BAAmB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;SAC1D;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAC;QAElD,MAAM,aAAa,GAAwB,WAAW;aACjD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACZ,WAAW,EAAE,IAAI;YACjB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK;YAC7B,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG;YACnC,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE;SACpC,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QAE1D,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC1B,IAAI,CAAC,cAAc,GAAG,IAAA,6CAAqB,EAAC;gBACxC,GAAG,IAAI,CAAC,cAAc;gBACtB,GAAG,aAAa;aACnB,CAAC,CAAC;SACN;aAAM;YACH,MAAM,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;SACrE;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,uBAAc,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,OAAO;QACT,IAAI,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5D,sDAAsD;YACtD,8CAA8C;YAC9C,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;YACtC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;YACzB,MAAM,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;SAC5D;IACL,CAAC;IAED,+EAA+E;IAC/E,KAAK,CAAC,8BAA8B,CAChC,WAAmB;QAEnB,MAAM,OAAO,GACT,MAAM,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,CACtD,WAAW,EACX,CAAC,CACJ,CAAC;QACN,MAAM,gBAAgB,GAClB,MAAM,IAAI,CAAC,oBAAoB,CAAC,2BAA2B,CACvD,WAAW,CACd,CAAC;QAEN,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACjD,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;gBACxB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;gBACvC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;aACxC;iBAAM;gBACH,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG;oBACrB,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,EAAE,EAAE,IAAI,CAAC,EAAE;iBACd,CAAC;aACL;YACD,OAAO,IAAI,CAAC;QAChB,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO;YACH,WAAW;YACX,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;YAC5C,gBAAgB;SACnB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC3B,UAAkB,EAClB,SAAkB;QAElB,OAAO,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,CACvD,UAAU,EACV,SAAS,CACZ,CAAC;IACN,CAAC;IAED,yBAAyB,CAAC,IAAoB,EAAE,IAAgB;QAC5D,IAAI,IAAI,YAAY,kBAAO,EAAE;YACzB,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,EAAE;gBAC1B,OAAO,IAAI,CAAC,WAAW,CAAC;aAC3B;iBAAM,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,IAAI,IAAI,CAAC,WAAW,EAAE;gBACrD,OAAO,IAAI,CAAC,WAAW,CAAC;aAC3B;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO;QACH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC;CACJ;AA3JD,yCA2JC"}
+{"version":3,"file":"metrics-service-v2.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/metrics-service-v2.ts"],"names":[],"mappings":"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"}

package/dist/lib/types/experimental.d.ts

@@ -4,6 +4,7 @@ export declare const defaultExperimentalOptions: {
         ENABLE_DARK_MODE_SUPPORT: boolean;
         anonymiseEventLog: boolean;
         embedProxy: boolean;
+        embedProxyFrontend: boolean;
         batchMetrics: boolean;
     };
     externalResolver: {
@@ -15,6 +16,7 @@ export interface IExperimentalOptions {
         [key: string]: boolean;
         ENABLE_DARK_MODE_SUPPORT?: boolean;
         embedProxy?: boolean;
+        embedProxyFrontend?: boolean;
         batchMetrics?: boolean;
         anonymiseEventLog?: boolean;
     };

package/dist/lib/types/experimental.js

@@ -7,6 +7,7 @@ exports.defaultExperimentalOptions = {
         ENABLE_DARK_MODE_SUPPORT: false,
         anonymiseEventLog: false,
         embedProxy: (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.UNLEASH_EXPERIMENTAL_EMBED_PROXY, false),
+        embedProxyFrontend: (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.UNLEASH_EXPERIMENTAL_EMBED_PROXY_FRONTEND, false),
         batchMetrics: (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.UNLEASH_EXPERIMENTAL_BATCH_METRICS, false),
     },
     externalResolver: { isEnabled: () => false },

package/dist/lib/types/experimental.js.map

@@ -1 +1 @@
-{"version":3,"file":"experimental.js","sourceRoot":"","sources":["../../../src/lib/types/experimental.ts"],"names":[],"mappings":";;;AAAA,qDAAyD;AAI5C,QAAA,0BAA0B,GAAG;IACtC,KAAK,EAAE;QACH,wBAAwB,EAAE,KAAK;QAC/B,iBAAiB,EAAE,KAAK;QACxB,UAAU,EAAE,IAAA,gCAAkB,EAC1B,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAC5C,KAAK,CACR;QACD,YAAY,EAAE,IAAA,gCAAkB,EAC5B,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAC9C,KAAK,CACR;KACJ;IACD,gBAAgB,EAAE,EAAE,SAAS,EAAE,GAAY,EAAE,CAAC,KAAK,EAAE;CACxD,CAAC"}
+{"version":3,"file":"experimental.js","sourceRoot":"","sources":["../../../src/lib/types/experimental.ts"],"names":[],"mappings":";;;AAAA,qDAAyD;AAI5C,QAAA,0BAA0B,GAAG;IACtC,KAAK,EAAE;QACH,wBAAwB,EAAE,KAAK;QAC/B,iBAAiB,EAAE,KAAK;QACxB,UAAU,EAAE,IAAA,gCAAkB,EAC1B,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAC5C,KAAK,CACR;QACD,kBAAkB,EAAE,IAAA,gCAAkB,EAClC,OAAO,CAAC,GAAG,CAAC,yCAAyC,EACrD,KAAK,CACR;QACD,YAAY,EAAE,IAAA,gCAAkB,EAC5B,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAC9C,KAAK,CACR;KACJ;IACD,gBAAgB,EAAE,EAAE,SAAS,EAAE,GAAY,EAAE,CAAC,KAAK,EAAE;CACxD,CAAC"}

package/dist/lib/util/findPublicFolder.d.ts

@@ -0,0 +1 @@
+export declare const findPublicFolder: () => string;

package/dist/lib/util/findPublicFolder.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findPublicFolder = void 0;
+const path_1 = __importDefault(require("path"));
+const findPublicFolder = () => {
+    return path_1.default.join(__dirname, '..', '..', '..', 'frontend', 'build');
+};
+exports.findPublicFolder = findPublicFolder;
+//# sourceMappingURL=findPublicFolder.js.map

package/dist/lib/util/findPublicFolder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"findPublicFolder.js","sourceRoot":"","sources":["../../../src/lib/util/findPublicFolder.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAEjB,MAAM,gBAAgB,GAAG,GAAW,EAAE;IACzC,OAAO,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B"}

package/dist/lib/util/rewriteHTML.test.js

@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const rewriteHTML_1 = require("./rewriteHTML");
-const unleash_frontend_1 = require("unleash-frontend");
-const input = fs_1.default.readFileSync(path_1.default.join(unleash_frontend_1.publicFolder, 'index.html')).toString();
+const findPublicFolder_1 = require("./findPublicFolder");
+const input = fs_1.default
+    .readFileSync(path_1.default.join((0, findPublicFolder_1.findPublicFolder)(), 'index.html'))
+    .toString();
 test('rewriteHTML substitutes meta tag with existing rewrite value', () => {
     const result = (0, rewriteHTML_1.rewriteHTML)(input, '/hosted');
     expect(result.includes('<meta name="baseUriPath" content="/hosted" />')).toBe(true);

package/dist/lib/util/rewriteHTML.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"rewriteHTML.test.js","sourceRoot":"","sources":["../../../src/lib/util/rewriteHTML.test.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,+CAA4C;AAC5C,uDAAgD;AAEhD,MAAM,KAAK,GAAG,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,+BAAY,EAAE,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AAEhF,IAAI,CAAC,8DAA8D,EAAE,GAAG,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC7C,MAAM,CACF,MAAM,CAAC,QAAQ,CAAC,+CAA+C,CAAC,CACnE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAC3D,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACtC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,wCAAwC,CAAC,CAAC,CAAC,IAAI,CAClE,IAAI,CACP,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,GAAG,EAAE;IACxE,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC7C,MAAM,CACF,MAAM,CAAC,QAAQ,CACX,6DAA6D,CAChE,CACJ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mEAAmE,EAAE,GAAG,EAAE;IAC3E,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACtC,MAAM,CACF,MAAM,CAAC,QAAQ,CAAC,sDAAsD,CAAC,CAC1E,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8DAA8D,EAAE,GAAG,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,EAAE,EAAE,kCAAkC,CAAC,CAAC;IAC1E,MAAM,CACF,MAAM,CAAC,QAAQ,CACX,sFAAsF,CACzF,CACJ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uDAAuD,EAAE,GAAG,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,EAAE,EAAE,kCAAkC,CAAC,CAAC;IAC1E,MAAM,CACF,MAAM,CAAC,QAAQ,CACX,kEAAkE,CACrE,CACJ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uCAAuC,EAAE,GAAG,EAAE;IAC/C,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACtC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,yCAAyC,CAAC,CAAC,CAAC,IAAI,CACnE,IAAI,CACP,CAAC;AACN,CAAC,CAAC,CAAC"}
+{"version":3,"file":"rewriteHTML.test.js","sourceRoot":"","sources":["../../../src/lib/util/rewriteHTML.test.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,+CAA4C;AAC5C,yDAAsD;AAEtD,MAAM,KAAK,GAAG,YAAE;KACX,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,IAAA,mCAAgB,GAAE,EAAE,YAAY,CAAC,CAAC;KACzD,QAAQ,EAAE,CAAC;AAEhB,IAAI,CAAC,8DAA8D,EAAE,GAAG,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC7C,MAAM,CACF,MAAM,CAAC,QAAQ,CAAC,+CAA+C,CAAC,CACnE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAC3D,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACtC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,wCAAwC,CAAC,CAAC,CAAC,IAAI,CAClE,IAAI,CACP,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,GAAG,EAAE;IACxE,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC7C,MAAM,CACF,MAAM,CAAC,QAAQ,CACX,6DAA6D,CAChE,CACJ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mEAAmE,EAAE,GAAG,EAAE;IAC3E,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACtC,MAAM,CACF,MAAM,CAAC,QAAQ,CAAC,sDAAsD,CAAC,CAC1E,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8DAA8D,EAAE,GAAG,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,EAAE,EAAE,kCAAkC,CAAC,CAAC;IAC1E,MAAM,CACF,MAAM,CAAC,QAAQ,CACX,sFAAsF,CACzF,CACJ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uDAAuD,EAAE,GAAG,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,EAAE,EAAE,kCAAkC,CAAC,CAAC;IAC1E,MAAM,CACF,MAAM,CAAC,QAAQ,CACX,kEAAkE,CACrE,CACJ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uCAAuC,EAAE,GAAG,EAAE;IAC/C,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACtC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,yCAAyC,CAAC,CAAC,CAAC,IAAI,CACnE,IAAI,CACP,CAAC;AACN,CAAC,CAAC,CAAC"}

package/dist/server-dev.js

@@ -34,6 +34,7 @@ process.nextTick(async () => {
                 // externalResolver: unleash,
                 flags: {
                     embedProxy: true,
+                    embedProxyFrontend: true,
                     batchMetrics: true,
                     anonymiseEventLog: false,
                 },

package/dist/server-dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-dev.js","sourceRoot":"","sources":["../src/server-dev.ts"],"names":[],"mappings":";;AAAA,mDAA0C;AAC1C,uDAAmD;AACnD,yCAAwC;AACxC,4DAA4D;AAE5D,OAAO,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;IACxB,IAAI;QACA,MAAM,IAAA,mBAAK,EACP,IAAA,4BAAY,EAAC;YACT,EAAE,EAAE;gBACA,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,SAAS;gBACnB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,SAAS;gBACxD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;gBAC3C,GAAG,EAAE,KAAK;gBACV,eAAe,EAAE,SAAS;aAC7B;YACD,MAAM,EAAE;gBACJ,mBAAmB,EAAE,IAAI;gBACzB,WAAW,EAAE,EAAE;gBACf,uBAAuB;gBACvB,sBAAsB,EAAE,IAAI;gBAC5B,yDAAyD;aAC5D;YACD,QAAQ,EAAE,iBAAQ,CAAC,KAAK;YACxB,SAAS,EAAE,IAAI;YACf,uBAAuB;YACvB,YAAY,EAAE;gBACV,MAAM,EAAE,KAAK;aAChB;YACD,YAAY,EAAE;gBACV,6BAA6B;gBAC7B,KAAK,EAAE;oBACH,UAAU,EAAE,IAAI;oBAChB,YAAY,EAAE,IAAI;oBAClB,iBAAiB,EAAE,KAAK;iBAC3B;aACJ;YACD,cAAc,EAAE;gBACZ,aAAa,EAAE;oBACX;wBACI,WAAW,EAAE,GAAG;wBAChB,OAAO,EAAE,GAAG;wBACZ,MAAM,EAAE,sCAAsC;wBAC9C,IAAI,EAAE,wBAAY,CAAC,KAAK;wBACxB,QAAQ,EAAE,WAAW;qBACxB;iBACJ;aACJ;SACJ,CAAC,CACL,CAAC;KACL;IAAC,OAAO,KAAK,EAAE;QACZ,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE;YAC7B,sCAAsC;YACtC,OAAO,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;SACpE;aAAM;YACH,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,IAAI,EAAE,CAAC;SAClB;KACJ;AACL,CAAC,EAAE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"server-dev.js","sourceRoot":"","sources":["../src/server-dev.ts"],"names":[],"mappings":";;AAAA,mDAA0C;AAC1C,uDAAmD;AACnD,yCAAwC;AACxC,4DAA4D;AAE5D,OAAO,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;IACxB,IAAI;QACA,MAAM,IAAA,mBAAK,EACP,IAAA,4BAAY,EAAC;YACT,EAAE,EAAE;gBACA,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,SAAS;gBACnB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,SAAS;gBACxD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;gBAC3C,GAAG,EAAE,KAAK;gBACV,eAAe,EAAE,SAAS;aAC7B;YACD,MAAM,EAAE;gBACJ,mBAAmB,EAAE,IAAI;gBACzB,WAAW,EAAE,EAAE;gBACf,uBAAuB;gBACvB,sBAAsB,EAAE,IAAI;gBAC5B,yDAAyD;aAC5D;YACD,QAAQ,EAAE,iBAAQ,CAAC,KAAK;YACxB,SAAS,EAAE,IAAI;YACf,uBAAuB;YACvB,YAAY,EAAE;gBACV,MAAM,EAAE,KAAK;aAChB;YACD,YAAY,EAAE;gBACV,6BAA6B;gBAC7B,KAAK,EAAE;oBACH,UAAU,EAAE,IAAI;oBAChB,kBAAkB,EAAE,IAAI;oBACxB,YAAY,EAAE,IAAI;oBAClB,iBAAiB,EAAE,KAAK;iBAC3B;aACJ;YACD,cAAc,EAAE;gBACZ,aAAa,EAAE;oBACX;wBACI,WAAW,EAAE,GAAG;wBAChB,OAAO,EAAE,GAAG;wBACZ,MAAM,EAAE,sCAAsC;wBAC9C,IAAI,EAAE,wBAAY,CAAC,KAAK;wBACxB,QAAQ,EAAE,WAAW;qBACxB;iBACJ;aACJ;SACJ,CAAC,CACL,CAAC;KACL;IAAC,OAAO,KAAK,EAAE;QACZ,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE;YAC7B,sCAAsC;YACtC,OAAO,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;SACpE;aAAM;YACH,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,IAAI,EAAE,CAAC;SAClB;KACJ;AACL,CAAC,EAAE,CAAC,CAAC,CAAC"}

package/dist/test/config/test-config.js

@@ -25,6 +25,7 @@ function createTestConfig(config) {
         experimental: {
             flags: {
                 embedProxy: true,
+                embedProxyFrontend: true,
                 batchMetrics: true,
             },
         },

package/dist/test/config/test-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-config.js","sourceRoot":"","sources":["../../../src/test/config/test-config.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA8B;AAC9B,mDAIgC;AAChC,sEAA8C;AAC9C,2DAAuD;AAEvD,SAAS,QAAQ,CAAI,OAAqB;IACtC,OAAO,mBAAK,CAAC,GAAG,CAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,SAAgB,gBAAgB,CAAC,MAAwB;IACrD,MAAM,UAAU,GAAoB;QAChC,SAAS,EAAT,mBAAS;QACT,cAAc,EAAE,EAAE,IAAI,EAAE,kBAAS,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE;QAChE,MAAM,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE;QACnC,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;QACtB,YAAY,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;QAC/B,SAAS,EAAE,IAAI;QACf,oBAAoB,EAAE;YAClB,OAAO,EAAE,KAAK;SACjB;QACD,YAAY,EAAE;YACV,KAAK,EAAE;gBACH,UAAU,EAAE,IAAI;gBAChB,YAAY,EAAE,IAAI;aACrB;SACJ;KACJ,CAAC;IACF,MAAM,OAAO,GAAG,QAAQ,CAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAChE,OAAO,IAAA,4BAAY,EAAC,OAAO,CAAC,CAAC;AACjC,CAAC;AApBD,4CAoBC"}
+{"version":3,"file":"test-config.js","sourceRoot":"","sources":["../../../src/test/config/test-config.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA8B;AAC9B,mDAIgC;AAChC,sEAA8C;AAC9C,2DAAuD;AAEvD,SAAS,QAAQ,CAAI,OAAqB;IACtC,OAAO,mBAAK,CAAC,GAAG,CAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,SAAgB,gBAAgB,CAAC,MAAwB;IACrD,MAAM,UAAU,GAAoB;QAChC,SAAS,EAAT,mBAAS;QACT,cAAc,EAAE,EAAE,IAAI,EAAE,kBAAS,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE;QAChE,MAAM,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE;QACnC,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;QACtB,YAAY,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;QAC/B,SAAS,EAAE,IAAI;QACf,oBAAoB,EAAE;YAClB,OAAO,EAAE,KAAK;SACjB;QACD,YAAY,EAAE;YACV,KAAK,EAAE;gBACH,UAAU,EAAE,IAAI;gBAChB,kBAAkB,EAAE,IAAI;gBACxB,YAAY,EAAE,IAAI;aACrB;SACJ;KACJ,CAAC;IACF,MAAM,OAAO,GAAG,QAAQ,CAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAChE,OAAO,IAAA,4BAAY,EAAC,OAAO,CAAC,CAAC;AACjC,CAAC;AArBD,4CAqBC"}

package/frontend/README.md

@@ -0,0 +1,68 @@
+# frontend
+
+This directory contains the Unleash Admin UI frontend app.
+
+## Run with a local instance of the unleash-api
+
+First, start the unleash-api backend on port 4242.
+Then, start the frontend dev server:
+
+```
+cd ~/frontend
+yarn install
+yarn run start
+```
+
+## Run with a heroku-hosted instance of unleash-api
+
+Alternatively, instead of running unleash-api on localhost, use a remote instance:
+
+```
+cd ~/frontend
+yarn install
+yarn run start:heroku
+```
+
+## Running end-to-end tests
+
+We have a set of Cypress tests that run on the build before a PR can be merged
+so it's important that you check these yourself before submitting a PR.
+On the server the tests will run against the deployed Heroku app so this is what you probably want to test against:
+
+```
+yarn run start:heroku
+```
+
+In a different shell, you can run the tests themselves:
+
+```
+yarn run e2e:heroku
+```
+
+If you need to test against patches against a local server instance,
+you'll need to run that, and then run the end to end tests using:
+
+```
+yarn run e2e
+```
+
+You may also need to test that a feature works against the enterprise version of unleash.
+Assuming the Heroku instance is still running, this can be done by:
+
+```
+yarn run start:enterprise
+yarn run e2e
+```
+
+## Generating the OpenAPI client
+
+The frontend uses an OpenAPI client generated from the backend's OpenAPI spec.
+Whenever there are changes to the backend API, the client should be regenerated:
+
+```
+./scripts/generate-openapi.sh
+```
+
+This script assumes that you have a running instance of the enterprise backend at `http://localhost:4242`.
+The new OpenAPI client will be generated from the runtime schema of this instance.
+The target URL can be changed by setting the `UNLEASH_OPENAPI_URL` env var.

package/frontend/build/datadog.svg

@@ -0,0 +1 @@
+<svg height="2500" viewBox=".27 .27 800.01 858.98" width="2328" xmlns="http://www.w3.org/2000/svg"><path d="m670.38 608.27-71.24-46.99-59.43 99.27-69.12-20.21-60.86 92.89 3.12 29.24 330.9-60.97-19.22-206.75zm-308.59-89.14 53.09-7.3c8.59 3.86 14.57 5.33 24.87 7.95 16.04 4.18 34.61 8.19 62.11-5.67 6.4-3.17 19.73-15.36 25.12-22.31l217.52-39.46 22.19 268.56-372.65 67.16zm404.06-96.77-21.47 4.09-41.25-426.18-702.86 81.5 86.59 702.68 82.27-11.94c-6.57-9.38-16.8-20.73-34.27-35.26-24.23-20.13-15.66-54.32-1.37-75.91 18.91-36.48 116.34-82.84 110.82-141.15-1.98-21.2-5.35-48.8-25.03-67.71-.74 7.85.59 15.41.59 15.41s-8.08-10.31-12.11-24.37c-4-5.39-7.14-7.11-11.39-14.31-3.03 8.33-2.63 17.99-2.63 17.99s-6.61-15.62-7.68-28.8c-3.92 5.9-4.91 17.11-4.91 17.11s-8.59-24.62-6.63-37.88c-3.92-11.54-15.54-34.44-12.25-86.49 21.45 15.03 68.67 11.46 87.07-15.66 6.11-8.98 10.29-33.5-3.05-81.81-8.57-30.98-29.79-77.11-38.06-94.61l-.99.71c4.36 14.1 13.35 43.66 16.8 57.99 10.44 43.47 13.24 58.6 8.34 78.64-4.17 17.42-14.17 28.82-39.52 41.56-25.35 12.78-58.99-18.32-61.12-20.04-24.63-19.62-43.68-51.63-45.81-67.18-2.21-17.02 9.81-27.24 15.87-41.16-8.67 2.48-18.34 6.88-18.34 6.88s11.54-11.94 25.77-22.27c5.89-3.9 9.35-6.38 15.56-11.54-8.99-.15-16.29.11-16.29.11s14.99-8.1 30.53-14c-11.37-.5-22.25-.08-22.25-.08s33.45-14.96 59.87-25.94c18.17-7.45 35.92-5.25 45.89 9.17 13.09 18.89 26.84 29.15 55.98 35.51 17.89-7.93 23.33-12.01 45.81-18.13 19.79-21.76 35.33-24.58 35.33-24.58s-7.71 7.07-9.77 18.18c11.22-8.84 23.52-16.22 23.52-16.22s-4.76 5.88-9.2 15.22l1.03 1.53c13.09-7.85 28.48-14.04 28.48-14.04s-4.4 5.56-9.56 12.76c9.87-.08 29.89.42 37.66 1.3 45.87 1.01 55.39-48.99 72.99-55.26 22.04-7.87 31.89-12.63 69.45 24.26 32.23 31.67 57.41 88.36 44.91 101.06-10.48 10.54-31.16-4.11-54.08-32.68-12.11-15.13-21.27-33.01-25.56-55.74-3.62-19.18-17.71-30.31-17.71-30.31s8.18 18.18 8.18 34.24c0 8.77 1.1 41.56 15.16 59.96-1.39 2.69-2.04 13.31-3.58 15.34-16.36-19.77-51.49-33.92-57.22-38.09 19.39 15.89 63.96 52.39 81.08 87.37 16.19 33.08 6.65 63.4 14.84 71.25 2.33 2.25 34.82 42.73 41.07 63.07 10.9 35.45.65 72.7-13.62 95.81l-39.85 6.21c-5.83-1.62-9.76-2.43-14.99-5.46 2.88-5.1 8.61-17.82 8.67-20.44l-2.25-3.95c-12.4 17.57-33.18 34.63-50.44 44.43-22.59 12.8-48.63 10.83-65.58 5.58-48.11-14.84-93.6-47.35-104.57-55.89 0 0-.34 6.82 1.73 8.35 12.13 13.68 39.92 38.43 66.78 55.68l-57.26 6.3 27.07 210.78c-12 1.72-13.87 2.56-27.01 4.43-11.58-40.91-33.73-67.62-57.94-83.18-21.35-13.72-50.8-16.81-78.99-11.23l-1.81 2.1c19.6-2.04 42.74.8 66.51 15.85 23.33 14.75 42.13 52.85 49.05 75.79 8.86 29.32 14.99 60.68-8.86 93.92-16.97 23.63-66.51 36.69-106.53 8.44 10.69 17.19 25.14 31.25 44.59 33.9 28.88 3.92 56.29-1.09 75.16-20.46 16.11-16.56 24.65-51.19 22.4-87.66l25.49-3.7 9.2 65.46 421.98-50.81zm-256.73-177.77c-1.18 2.69-3.03 4.45-.25 13.2l.17.5.44 1.13 1.16 2.62c5.01 10.24 10.51 19.9 19.7 24.83 2.38-.4 4.84-.67 7.39-.8 8.63-.38 14.08.99 17.54 2.85.31-1.72.38-4.24.19-7.95-.67-12.97 2.57-35.03-22.36-46.64-9.41-4.37-22.61-3.02-27.01 2.43.8.1 1.52.27 2.08.46 6.65 2.33 2.14 4.62.95 7.37m69.87 121.02c-3.27-1.8-18.55-1.09-29.29.19-20.46 2.41-42.55 9.51-47.39 13.29-8.8 6.8-4.8 18.66 1.7 23.53 18.23 13.62 34.21 22.75 51.08 20.53 10.36-1.36 19.49-17.76 25.96-32.64 4.43-10.25 4.43-21.31-2.06-24.9m-181.14-104.96c5.77-5.48-28.74-12.68-55.52 5.58-19.75 13.47-20.38 42.35-1.47 58.72 1.89 1.62 3.45 2.77 4.91 3.71 5.52-2.6 11.81-5.23 19.05-7.58 12.23-3.97 22.4-6.02 30.76-7.11 4-4.47 8.65-12.34 7.49-26.59-1.58-19.33-16.23-16.26-5.22-26.73" fill="#632ca6"/></svg>