Merge branch 'main' into fix/components-removal

flexn-io · Oct 6, 2023 · 5777652 · 5777652
2 parents 0857d47 + da1c08a
commit 5777652
Show file tree

Hide file tree

Showing 20 changed files with 71 additions and 23 deletions.
diff --git a/.github/workflows/e2e-harness-android.yml b/.github/workflows/e2e-harness-android.yml
@@ -12,12 +12,16 @@ on:
     #     paths-ignore:
     #         - 'docs/**'
     #         - '**/README.md'
+    #         - '**/lerna.json'
+    #         - '**/metadata.json'
+    #         - '**/renative.json'
+    #         - '**/package.json'
     # pull_request:
     #     types: [labeled]
 
 jobs:
     e2e-harness-android:
-        if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')) || github.event.label.name == 'e2e-harness-android' || github.event.label.name == 'e2e' }}
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-android' || github.event.label.name == 'e2e' }}
         runs-on: [self-hosted, macos, intel]
         steps:
             - uses: actions/checkout@v2

diff --git a/.github/workflows/e2e-harness-androidtv.yml b/.github/workflows/e2e-harness-androidtv.yml
@@ -12,12 +12,16 @@ on:
         paths-ignore:
             - 'docs/**'
             - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
     pull_request:
         types: [labeled]
 
 jobs:
     e2e-harness-androidtv:
-        if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')) || github.event.label.name == 'e2e-harness-androidtv' || github.event.label.name == 'e2e' }}
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-androidtv' || github.event.label.name == 'e2e' }}
         runs-on: [self-hosted, macos, intel]
         steps:
             - uses: actions/checkout@v2

diff --git a/.github/workflows/e2e-harness-ios.yml b/.github/workflows/e2e-harness-ios.yml
@@ -12,12 +12,16 @@ on:
     #     paths-ignore:
     #         - 'docs/**'
     #         - '**/README.md'
+    #         - '**/lerna.json'
+    #         - '**/metadata.json'
+    #         - '**/renative.json'
+    #         - '**/package.json'
     # pull_request:
     #     types: [labeled]
 
 jobs:
     e2e-harness-ios:
-        if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')) || github.event.label.name == 'e2e-harness-ios' || github.event.label.name == 'e2e' }}
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-ios' || github.event.label.name == 'e2e' }}
         runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2

diff --git a/.github/workflows/e2e-harness-macos.yml b/.github/workflows/e2e-harness-macos.yml
@@ -12,12 +12,16 @@ on:
     #     paths-ignore:
     #         - 'docs/**'
     #         - '**/README.md'
+    #         - '**/lerna.json'
+    #         - '**/metadata.json'
+    #         - '**/renative.json'
+    #         - '**/package.json'
     # pull_request:
     #     types: [labeled]
 
 jobs:
     e2e-harness-macos:
-        if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')) || github.event.label.name == 'e2e-harness-macos' || github.event.label.name == 'e2e' }}
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-macos' || github.event.label.name == 'e2e' }}
         runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2

diff --git a/.github/workflows/e2e-harness-tvos.yml b/.github/workflows/e2e-harness-tvos.yml
@@ -12,12 +12,16 @@ on:
         paths-ignore:
             - 'docs/**'
             - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
     pull_request:
         types: [labeled]
 
 jobs:
     e2e-harness-tvos:
-        if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')) || github.event.label.name == 'e2e-harness-tvos' || github.event.label.name == 'e2e' }}
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-tvos' || github.event.label.name == 'e2e' }}
         runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2

diff --git a/.github/workflows/e2e-harness-web.yml b/.github/workflows/e2e-harness-web.yml
@@ -12,12 +12,16 @@ on:
     #     paths-ignore:
     #         - 'docs/**'
     #         - '**/README.md'
+    #         - '**/lerna.json'
+    #         - '**/metadata.json'
+    #         - '**/renative.json'
+    #         - '**/package.json'
     # pull_request:
     #     types: [labeled]
 
 jobs:
     e2e-harness-web:
-        if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')) || github.event.label.name == 'e2e-harness-web' || github.event.label.name == 'e2e' }}
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-web' || github.event.label.name == 'e2e' }}
         runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2

diff --git a/.github/workflows/e2e-template-android.yml b/.github/workflows/e2e-template-android.yml
@@ -12,12 +12,16 @@ on:
         paths-ignore:
             - 'docs/**'
             - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
     pull_request:
         types: [labeled]
 
 jobs:
     e2e-template-android:
-        if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')) || github.event.label.name == 'e2e-template-android' || github.event.label.name == 'e2e' }}
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-android' || github.event.label.name == 'e2e' }}
         runs-on: [self-hosted, macos, intel]
         steps:
             - uses: actions/checkout@v2

diff --git a/.github/workflows/e2e-template-androidtv.yml b/.github/workflows/e2e-template-androidtv.yml
@@ -12,12 +12,16 @@ on:
         paths-ignore:
             - 'docs/**'
             - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
     pull_request:
         types: [labeled]
 
 jobs:
     e2e-template-androidtv:
