feat(core): allow all schemas to dynamic load (Tencent#2829)

etkmao · Mar 14, 2023 · 4ecf8b0 · 4ecf8b0
1 parent 9a72ddd
commit 4ecf8b0
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 48 deletions.
diff --git a/driver/js/lib/global/DynamicLoad.js b/driver/js/lib/global/DynamicLoad.js
@@ -2,7 +2,7 @@
  * Tencent is pleased to support the open source community by making
  * Hippy available.
  *
- * Copyright (C) 2017-2019 THL A29 Limited, a Tencent company.
+ * Copyright (C) 2017-2022 THL A29 Limited, a Tencent company.
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,7 +25,7 @@ const ContextifyModule = internalBinding('ContextifyModule');
 
 global.dynamicLoad = (path, encode, cb) => {
   let requestPath = path || '';
-  const isSchema = ['https://', 'http://', '//'].some(schema => requestPath.indexOf(schema) === 0);
+  const isSchema = /^(.+:\/\/)|^(\/\/)/.test(path);
   if (!isSchema) {
     requestPath = global.__HIPPYCURDIR__ + path;
   }

diff --git a/driver/js/scripts/build-core.js b/driver/js/scripts/build-core.js
@@ -275,5 +275,5 @@ function generateCpp(platform, buildDirPath) {
 
 // Start to work
 generateCpp('ios', getAbsolutePath('../../../framework/ios/base'));
-generateCpp('android', getAbsolutePath('../../../framework/android/src/main/cpp/src/bridge/'));
-generateCpp('flutter', getAbsolutePath('../flutter/core/src/bridge/'));
+generateCpp('android', getAbsolutePath('../../../framework/android/connector/driver/js/src/main/cpp/src/'));
+generateCpp('flutter', getAbsolutePath('../../../framework/voltron/core/src/bridge/'));