Skip to content

Commit 8a31f82

Browse files
jdnichollscjdnichollsc
authored
Merge pull request #56 from proyecto26/develop
fix: React wrapper + demo-react upgrade for Stencil v4
2 parents 38e2c9b + ba3132d commit 8a31f82

7 files changed

Lines changed: 55 additions & 50 deletions

File tree

‎demo-react/index.html‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<title>IonPhaser React Demo</title>
7+
</head>
8+
<body>
9+
<div id="root"></div>
10+
<script type="module" src="/src/index.tsx"></script>
11+
</body>
12+
</html>

‎demo-react/package.json‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,24 @@
22
"name": "demo-react",
33
"version": "0.1.0",
44
"private": true,
5+
"type": "module",
56
"dependencies": {
6-
"@ion-phaser/react": "^1.3.0",
7-
"@types/jest": "^25.2.1",
8-
"@types/node": "^13.13.4",
9-
"@types/react": "^16.9.34",
10-
"@types/react-dom": "^16.9.7",
11-
"phaser": "^3.53.1",
12-
"react": "^16.13.1",
13-
"react-dom": "^16.13.1",
14-
"react-scripts": "3.4.1",
15-
"typescript": "^4.0.0"
7+
"@ion-phaser/react": "file:./../react",
8+
"phaser": "^3.80.0",
9+
"react": "^18.3.0",
10+
"react-dom": "^18.3.0"
1611
},
17-
"scripts": {
18-
"start": "react-scripts start",
19-
"build": "react-scripts build",
20-
"test": "react-scripts test",
21-
"eject": "react-scripts eject"
22-
},
23-
"eslintConfig": {
24-
"extends": "react-app"
12+
"devDependencies": {
13+
"@types/react": "^18.3.0",
14+
"@types/react-dom": "^18.3.0",
15+
"@vitejs/plugin-react": "^4.3.0",
16+
"typescript": "^5.5.0",
17+
"vite": "^5.4.0"
2518
},
26-
"browserslist": [
27-
">0.2%",
28-
"not dead",
29-
"not ie <= 11",
30-
"not op_mini all"
31-
]
19+
"scripts": {
20+
"start": "vite",
21+
"dev": "vite",
22+
"build": "vite build",
23+
"preview": "vite preview"
24+
}
3225
}

‎demo-react/src/index.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React from 'react';
2-
import ReactDOM from 'react-dom';
2+
import { createRoot } from 'react-dom/client';
33
import './index.css';
44
import App from './App';
5-
import * as serviceWorker from './serviceWorker';
65

7-
ReactDOM.render(<App />, document.getElementById('root'));
8-
9-
// If you want your app to work offline and load faster, you can change
10-
// unregister() to register() below. Note this comes with some pitfalls.
11-
// Learn more about service workers: https://bit.ly/CRA-PWA
12-
serviceWorker.unregister();
6+
const container = document.getElementById('root');
7+
const root = createRoot(container!);
8+
root.render(
9+
<React.StrictMode>
10+
<App />
11+
</React.StrictMode>
12+
);

‎demo-react/tsconfig.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"target": "es5",
3+
"target": "ES2020",
44
"lib": [
55
"dom",
66
"dom.iterable",
@@ -17,7 +17,7 @@
1717
"resolveJsonModule": true,
1818
"isolatedModules": true,
1919
"noEmit": true,
20-
"jsx": "react"
20+
"jsx": "react-jsx"
2121
},
2222
"include": [
2323
"src"

‎demo-react/vite.config.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { defineConfig } from 'vite'
2+
import react from '@vitejs/plugin-react'
3+
4+
export default defineConfig({
5+
plugins: [react()],
6+
server: {
7+
port: 3000
8+
}
9+
})

‎react/package.json‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,11 @@
3939
"@stencil/react-output-target": "^0.7.1"
4040
},
4141
"devDependencies": {
42-
"@types/jest": "23.3.9",
43-
"@types/node": "13.13.0",
44-
"@types/react": "16.7.6",
45-
"@types/react-dom": "16.0.9",
46-
"@typescript-eslint/eslint-plugin": "^2.28.0",
47-
"@typescript-eslint/parser": "^2.28.0",
48-
"eslint": "^6.8.0",
49-
"eslint-plugin-react": "^7.19.0",
50-
"jest": "^25.4.0",
51-
"jest-dom": "^3.0.2",
52-
"react": "^16.7.0",
53-
"react-dom": "^16.7.0",
54-
"rollup": "^1.21.2",
55-
"rollup-plugin-node-resolve": "^5.2.0",
56-
"typescript": "^3.3.4000"
42+
"@types/react": "^18.3.0",
43+
"@types/react-dom": "^18.3.0",
44+
"react": "^18.3.0",
45+
"react-dom": "^18.3.0",
46+
"typescript": "~5.5.0"
5747
},
5848
"peerDependencies": {
5949
"react": ">=16.8.0",

‎react/tsconfig.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
"esModuleInterop": true,
99
"lib": ["dom", "es2015", "scripthost"],
1010
"module": "es2015",
11-
"moduleResolution": "node",
11+
"moduleResolution": "bundler",
1212
"noImplicitAny": true,
1313
"noImplicitReturns": true,
1414
"noUnusedLocals": true,
1515
"noUnusedParameters": true,
16+
"skipLibCheck": true,
1617
"outDir": "dist",
1718
"removeComments": false,
1819
"sourceMap": true,

0 commit comments

Comments
 (0)