@next-core/brick-container 3.20.4 → 3.20.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "3.20.4",
+  "version": "3.20.6",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/brick-container",
   "license": "GPL-3.0",
@@ -35,7 +35,7 @@
     "test:ci": "cross-env NODE_ENV='test' CI=true test-next"
   },
   "dependencies": {
-    "@next-core/serve-helpers": "^1.2.4",
+    "@next-core/serve-helpers": "^1.2.5",
     "body-parser": "^1.20.3",
     "chalk": "^4.1.2",
     "chokidar": "^4.0.1",
@@ -75,5 +75,5 @@
     "@next-core/runtime": "*",
     "@next-core/utils": "*"
   },
-  "gitHead": "61f029536164a0fbe519efee18d21dfefee9f3ae"
+  "gitHead": "9c89b57fe85a45fd95b1a280576f062f0d082f70"
 }

package/serve/getProxy.js

@@ -103,6 +103,7 @@ export default function getProxy(env, getRawIndexHtml) {
               return responseBuffer;
             }
 
+            // Add or clear secure related cookie flags
             const secureCookieFlags = [
               "SameSite=None",
               "Secure",
@@ -115,12 +116,19 @@ export default function getProxy(env, getRawIndexHtml) {
               req.path === "/next/api/auth/login/v2" &&
               Array.isArray(setCookies)
             ) {
+              // - If the server is https, but the local is http, clear the secure cookie flags;
+              // - Otherwise, if the local is localhost and cookieSameSiteNone is enabled (default),
+              //   add the secure cookie flags;
+              // - Otherwise, if the local is https, do nothing;
+              // - Otherwise, clear the secure cookie flags;
               const strategy =
-                env.cookieSameSiteNone && env.host === "localhost"
-                  ? "add"
-                  : env.https
-                    ? null
-                    : "clear";
+                env.server.startsWith("https:") && !env.https
+                  ? "clear"
+                  : env.cookieSameSiteNone && env.host === "localhost"
+                    ? "add"
+                    : env.https
+                      ? null
+                      : "clear";
               if (strategy) {
                 // Note: it seems that now Chrome (v107) requires `SameSite=None` even for localhost.
                 // However, `Secure` can use used with non-http for localhost.

package/serve/middlewares/getMiddlewares.js

@@ -1,10 +1,10 @@
-import express from "express";
 import jsYaml from "js-yaml";
 import bootstrapJson from "./bootstrapJson.js";
 import mockAuth from "./mockAuth.js";
 import singleAppBootstrapJson from "./singleAppBootstrapJson.js";
 import standaloneBootstrapJson from "./standaloneBootstrapJson.js";
 import serveBricksWithVersions from "./serveBricksWithVersions.js";
+import { serveBricks } from "@next-core/serve-helpers";
 
 const { safeDump, JSON_SCHEMA } = jsYaml;
 
@@ -34,7 +34,7 @@ export function getMiddlewares(env) {
     });
     middlewares.push({
       path: `${baseHref}api/v1/runtime_standalone`,
-      middleware(req, res) {
+      middleware(_req, res) {
         res.send({
           code: 0,
           data: {
@@ -45,7 +45,7 @@ export function getMiddlewares(env) {
     });
     middlewares.push({
       path: `${baseHref}api/gateway/micro_app_standalone.runtime.RuntimeMicroAppStandalone/api/v1/micro_app_standalone/runtime/:appId`,
-      middleware(req, res) {
+      middleware(_req, res) {
         res.send({
           code: 0,
           data: null,
@@ -54,7 +54,7 @@ export function getMiddlewares(env) {
     });
     middlewares.push({
       path: `${baseHref}api/gateway/data_exchange.store.ClickHouseInsertData/api/v1/data_exchange/frontend_stat`,
-      middleware(req, res) {
+      middleware(_req, res) {
         res.send({
           code: 0,
           data: null,
@@ -67,7 +67,7 @@ export function getMiddlewares(env) {
 }
 
 export function getPreMiddlewares(env) {
-  const { baseHref, localMicroApps, localBrickFolders, userConfigByApps } = env;
+  const { baseHref, localMicroApps, userConfigByApps } = env;
 
   /**
    * @type {import("webpack-dev-server").Middleware[]}
@@ -81,7 +81,7 @@ export function getPreMiddlewares(env) {
     });
     middlewares.push({
       path: `${baseHref}sa-static/${appId}/versions/0.0.0/webroot/conf.yaml`,
-      middleware(req, res) {
+      middleware(_req, res) {
         if (userConfigByApps) {
           const conf = {
             user_config_by_apps: userConfigByApps,
@@ -108,12 +108,10 @@ export function getPreMiddlewares(env) {
     middleware: serveBricksWithVersions(env),
   });
 
-  for (const dir of localBrickFolders) {
-    middlewares.push({
-      path: `${baseHref}bricks/`,
-      middleware: express.static(dir),
-    });
-  }
+  middlewares.push({
+    path: `${baseHref}bricks/`,
+    middleware: serveBricks(env),
+  });
 
   return middlewares;
 }

package/dist/844.053079f5.js

@@ -1,2 +0,0 @@
-(globalThis.webpackChunk_next_core_brick_container=globalThis.webpackChunk_next_core_brick_container||[]).push([[844],{9844:(n,e,r)=>{var s={"./en-au":4073,"./en-au.js":4073,"./en-ca":1387,"./en-ca.js":1387,"./en-gb":1386,"./en-gb.js":1386,"./en-ie":3537,"./en-ie.js":3537,"./en-il":7050,"./en-il.js":7050,"./en-in":627,"./en-in.js":627,"./en-nz":6963,"./en-nz.js":6963,"./en-sg":4865,"./en-sg.js":4865,"./zh-cn":1329,"./zh-cn.js":1329,"./zh-hk":3005,"./zh-hk.js":3005,"./zh-mo":7696,"./zh-mo.js":7696,"./zh-tw":5861,"./zh-tw.js":5861};function o(n){var e=i(n);return r(e)}function i(n){if(!r.o(s,n)){var e=new Error("Cannot find module '"+n+"'");throw e.code="MODULE_NOT_FOUND",e}return s[n]}o.keys=function(){return Object.keys(s)},o.resolve=i,n.exports=o,o.id=9844}}]);
-//# sourceMappingURL=844.053079f5.js.map

package/dist/844.053079f5.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"844.053079f5.js","mappings":"sIAAA,IAAIA,EAAM,CACT,UAAW,KACX,aAAc,KACd,UAAW,KACX,aAAc,KACd,UAAW,KACX,aAAc,KACd,UAAW,KACX,aAAc,KACd,UAAW,KACX,aAAc,KACd,UAAW,IACX,aAAc,IACd,UAAW,KACX,aAAc,KACd,UAAW,KACX,aAAc,KACd,UAAW,KACX,aAAc,KACd,UAAW,KACX,aAAc,KACd,UAAW,KACX,aAAc,KACd,UAAW,KACX,aAAc,MAIf,SAASC,EAAeC,GACvB,IAAIC,EAAKC,EAAsBF,GAC/B,OAAOG,EAAoBF,EAC5B,CACA,SAASC,EAAsBF,GAC9B,IAAIG,EAAoBC,EAAEN,EAAKE,GAAM,CACpC,IAAIK,EAAI,IAAIC,MAAM,uBAAyBN,EAAM,KAEjD,MADAK,EAAEE,KAAO,mBACHF,CACP,CACA,OAAOP,EAAIE,EACZ,CACAD,EAAeS,KAAO,WACrB,OAAOC,OAAOD,KAAKV,EACpB,EACAC,EAAeW,QAAUR,EACzBS,EAAOC,QAAUb,EACjBA,EAAeE,GAAK,I","sources":["webpack:///../../node_modules/moment/locale/ sync zh%7Cen"],"sourcesContent":["var map = {\n\t\"./en-au\": 4073,\n\t\"./en-au.js\": 4073,\n\t\"./en-ca\": 1387,\n\t\"./en-ca.js\": 1387,\n\t\"./en-gb\": 1386,\n\t\"./en-gb.js\": 1386,\n\t\"./en-ie\": 3537,\n\t\"./en-ie.js\": 3537,\n\t\"./en-il\": 7050,\n\t\"./en-il.js\": 7050,\n\t\"./en-in\": 627,\n\t\"./en-in.js\": 627,\n\t\"./en-nz\": 6963,\n\t\"./en-nz.js\": 6963,\n\t\"./en-sg\": 4865,\n\t\"./en-sg.js\": 4865,\n\t\"./zh-cn\": 1329,\n\t\"./zh-cn.js\": 1329,\n\t\"./zh-hk\": 3005,\n\t\"./zh-hk.js\": 3005,\n\t\"./zh-mo\": 7696,\n\t\"./zh-mo.js\": 7696,\n\t\"./zh-tw\": 5861,\n\t\"./zh-tw.js\": 5861\n};\n\n\nfunction webpackContext(req) {\n\tvar id = webpackContextResolve(req);\n\treturn __webpack_require__(id);\n}\nfunction webpackContextResolve(req) {\n\tif(!__webpack_require__.o(map, req)) {\n\t\tvar e = new Error(\"Cannot find module '\" + req + \"'\");\n\t\te.code = 'MODULE_NOT_FOUND';\n\t\tthrow e;\n\t}\n\treturn map[req];\n}\nwebpackContext.keys = function webpackContextKeys() {\n\treturn Object.keys(map);\n};\nwebpackContext.resolve = webpackContextResolve;\nmodule.exports = webpackContext;\nwebpackContext.id = 9844;"],"names":["map","webpackContext","req","id","webpackContextResolve","__webpack_require__","o","e","Error","code","keys","Object","resolve","module","exports"],"sourceRoot":""}

package/dist/90.70e65e43.js

@@ -1 +0,0 @@
-"use strict";(globalThis.webpackChunk_next_core_brick_container=globalThis.webpackChunk_next_core_brick_container||[]).push([[90],{90:(c,e,n)=>{n.r(e)}}]);