Update web launch script (#384)

Picovoice · Aug 20, 2024 · d7c6828 · d7c6828
1 parent f8a2562
commit d7c6828
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 17 deletions.
diff --git a/.github/workflows/react-demos.yml b/.github/workflows/react-demos.yml
@@ -21,11 +21,12 @@ defaults:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        node-version: [ 16.x, 18.x, 20.x ]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/demo/react-native/ios/Podfile b/demo/react-native/ios/Podfile
@@ -8,3 +8,11 @@ target 'LeopardDemo' do
   pod 'Leopard-iOS', '~> 2.0.1'
   use_react_native!(:path => config["reactNativePath"])
 end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION']
+    end
+  end
+end
diff --git a/demo/react-native/ios/Podfile.lock b/demo/react-native/ios/Podfile.lock
@@ -13,8 +13,8 @@ PODS:
   - glog (0.3.5)
   - ios-voice-processor (1.1.0)
   - Leopard-iOS (2.0.1)
-  - leopard-react-native (2.0.0):
-    - Leopard-iOS (~> 2.0.0)
+  - leopard-react-native (2.0.2):
+    - Leopard-iOS (~> 2.0.1)
     - React
   - RCT-Folly (2021.06.28.00-v2):
     - boost
@@ -223,7 +223,7 @@ PODS:
   - React-jsinspector (0.68.7)
   - React-logger (0.68.7):
     - glog
-  - react-native-voice-processor (1.2.0):
+  - react-native-voice-processor (1.2.2):
     - ios-voice-processor (~> 1.1.0)
     - React-Core
   - React-perflogger (0.68.7)
@@ -424,7 +424,7 @@ SPEC CHECKSUMS:
   glog: 476ee3e89abb49e07f822b48323c51c57124b572
   ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1
   Leopard-iOS: 8c94dcf886800b4ed361c1c6af763780ef16f722
-  leopard-react-native: b49c92e652221204b081795393f208e994030d95
+  leopard-react-native: 46a409dd56972001d19a017e3261beaeb7c2b0b9
   RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
   RCTRequired: 530916cd48c5f7cf1fc16966ad5ea01638ca4799
   RCTTypeSafety: 5fb4cb3080efd582e5563c3e9a0e459fc51396c5
@@ -438,7 +438,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: 7c0bd030a84f2ec446fb104b7735af2f5ed11eea
   React-jsinspector: cab4d37ebde480f84c79ac89568abbf76b916c3e
   React-logger: b75b80500ea80457b2cf169427d66de986cdcb29
-  react-native-voice-processor: aefb0845641c7d67dd47e69606ba7ebb38aab5cd
+  react-native-voice-processor: 6f8e5236d1a370be02aa87da8e34aa26506678df
   React-perflogger: 44436b315d757100a53dfb1ab6b77c58cb646d7d
   React-RCTActionSheet: 1888a229684762c40cc96c7ff4716f809655dc09
   React-RCTAnimation: f05da175751867521d14b02ab4d3994a7b96f131
@@ -455,6 +455,6 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   Yoga: 0bc4b37c3b8a345336ff601e2cf7d9704bab7e93
 
-PODFILE CHECKSUM: 33ee1b875e6a796a6ef55a5834330ed61208a9f4
+PODFILE CHECKSUM: 480cef90cd539a1a880dfa4dd4ad9ba2e4bbb913
 
 COCOAPODS: 1.11.3
diff --git a/demo/react-native/scripts/run_demo.js b/demo/react-native/scripts/run_demo.js
@@ -5,7 +5,7 @@ const testData = require('../../../resources/.test/test_data.json');
 
 const availableLanguages = testData.tests.language_tests.map((x) => x.language);
 
-const commands = process.argv.slice(2, -1);
+const args = process.argv.slice(2, -1);
 const language = process.argv.slice(-1)[0];
 
 if (!availableLanguages.includes(language)) {
@@ -63,6 +63,7 @@ fs.writeFileSync(
 
 const command = process.platform === 'win32' ? 'npx.cmd' : 'npx';
 
-child_process.fork('react-native', commands, {
-  execPath: command,
+child_process.execSync(`${command} react-native ${args.join(' ')}`, {
+  shell: true,
+  stdio: 'inherit',
 });
diff --git a/demo/react-native/src/App.tsx b/demo/react-native/src/App.tsx
@@ -98,7 +98,7 @@ export default class App extends Component<Props, State> {
         `models/leopard_params${suffix}.pv`,
         {
           enableAutomaticPunctuation: true,
-          enableDiarization: true
+          enableDiarization: true,
         },
       );
     } catch (err: any) {

diff --git a/demo/react/scripts/run_demo.js b/demo/react/scripts/run_demo.js
@@ -7,7 +7,7 @@ const availableLanguages = testData["tests"]["language_tests"].map(
   (x) => x["language"]
 );
 
-const commands = process.argv.slice(2, -1);
+const args = process.argv.slice(2, -1);
 const language = process.argv.slice(-1)[0];
 if (!language) {
   console.error(
@@ -62,6 +62,7 @@ fs.writeFileSync(
 
 const command = process.platform === "win32" ? "npx.cmd" : "npx";
 
-child_process.fork("react-scripts", commands, {
-  execPath: command,
+child_process.execSync(`${command} react-scripts ${args.join(" ")}`, {
+  shell: true,
+  stdio: 'inherit'
 });
diff --git a/demo/web/scripts/run_demo.js b/demo/web/scripts/run_demo.js
@@ -58,6 +58,7 @@ fs.writeFileSync(
 
 const command = (process.platform === "win32") ? "npx.cmd" : "npx";
 
-child_process.fork("http-server", ["-a", "localhost", "-p", "5000"], {
-  execPath: command,
+child_process.execSync(`${command} http-server -a localhost -p 5000`, {
+  shell: true,
+  stdio: 'inherit'
 });