Skip to content

Commit b59999d

Browse files
committed
Fixes dependencies
1 parent 1b1a863 commit b59999d

File tree

7 files changed

+253
-46
lines changed

7 files changed

+253
-46
lines changed

examples/calculator/index.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,4 @@ const styleSheet = `
271271
}
272272
`;
273273

274-
Renderer.render(<App />, () => {
275-
console.log("rendered");
276-
});
274+
Renderer.render(<App />);

package.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
22
"name": "@nodegui/react-desktop",
3-
"version": "1.0.0",
3+
"version": "0.0.5-alpha",
44
"description": "React Native for building cross platform desktop applications",
5-
"main": "dist",
5+
"main": "dist/src/index.js",
6+
"files": [
7+
"dist"
8+
],
69
"author": "Atul R <atulanand94@gmail.com>",
710
"private": false,
811
"license": "MIT",
@@ -12,19 +15,25 @@
1215
"dev:watch": "tsc-watch --onSuccess \"npm run dev\""
1316
},
1417
"dependencies": {
15-
"react": "^16.8.6",
1618
"react-reconciler": "^0.20.4"
1719
},
1820
"resolutions": {
1921
"react-devtools-core": "3.5.3",
2022
"react-devtools": "3.5.3"
2123
},
24+
"peerDependencies": {
25+
"@nodegui/nodegui": "*",
26+
"@nodegui/test": "*",
27+
"react": "*"
28+
},
2229
"devDependencies": {
30+
"@nodegui/nodegui": "^0.0.4-alpha",
2331
"@nodegui/test": "^0.0.10",
2432
"@types/node": "^12.0.10",
2533
"@types/react-reconciler": "^0.18.0",
2634
"@types/scheduler": "^0.12.1",
2735
"prettier": "^1.18.2",
36+
"react": "^16.8.6",
2837
"react-devtools": "3.5.3",
2938
"tsc-watch": "^2.2.1",
3039
"typescript": "^3.5.2"

src/demo.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,9 @@ const styleSheet = `
268268
}
269269
`;
270270

271-
Renderer.render(<App />, () => {
272-
console.log("rendered");
271+
Renderer.render(<App />, {
272+
onRender: () => {
273+
console.log("Yo");
274+
},
275+
enableDevtools: false
273276
});

src/renderer/index.ts

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,35 @@
11
import reconciler, { appContainer } from "../reconciler";
22
import { initDevtools } from "../utils/devtools";
33

4+
type Options = {
5+
enableDevtools?: boolean;
6+
onRender?: () => void;
7+
};
8+
const defaultOptions = {
9+
enableDevtools: false,
10+
onRender: () => {}
11+
};
12+
413
export const Renderer = {
5-
render(element: React.ReactNode, callback: () => void) {
6-
// element: This is the react element for App component
7-
// window: This is the container that will contain the app.
8-
// callback: if specified will be called after render is done.
14+
render(element: React.ReactNode, options?: Options) {
915
const containerInfo = appContainer;
1016
const isConcurrent = false; //disabling since there seems to be a bug with onclick listeneres (when called without a console.log inside them)
1117
const hydrate = false;
1218

19+
const rendererOptions = Object.assign({}, defaultOptions, options);
20+
1321
const container = reconciler.createContainer(
1422
containerInfo,
1523
isConcurrent,
1624
hydrate
1725
); // Creates root fiber node.
1826

19-
initDevtools(reconciler); //TODO: Do it on dev mode only
27+
if (rendererOptions.enableDevtools) {
28+
initDevtools(reconciler);
29+
}
2030
const parentComponent = null; // Since there is no parent (since this is the root fiber). We set parentComponent to null.
2131
reconciler.updateContainer(element, container, parentComponent, () => {
22-
callback();
32+
rendererOptions.onRender();
2333
}); // Start reconcilation and render the result
2434
}
2535
};

src/utils/devtools.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import pkg from "../../package.json";
1+
// import pkg from "../../package.json";
22
import Reconciler from "../reconciler";
33

44
export const initDevtools = (reconciler: typeof Reconciler) => {
@@ -19,8 +19,8 @@ export const initDevtools = (reconciler: typeof Reconciler) => {
1919
});
2020
reconciler.injectIntoDevTools({
2121
bundleType: 1,
22-
version: pkg.version,
23-
rendererPackageName: pkg.name
22+
version: "1", //pkg.version,
23+
rendererPackageName: "@nodegui/react-desktop" //pkg.name
2424
});
2525
}
2626
};

tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@
5858
/* Experimental Options */
5959
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
6060
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
61-
"resolveJsonModule": true,
62-
"types": ["node"]
61+
"resolveJsonModule": true
6362
},
6463
"include": ["."]
6564
}

0 commit comments

Comments
 (0)