Skip to content

Commit 4a4091b

Browse files
committed
Renamed ubuntu-server.js to js-executor.js
1 parent 58ffa38 commit 4a4091b

File tree

17 files changed

+21
-21
lines changed

17 files changed

+21
-21
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ jobs:
9090
background: true
9191

9292
- type: shell
93-
name: Start react-native-desktop's ubuntu-server.js
94-
command: node ./ubuntu-server.js
93+
name: Start react-native-desktop's js-executor.js
94+
command: node ./js-executor.js
9595
background: true
9696

9797
- run:

Examples/2048/qml/run-example.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

3-
(node ${CMAKE_SOURCE_DIR}/ubuntu-server.js 2>&1 > /dev/null) &
3+
(node ${CMAKE_SOURCE_DIR}/js-executor.js 2>&1 > /dev/null) &
44
qmlscene -I ${CMAKE_BINARY_DIR}/ReactQt/runtime/src/ ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE_NAME}.qml
55

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

3-
(node ${CMAKE_SOURCE_DIR}/ubuntu-server.js) &
3+
(node ${CMAKE_SOURCE_DIR}/js-executor.js) &
44
qmlscene -I ${CMAKE_BINARY_DIR}/ReactQt/runtime/src/ ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE_NAME}.qml
55

Examples/Movies/qml/run-example.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

3-
(node ${CMAKE_SOURCE_DIR}/ubuntu-server.js 2>&1 > /dev/null) &
3+
(node ${CMAKE_SOURCE_DIR}/js-executor.js 2>&1 > /dev/null) &
44
qmlscene -I ${CMAKE_BINARY_DIR}/ReactQt/runtime/src/ ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE_NAME}.qml
55

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

3-
(node ${CMAKE_SOURCE_DIR}/ubuntu-server.js 2>&1 > /dev/null) &
3+
(node ${CMAKE_SOURCE_DIR}/js-executor.js 2>&1 > /dev/null) &
44
qmlscene -I ${CMAKE_BINARY_DIR}/ReactQt/runtime/src/ ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE_NAME}.qml
55

Examples/run-example.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

3-
(node ${CMAKE_SOURCE_DIR}/ubuntu-server.js) &
3+
(node ${CMAKE_SOURCE_DIR}/js-executor.js) &
44
qmlscene -I ${CMAKE_BINARY_DIR}/ReactQt/runtime/src/ ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE_NAME}.qml
55

RNTester/qml/run-example.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

3-
(node ${CMAKE_SOURCE_DIR}/ubuntu-server.js) &
3+
(node ${CMAKE_SOURCE_DIR}/js-executor.js) &
44
qmlscene -I ${CMAKE_BINARY_DIR}/ReactQt/runtime/src/ ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE_NAME}.qml
55