-        if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')) || github.event.label.name == 'e2e-template-androidtv' || github.event.label.name == 'e2e' }}
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-androidtv' || github.event.label.name == 'e2e' }}
         runs-on: [self-hosted, macos, intel]
         steps:
             - uses: actions/checkout@v2

diff --git a/.github/workflows/e2e-template-ios.yml b/.github/workflows/e2e-template-ios.yml
@@ -12,12 +12,16 @@ on:
         paths-ignore:
             - 'docs/**'
             - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
     pull_request:
         types: [labeled]
 
 jobs:
     e2e-template-ios:
-        if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')) || github.event.label.name == 'e2e-template-ios' || github.event.label.name == 'e2e' }}
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-ios' || github.event.label.name == 'e2e' }}
         runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2

diff --git a/.github/workflows/e2e-template-macos.yml b/.github/workflows/e2e-template-macos.yml
@@ -12,12 +12,16 @@ on:
         paths-ignore:
             - 'docs/**'
             - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
     pull_request:
         types: [labeled]
 
 jobs:
     e2e-template-macos:
-        if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')) || github.event.label.name == 'e2e-template-macos' || github.event.label.name == 'e2e' }}
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-macos' || github.event.label.name == 'e2e' }}
         runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2

diff --git a/.github/workflows/e2e-template-tvos.yml b/.github/workflows/e2e-template-tvos.yml
@@ -12,12 +12,16 @@ on:
         paths-ignore:
             - 'docs/**'
             - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
     pull_request:
         types: [labeled]
 
 jobs:
     e2e-template-tvos:
-        if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')) || github.event.label.name == 'e2e-template-tvos' || github.event.label.name == 'e2e' }}
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-tvos' || github.event.label.name == 'e2e' }}
         runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2

diff --git a/.github/workflows/e2e-template-web.yml b/.github/workflows/e2e-template-web.yml
@@ -12,12 +12,16 @@ on:
         paths-ignore:
             - 'docs/**'
             - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
     pull_request:
         types: [labeled]
 
 jobs:
     e2e-template-web:
-        if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')) || github.event.label.name == 'e2e-template-web' || github.event.label.name == 'e2e'}}
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-web' || github.event.label.name == 'e2e'}}
         runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0",
+  "version": "1.2.1",
   "packages": [
     "packages/*"
   ],

diff --git a/packages/app-harness/metadata.json b/packages/app-harness/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "app-harness",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "identifier": "io.flexn.app.harness",
     "icon": "./static/icon.png"
 }
diff --git a/packages/app-harness/package.json b/packages/app-harness/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@flexn/app-harness",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "scripts": {
         "bootstrap": "cd ../.. && yarn bootstrap",
         "build": "yarn clean && yarn compile",
@@ -45,7 +45,7 @@
         "web:release": "npx rnv build -p web -c harness -s release && vercel ./platformBuilds/harness_web/project"
     },
     "dependencies": {
-        "@flexn/create": "1.2.0",
+        "@flexn/create": "1.2.1",
         "@flexn/fonts": "1.0.1",
         "@flexn/graybox": "1.0.0",
         "@flexn/recyclerlistview": "4.2.7",
@@ -90,7 +90,7 @@
         "tslib": "2.5.2"
     },
     "devDependencies": {
-        "@flexn/create-template-starter": "1.2.0",
+        "@flexn/create-template-starter": "1.2.1",
         "@flexn/plugins": "1.0.9",
         "@lightningjs/cli": "2.11.0",
         "@react-native-community/cli": "^6.0.0",

diff --git a/packages/app-harness/renative.json b/packages/app-harness/renative.json
@@ -23,7 +23,7 @@
     "projectName": "app-harness",
     "templates": {
         "@flexn/create-template-starter": {
-            "version": "1.2.0"
+            "version": "1.2.1"
         }
     },
     "platforms": {

diff --git a/packages/create/package.json b/packages/create/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@flexn/create",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "description": "Flexn Create SDK",
     "main": "lib/index",
     "types": "lib/index",

diff --git a/packages/template-starter/metadata.json b/packages/template-starter/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "flexn-template",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "identifier": "io.flexn.template",
     "icon": "./static/icon.png"
 }
diff --git a/packages/template-starter/package.json b/packages/template-starter/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@flexn/create-template-starter",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "description": "Flexn Template",
     "keywords": [],
     "homepage": "https://github.com/flexn-io/create#readme",
@@ -69,7 +69,7 @@
     },
     "devDependencies": {
         "@flexn/assets-create-outline": "0.3.3",
-        "@flexn/create": "1.2.0",
+        "@flexn/create": "1.2.1",
         "@flexn/fonts": "1.0.1",
         "@flexn/graybox": "1.0.0",
         "@flexn/plugins": "1.0.9",

diff --git a/packages/template-starter/renative.json b/packages/template-starter/renative.json
@@ -47,7 +47,7 @@
     "plugins": {
         "@flexn/create": {
             "source": "flexn",
-            "version": "1.2.0"
+            "version": "1.2.1"
         },
         "@rnv/renative": {
             "source": "flexn",