Merge branch 'main' into feat/keystone-bk

Author: zhaono1

.yarn/patches/@firebase-app-check-npm-0.8.13-82152b436a.patch

@@ -0,0 +1,68 @@
+diff --git a/dist/esm/index.esm2017.js b/dist/esm/index.esm2017.js
+index 0ccacd0074ecd0e8c3d7aecff784035c976c3507..45b1bbdecd576496512cbeff1a3ae3360416e71c 100644
+--- a/dist/esm/index.esm2017.js
++++ b/dist/esm/index.esm2017.js
+@@ -1072,8 +1072,6 @@ const version = "0.8.13";
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+-const RECAPTCHA_URL = 'https://www.google.com/recaptcha/api.js';
+-const RECAPTCHA_ENTERPRISE_URL = 'https://www.google.com/recaptcha/enterprise.js';
+ function initializeV3(app, siteKey) {
+     const initialized = new Deferred();
+     const state = getStateReference(app);
+@@ -1178,18 +1176,8 @@ function renderInvisibleWidget(app, siteKey, grecaptcha, container) {
+     state.reCAPTCHAState = Object.assign(Object.assign({}, state.reCAPTCHAState), { // state.reCAPTCHAState is set in the initialize()
+         widgetId });
+ }
+-function loadReCAPTCHAV3Script(onload) {
+-    const script = document.createElement('script');
+-    script.src = RECAPTCHA_URL;
+-    script.onload = onload;
+-    document.head.appendChild(script);
+-}
+-function loadReCAPTCHAEnterpriseScript(onload) {
+-    const script = document.createElement('script');
+-    script.src = RECAPTCHA_ENTERPRISE_URL;
+-    script.onload = onload;
+-    document.head.appendChild(script);
+-}
++function loadReCAPTCHAV3Script(onload) {}
++function loadReCAPTCHAEnterpriseScript(onload) {}
+ 
+ /**
+  * @license
+diff --git a/dist/index.cjs.js b/dist/index.cjs.js
+index 0c2a517b474822b9546c2826f3d31b0d170380a5..91e54ea0cdcbd4f89d57d4e609eaf47a9f6bcd41 100644
+--- a/dist/index.cjs.js
++++ b/dist/index.cjs.js
+@@ -1076,8 +1076,6 @@ const version = "0.8.13";
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+-const RECAPTCHA_URL = 'https://www.google.com/recaptcha/api.js';
+-const RECAPTCHA_ENTERPRISE_URL = 'https://www.google.com/recaptcha/enterprise.js';
+ function initializeV3(app, siteKey) {
+     const initialized = new util.Deferred();
+     const state = getStateReference(app);
+@@ -1182,18 +1180,8 @@ function renderInvisibleWidget(app, siteKey, grecaptcha, container) {
+     state.reCAPTCHAState = Object.assign(Object.assign({}, state.reCAPTCHAState), { // state.reCAPTCHAState is set in the initialize()
+         widgetId });
+ }
+-function loadReCAPTCHAV3Script(onload) {
+-    const script = document.createElement('script');
+-    script.src = RECAPTCHA_URL;
+-    script.onload = onload;
+-    document.head.appendChild(script);
+-}
+-function loadReCAPTCHAEnterpriseScript(onload) {
+-    const script = document.createElement('script');
+-    script.src = RECAPTCHA_ENTERPRISE_URL;
+-    script.onload = onload;
+-    document.head.appendChild(script);
+-}
++function loadReCAPTCHAV3Script(onload) {}
++function loadReCAPTCHAEnterpriseScript(onload) {}
+ 
+ /**
+  * @license

apps/legacy/rsbuild.legacy.alpha.ts

@@ -1,8 +1,8 @@
 import { defineConfig, mergeRsbuildConfig } from '@rsbuild/core';
 import { CopyRspackPlugin } from '@rspack/core';
-import commonConfig from './rsbuild.legacy.common.ts';
+import commonConfig from './rsbuild.legacy.common';
 import { transformManifestFiles } from '../../build-scripts/manifestHelpers.js';
-import { getEnvVars } from '../../build-scripts/getEnvVars.ts';
+import { getEnvVars } from '../../build-scripts/getEnvVars';
 
 const skipSourceMap = process.env.NO_SOURCE_MAPS === 'true';
 

apps/legacy/tsconfig.json

@@ -8,5 +8,5 @@
     }
   },
   "exclude": ["**/node_modules/*"],
-  "include": ["./src", "../../packages/types/*.d.ts"]
+  "include": ["./src", "../../packages/types/*.d.ts", "rsbuild*.ts"]
 }

package.json

@@ -138,6 +138,7 @@
   "packageManager": "yarn@4.7.0+sha512.5a0afa1d4c1d844b3447ee3319633797bcd6385d9a44be07993ae52ff4facabccafb4af5dcd1c2f9a94ac113e5e9ff56f6130431905884414229e284e37bb7c9",
   "resolutions": {
     "@firebase/messaging@npm:0.12.17": "patch:@firebase/messaging@npm%3A0.12.17#~/.yarn/patches/@firebase-messaging-npm-0.12.17-b743d37abd.patch",
-    "@mui/material@npm:^6.4.10": "patch:@mui/material@npm%3A6.4.11#~/.yarn/patches/@mui-material-npm-6.4.11-84c49ed24a.patch"
+    "@mui/material@npm:^6.4.10": "patch:@mui/material@npm%3A6.4.11#~/.yarn/patches/@mui-material-npm-6.4.11-84c49ed24a.patch",
+    "@firebase/app-check@npm:0.8.13": "patch:@firebase/app-check@npm%3A0.8.13#~/.yarn/patches/@firebase-app-check-npm-0.8.13-82152b436a.patch"
   }
 }

yarn.lock

@@ -5914,6 +5914,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@firebase/app-check@patch:@firebase/app-check@npm%3A0.8.13#~/.yarn/patches/@firebase-app-check-npm-0.8.13-82152b436a.patch":
+  version: 0.8.13
+  resolution: "@firebase/app-check@patch:@firebase/app-check@npm%3A0.8.13#~/.yarn/patches/@firebase-app-check-npm-0.8.13-82152b436a.patch::version=0.8.13&hash=a5b584"
+  dependencies:
+    "@firebase/component": "npm:0.6.13"
+    "@firebase/logger": "npm:0.4.4"
+    "@firebase/util": "npm:1.11.0"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app": 0.x
+  checksum: 10c0/ff0c1df6d1596f233459d44cee36ea48a71103b69652a8d53a1434f284f5af41314b8cee81e8f20ef0a525ec57c14b6514e96257db27afbd1e290acd788339a4
+  languageName: node
+  linkType: hard
+
 "@firebase/app-compat@npm:0.2.53":
   version: 0.2.53
   resolution: "@firebase/app-compat@npm:0.2.53"