ReactQt/runtime/src/communication/serverconnection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
namespace {
1818
QString default_executable{"node"};
19-
QString default_script{"ubuntu-server.js"};
19+
QString default_script{"js-executor.js"};
2020
QStringList default_arguments{"--pipe"};
2121

2222
QString itemWithPath(const QString& item, const QStringList& searchPaths) {

docs/ContributorEnvSetup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ To do this execute following commands in different terminals:
6666
npm start #starts bundler
6767
```
6868
```sh
69-
node ubuntu-server.js #starts js server
69+
node js-executor.js #starts js server
7070
```
7171

7272
Like you do when [run your new app](CreateNewApp.md#run-the-project)

docs/CreateNewApp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ If you're using macOS, run these commands in 2 different shells (from `DesktopSa
3737
npm start #starts bundler
3838
```
3939
```sh
40-
node node_modules/react-native/ubuntu-server.js #starts js server
40+
node node_modules/react-native/js-executor.js #starts js server
4141
```
4242

4343
Afterwards, in a 3rd shell execute:
@@ -48,7 +48,7 @@ Compilation of desktop project will start. When it finished and app run you can
4848

4949
![](./media/react-native-desktop-new-app.png)
5050

51-
**Note:** On non-macOS systems, `npm start` and `node ubuntu-server.js` will be executed automatically by the above command(`react-native run-desktop`)
51+
**Note:** On non-macOS systems, `npm start` and `node js-executor.js` will be executed automatically by the above command(`react-native run-desktop`)
5252

5353

5454
**If you want to know why you had to start bundler and js server** - check the doc on [how react-native-desktop works internally](./HowRNDesktopAppWorks.md)

docs/FAQ.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ It was forked from Canonical/react-native-linux. Canonical in its turn forked fa
2525

2626
### Does the bundler step in the diagram only happen once at app startup or is all of the JS code appended to a single file on every reload?
2727

28-
On every reload Qt app requests single js files and sends it to execution in ubuntu-server. It is like restart, but quicker. Bundler caches that js file, so collecting it together doesn’t take much time.
28+
On every reload Qt app requests single js files and sends it to execution in js-executor. It is like restart, but quicker. Bundler caches that js file, so collecting it together doesn’t take much time.
2929

3030
### Is there a dedicated node mule within react-native for communicating with qt at the javascript code level or does that happen elsewhere, say, in the build pipeline?
3131

3232
No. React-native is designed to have own js part and communication with native part.
3333
Qt code in react-native-desktop contains a bunch of modules that implement controls and API’s natively.
3434
When Qt Application starts it sends `config` - information about what modules it implements on native side - their names, ids, lists of functions, constants, etc. From this moment react-native part of js code can “invoke” that native methods just by mentioning them in JSON results.
3535

36-
Here is an example communication between Qt app and ubuntu-server. In the app there is a button that changes color when pressed.
36+
Here is an example communication between Qt app and js-executor. In the app there is a button that changes color when pressed.
3737

3838
When user clicks button, we send following code line for execution in Js:
3939
`__fbBatchedBridge.callFunctionReturnFlushedQueue(\"RCTEventEmitter\",\"receiveEvent\",[2,\"topPress\",{}]);`

docs/HowRNDesktopAppWorks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ When you create a project with `react-native init SomeProject`, you have ios and
1313
There are 3 participants in react-native-desktop application:
1414
- Qt application
1515
- Bundler
16-
- JS server (right now called ubuntu-server, but this is subject to change)
16+
- JS server (right now called js-executor, but this is subject to change)
1717

1818
`Qt application` - built from a project in `desktop` folder. When runs it establishes communication with JS server and shows appropriate UI.
1919

docs/InspectJs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
1) Run js server with `--inspect` switch:
1010
```sh
11-
node --inspect ubuntu-server.js
11+
node --inspect js-executor.js
1212
```
1313

1414
2) Run your `react-native-desktop` application
1515

1616
3) Open `chrome://inspect` page in a Chrome browser
1717
![](media/devtools-inspect-target.png)
1818

19-
4) Click on `inspect` link near `ubuntu-server.js` Target
19+
4) Click on `inspect` link near `js-executor.js` Target
2020

2121
5) Chrome devtools will open where you can see console output of your application and debug it.
2222

File renamed without changes.

local-cli/generator-desktop/templates/run-app.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fi
5252
# For net case, try and run executor; it is probably OK if this fails - it's
5353
# just running elsewhere
5454
if [[ "$executor" == "ReactNetExecutor" ]]; then
55-
(node @CMAKE_BINARY_DIR@/bin/ubuntu-server.js 2>&1 > /dev/null) &
55+
(node @CMAKE_BINARY_DIR@/bin/js-executor.js 2>&1 > /dev/null) &
5656
fi
5757

5858
# if [[ $on_device == 1 ]]; then

local-cli/runDesktop/packageDesktop.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ function _copyBinaries(args, packagePath, resolve, reject) {
110110
console.log(chalk.bold('Copying app binaries...'));
111111
const binDestPath = path.join(packagePath, 'bin');
112112
mkdirp.sync(binDestPath);
113-
child_process.exec('cp -uR ' + path.join(args.root, 'desktop/bin/ubuntu-server.js ') + binDestPath + ' || true',
113+
child_process.exec('cp -uR ' + path.join(args.root, 'desktop/bin/js-executor.js ') + binDestPath + ' || true',
114114
{}, (error, stdout, stderr) => {
115115
if (error)
116116
reject(error);

local-cli/runDesktop/runDesktop.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ function startPackagerInNewWindow() {
9999

100100
function startUbuntuServerInNewWindow() {
101101
if (process.platform === "win32") {
102-
child_process.spawn('cmd', ['/c', 'node ./desktop/bin/ubuntu-server.js'],{detached: true});
102+
child_process.spawn('cmd', ['/c', 'node ./desktop/bin/js-executor.js'],{detached: true});
103103
} else {
104-
child_process.spawn('gnome-terminal', ['-e', 'node ./desktop/bin/ubuntu-server.js'],{detached: true});
104+
child_process.spawn('gnome-terminal', ['-e', 'node ./desktop/bin/js-executor.js'],{detached: true});
105105
}
106106
}
107107

0 commit comments

Comments
 (0)