feat(framework): adjust the directory structure for the framework

.github/CODEOWNERS

@@ -36,15 +36,15 @@ CMakeLists.txt @medns
 # dom related
 /dom/ @churchill-zhang @ilikethese @medns
 
-# js core related
-/driver/js/core/ @churchill-zhang @ilikethese
-/driver/js/core/js/ @zoomchan-cxj
+# driver related
+/driver/js/ @churchill-zhang @ilikethese
+/driver/js/lib/ @zoomchan-cxj
 
 # examples related
-/driver/js/examples/android-demo/ @siguangli
-/driver/js/examples/android-demo/res/ @zoomchan-cxj
-/driver/js/examples/ios-demo/ @ozonelmy
-/driver/js/examples/ios-demo/res/ @zoomchan-cxj
+/framework/examples/android-demo/ @siguangli
+/framework/examples/ios-demo/ @ozonelmy
+/framework/examples/android-demo/res/ @zoomchan-cxj
+/framework/examples/ios-demo/res/ @zoomchan-cxj
 /driver/js/examples/hippy-react-demo/ @zoomchan-cxj
 /driver/js/examples/hippy-vue-demo/ @zoomchan-cxj
 
@@ -64,7 +64,7 @@ CMakeLists.txt @medns
 /layout/ @ilikethese @churchill-zhang
 
 # android related
-/driver/js/android/ @siguangli
+/framework/android/ @siguangli
 /renderer/native/android/ @siguangli
 /gradle/ @siguangli
 /gradle.properties @siguangli
@@ -74,7 +74,7 @@ CMakeLists.txt @medns
 /setting.gradle @siguangli
 
 # ios related
-/driver/js/ios/ @ozonelmy
+/framework/ios/ @ozonelmy
 /renderer/native/ios/ @ozonelmy
 /hippy.podspec @ozonelmy
 

.github/license-check.json

@@ -34,8 +34,9 @@
     ".github/**",
     ".husky/**",
     "docs/**",
-    "driver/js/examples/android-demo/res/**",
-    "driver/js/examples/ios-demo/res/**",
+    "static/**",
+    "framework/examples/android-demo/res/**",
+    "framework/examples/ios-demo/res/**",
     "driver/js/examples/hippy-**-demo/**",
     "driver/js/flutter/example/**"
   ]

.github/workflows/android_build_tests.yml

@@ -8,8 +8,11 @@ on:
       - v3.0-dev
       - v3.0
     paths:
-      - 'driver/js/android/**'
-      - 'driver/js/core/**'
+      - 'framework/android/**'
+      - 'driver/js/lib/**'
+      - 'driver/js/src/**'
+      - 'driver/js/include/**'
+      - 'driver/js/CMakeLists.txt'
       - 'dom/**'
       - 'layout/engine/**'
       - 'modules/android/**'

.github/workflows/android_build_tests_bypass.yml

@@ -8,8 +8,11 @@ on:
       - v3.0-dev
       - v3.0
     paths-ignore:
-      - 'driver/js/android/**'
-      - 'driver/js/core/**'
+      - 'framework/android/**'
+      - 'driver/js/lib/**'
+      - 'driver/js/src/**'
+      - 'driver/js/include/**'
+      - 'driver/js/CMakeLists.txt'
       - 'dom/**'
       - 'layout/engine/**'
       - 'modules/android/**'

.github/workflows/frontend_build_tests.yml

@@ -10,10 +10,9 @@ on:
     paths:
       - 'driver/js/packages/**'
       - 'driver/js/examples/hippy-*-demo/**'
-      - 'driver/js/core/js/**/*.js'
+      - 'driver/js/lib/**/*.js'
       - 'driver/js/scripts/**/*.js'
       - 'package*.json'
-      - 'scripts/**/*.js'
 defaults:
   run:
     working-directory: driver/js

.github/workflows/frontend_build_tests_bypass.yml

@@ -10,10 +10,9 @@ on:
     paths-ignore:
       - 'driver/js/packages/**'
       - 'driver/js/examples/hippy-*-demo/**'
-      - 'driver/js/core/js/**/*.js'
+      - 'driver/js/lib/**/*.js'
       - 'driver/js/scripts/**/*.js'
       - 'package*.json'
-      - 'scripts/**/*.js'
 jobs:
   frontend_build_tests:
     runs-on: ubuntu-latest

.github/workflows/ios_build_tests.yml

@@ -8,8 +8,11 @@ on:
       - v3.0-dev
       - v3.0
     paths:
-      - 'driver/js/ios/**'
-      - 'driver/js/core/**'
+      - 'framework/ios/**'
+      - 'driver/js/lib/**'
+      - 'driver/js/src/**'
+      - 'driver/js/include/**'
+      - 'driver/js/CMakeLists.txt'
       - 'dom/**'
       - 'layout/engine/**'
       - 'modules/ios/**'
@@ -28,4 +31,4 @@ jobs:
           lfs: true
       - name: Build
         run: |
-          pushd driver/js/examples/ios-demo && pod install && xcodebuild build -destination 'name=iPhone 11' -scheme 'HippyDemo' -workspace 'HippyDemo.xcworkspace' && popd
+          pushd framework/examples/ios-demo && pod install && xcodebuild build -destination 'name=iPhone 11' -scheme 'HippyDemo' -workspace 'HippyDemo.xcworkspace' && popd

.github/workflows/ios_build_tests_bypass.yml

@@ -8,8 +8,11 @@ on:
       - v3.0-dev
       - v3.0
     paths-ignore:
-      - 'driver/js/ios/**'
-      - 'driver/js/core/**'
+      - 'framework/ios/**'
+      - 'driver/js/lib/**'
+      - 'driver/js/src/**'
+      - 'driver/js/include/**'
+      - 'driver/js/CMakeLists.txt'
       - 'dom/**'
       - 'layout/engine/**'
       - 'modules/ios/**'

.github/workflows/security_codeql_analyses.yml

@@ -96,7 +96,7 @@ jobs:
     - name: Build C++
       if: steps.detect_languages.outputs.language == 'cpp'
       run: |
-        ./gradlew hippy-driver::buildCMakeRelease
+        ./gradlew hippy-framework::buildCMakeRelease
     - name: Perform CodeQL Analysis
       if: steps.detect_languages.outputs.language
       uses: github/codeql-action/analyze@v2

.gitignore

@@ -22,28 +22,28 @@ layout/cproject
 layout/.project
 layout/.settings
 
-driver/js/android/maven-auth.properties
-driver/js/android/local.properties
-driver/js/android/.cxx/*
-driver/js/android/libs/armeabi-v7a/libhippybridge.so
-driver/js/android/libs/arm64-v8a/libhippybridge.so
-driver/js/android/libs/x86/libhippybridge.so
-driver/js/android/libs/x86_64/libhippybridge.so
-driver/js/android/cmake-build-debug/*
-driver/js/android/src/main/jni/.vs
-driver/js/android/src/main/jni/cmake-build-debug/*
+framework/android/maven-auth.properties
+framework/android/local.properties
+framework/android/.cxx/*
+framework/android/libs/armeabi-v7a/libhippybridge.so
+framework/android/libs/arm64-v8a/libhippybridge.so
+framework/android/libs/x86/libhippybridge.so
+framework/android/libs/x86_64/libhippybridge.so
+framework/android/cmake-build-debug/*
+framework/android/src/main/jni/.vs
+framework/android/src/main/jni/cmake-build-debug/*
 
-driver/js/examples/*/res/vendor-manifest.json
-driver/js/examples/android-demo/src/main/assets/
-driver/js/examples/android-demo/libs/*
-driver/js/examples/android-demo/maven-auth.properties
-driver/js/examples/android-demo/.cxx/
-driver/js/examples/ios-demo/HippyDemo.xcodeproj/project.xcworkspace/xcuserdata/*
-driver/js/examples/ios-demo/HippyDemo.xcodeproj/xcuserdata/*
-driver/js/examples/ios-demo/HippyDemo.xcworkspace/*
-driver/js/examples/ios-demo/Pods/*
-driver/js/examples/ios-demo/Podfile.lock
-driver/js/examples/ios-demo/devtools_backend/*
+framework/examples/*/res/vendor-manifest.json
+framework/examples/android-demo/src/main/assets/
+framework/examples/android-demo/libs/*
+framework/examples/android-demo/maven-auth.properties
+framework/examples/android-demo/.cxx/
+framework/examples/ios-demo/HippyDemo.xcodeproj/project.xcworkspace/xcuserdata/*
+framework/examples/ios-demo/HippyDemo.xcodeproj/xcuserdata/*
+framework/examples/ios-demo/HippyDemo.xcworkspace/*
+framework/examples/ios-demo/Pods/*
+framework/examples/ios-demo/Podfile.lock
+framework/examples/ios-demo/devtools_backend/*
 
 driver/js/packages/hippy-vue-loader/remote-debug-profile/*
 

README.md

@@ -62,9 +62,9 @@ For iOS, we recommend to use iOS simulator when first try. However, you can chan
 
 3. Choose a demo to build with `npm run buildexample [hippy-react-demo|hippy-vue-demo]`.
 
-4. Install CocoaPods with `brew install cocoapods`, install cmake with `brew install cmake`, and then configure CocoaPods dependencies with `pod install` at `driver/js/examples/ios-demo` directory.
+4. Install CocoaPods with `brew install cocoapods`, install cmake with `brew install cmake`, and then configure CocoaPods dependencies with `pod install` at `framework/examples/ios-demo` directory.
 
-5. Start the Xcode and build the iOS app with `open driver/js/examples/ios-demo/HippyDemo.xcworkspace`.
+5. Start the Xcode and build the iOS app with `open framework/examples/ios-demo/HippyDemo.xcworkspace`.
 
 > If `Step 2` throw error, you can `cd` to `driver/js/examples` hippy-react-demo or hippy-vue-demo, and run `npm install --legacy-peer-deps` to install demo dependencies first.
 >

build.gradle

@@ -32,9 +32,9 @@ task clean(type: Delete) {
 }
 
 project.afterEvaluate {
-    delete 'driver/js/examples/android-demo/src/main/assets'
+    delete 'framework/examples/android-demo/src/main/assets'
     copy{
-        from "driver/js/examples/android-demo/res"
-        into "driver/js/examples/android-demo/src/main/assets"
+        from "framework/examples/android-demo/res"
+        into "framework/examples/android-demo/src/main/assets"
     }
 }

buildconfig/cmake/GlobalPackagesModule.cmake

@@ -71,7 +71,7 @@ endfunction()
 
 function(GlobalPackages_Add_jni)
   if (NOT TARGET jni)
-    InfraPackage_Add(JNI
+    InfraPackage_Add(COMMON_JNI
             LOCAL "${PROJECT_ROOT_DIR}/modules/android/jni")
   endif()
 endfunction()

commitlint.config.js

@@ -1,3 +1,23 @@
+/*
+ * Tencent is pleased to support the open source community by making
+ * Hippy available.
+ *
+ * Copyright (C) 2017-2022 THL A29 Limited, a Tencent company.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /* eslint-disable no-control-regex */
 function asciiAndEmojiCheck(message) {
   const asciiAndEmojiReg = /^((\ud83c[\udf00-\udfff])|(\ud83d[\udc00-\ude4f\ude80-\udeff])|[\u2600-\u2B55]|[\x00-\xff])*$/i;

dom/CMakeLists.txt

@@ -40,11 +40,6 @@ GlobalPackages_Add(footstone)
 target_link_libraries(${PROJECT_NAME} PRIVATE footstone)
 # endregion
 
-# region core base
-# TODO: will be removed when the JNI library is complete
-target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_ROOT_DIR}/driver/js/core/include)
-# endregion
-
 # region layout engine
 if (NOT DEFINED LAYOUT_ENGINE)
   set(LAYOUT_ENGINE "Taitank")

driver/js/.eslintignore

@@ -1,5 +1,4 @@
 node_modules*
-docs/
 dist/
 coverage
 packages/hippy-vue/types

driver/js/.eslintrc.js

@@ -1,3 +1,23 @@
+/*
+ * Tencent is pleased to support the open source community by making
+ * Hippy available.
+ *
+ * Copyright (C) 2017-2022 THL A29 Limited, a Tencent company.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 const path = require('path');
 
 function resolveVue(p) {

driver/js/core/CMakeLists.txt → driver/js/CMakeLists.txt

@@ -20,9 +20,9 @@
 
 cmake_minimum_required(VERSION 3.14)
 
-project("core")
+project("js_driver")
 
-get_filename_component(PROJECT_ROOT_DIR "${PROJECT_SOURCE_DIR}/../../.." REALPATH)
+get_filename_component(PROJECT_ROOT_DIR "${PROJECT_SOURCE_DIR}/../.." REALPATH)
 
 include("${PROJECT_ROOT_DIR}/buildconfig/cmake/GlobalPackagesModule.cmake")
 include("${PROJECT_ROOT_DIR}/buildconfig/cmake/compiler_toolchain.cmake")
@@ -38,6 +38,9 @@ target_link_libraries(${PROJECT_NAME} PRIVATE android log)
 if (ENABLE_INSPECTOR)
   target_compile_definitions(${PROJECT_NAME} PUBLIC "ENABLE_INSPECTOR")
 endif ()
+if (ENABLE_TURBO)
+  target_compile_definitions(${PROJECT_NAME} PUBLIC "ENABLE_TURBO")
+endif ()
 # endregion
 
 # region vm
@@ -61,16 +64,6 @@ GlobalPackages_Add(footstone)
 target_link_libraries(${PROJECT_NAME} PRIVATE footstone)
 # endregion
 
-# region jni
-GlobalPackages_Add(jni)
-target_link_libraries(${PROJECT_NAME} PRIVATE jni)
-# endregion
-
-# region jni common
-# TODO: will be removed when the JNI library is complete
-target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_ROOT_DIR}/driver/js/android/src/main/jni/include)
-# endregion
-
 # region devtools
 if (ENABLE_INSPECTOR)
   add_subdirectory(${PROJECT_ROOT_DIR}/devtools/devtools-backend ${CMAKE_CURRENT_BINARY_DIR}/devtools/devtools-backend)
@@ -79,13 +72,8 @@ endif ()
 # endregion
 
 # region dom
-add_subdirectory(${PROJECT_ROOT_DIR}/dom ${CMAKE_CURRENT_BINARY_DIR}/dom)
-target_link_libraries(${PROJECT_NAME} PUBLIC dom)
-# endregion
-
-# region native renderer
-add_subdirectory(${PROJECT_ROOT_DIR}/renderer/native/android/src/main/jni ${CMAKE_CURRENT_BINARY_DIR}/renderer/native)
-target_link_libraries(${PROJECT_NAME} PUBLIC native_renderer)
+GlobalPackages_Add(dom)
+target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_ROOT_DIR}/dom/include)
 # endregion
 
 # region source set