From a51017e1b13f9be2e45c070be41fb3c35e7bc856 Mon Sep 17 00:00:00 2001 From: Ainvoner Date: Tue, 12 Mar 2024 19:47:58 +0200 Subject: [PATCH 1/7] chore: add react-vite template --- .../wing/react-vite/backend/broadcaster.w | 37 ++++++++++ .../wing/react-vite/backend/main.w | 36 ++++++++++ .../wing/react-vite/backend/package.json | 11 +++ .../wing/react-vite/frontend/.eslintrc.cjs | 18 +++++ .../wing/react-vite/frontend/.gitignore | 24 +++++++ .../wing/react-vite/frontend/README.md | 30 ++++++++ .../wing/react-vite/frontend/index.html | 13 ++++ .../wing/react-vite/frontend/package.json | 29 ++++++++ .../wing/react-vite/frontend/public/vite.svg | 1 + .../wing/react-vite/frontend/src/App.css | 42 ++++++++++++ .../wing/react-vite/frontend/src/App.tsx | 59 ++++++++++++++++ .../react-vite/frontend/src/assets/react.svg | 1 + .../wing/react-vite/frontend/src/index.css | 68 +++++++++++++++++++ .../wing/react-vite/frontend/src/main.tsx | 10 +++ .../react-vite/frontend/src/vite-env.d.ts | 1 + .../wing/react-vite/frontend/tsconfig.json | 25 +++++++ .../react-vite/frontend/tsconfig.node.json | 11 +++ .../wing/react-vite/frontend/vite.config.ts | 7 ++ .../wing/react-vite/package.json | 5 ++ 19 files changed, 428 insertions(+) create mode 100644 apps/wing/project-templates/wing/react-vite/backend/broadcaster.w create mode 100644 apps/wing/project-templates/wing/react-vite/backend/main.w create mode 100644 apps/wing/project-templates/wing/react-vite/backend/package.json create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/.eslintrc.cjs create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/.gitignore create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/README.md create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/index.html create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/package.json create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/public/vite.svg create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/src/App.css create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/src/App.tsx create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/src/assets/react.svg create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/src/index.css create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/src/main.tsx create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/src/vite-env.d.ts create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/tsconfig.json create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/tsconfig.node.json create mode 100644 apps/wing/project-templates/wing/react-vite/frontend/vite.config.ts create mode 100644 apps/wing/project-templates/wing/react-vite/package.json diff --git a/apps/wing/project-templates/wing/react-vite/backend/broadcaster.w b/apps/wing/project-templates/wing/react-vite/backend/broadcaster.w new file mode 100644 index 00000000000..794f1583d7b --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/backend/broadcaster.w @@ -0,0 +1,37 @@ +bring cloud; +bring websockets; +bring ui; + +pub class Broadcaster { + pub url: str; + server: websockets.WebSocket; + clients: cloud.Bucket; + + new() { + this.server = new websockets.WebSocket(name: "counter_updates") as "counter_updates"; + this.url = this.server.url; + this.clients = new cloud.Bucket(); + + // upon connection, add the client to the list + this.server.onConnect(inflight(id: str): void => { + this.clients.put(id, ""); + }); + + // upon disconnect, remove the client from the list + this.server.onDisconnect(inflight(id: str): void => { + this.clients.delete(id); + }); + + // Custom resource display in Console UI + // hide the websockets server and cloud bucket resources from the Console UI + nodeof(this.server).hidden = true; + nodeof(this.clients).hidden = true; + } + + // send a message to all clients + pub inflight broadcast(messgae: str) { + for id in this.clients.list() { + this.server.sendMessage(id, messgae); + } + } +} diff --git a/apps/wing/project-templates/wing/react-vite/backend/main.w b/apps/wing/project-templates/wing/react-vite/backend/main.w new file mode 100644 index 00000000000..01b30a8d72f --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/backend/main.w @@ -0,0 +1,36 @@ +bring cloud; +bring expect; +bring vite; +bring "./broadcaster.w" as broadcaster; + +let my_broadcaster = new broadcaster.Broadcaster() as "Broadcaster"; +let api = new cloud.Api(cors: true); +let counter = new cloud.Counter(); + +let my_vite = new vite.Vite( + root: "../frontend", + publicEnv: { + TITLE: "Wing + Vite + React", + API_URL: api.url, + WS_URL: my_broadcaster.url + } +) as "Vite"; + +api.get("/counter", inflight () => { + return { + body: "{counter.peek()}" + }; +}); + +api.post("/counter", inflight () => { + let prev = counter.inc(); + my_broadcaster.broadcast("refresh"); + return { + body: "{prev + 1}" + }; +}); + +test "broadcast counter increment" { + counter.inc(); + my_broadcaster.broadcast("refresh"); +} diff --git a/apps/wing/project-templates/wing/react-vite/backend/package.json b/apps/wing/project-templates/wing/react-vite/backend/package.json new file mode 100644 index 00000000000..fbafc0ca1a3 --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/backend/package.json @@ -0,0 +1,11 @@ +{ + "name": "my-wing-app", + "version": "0.0.0", + "description": "A description of my Wing application", + "author": "Your Name", + "license": "MIT", + "wing": true, + "dependencies": { + "@winglibs/vite": "^0.1.1" + } +} diff --git a/apps/wing/project-templates/wing/react-vite/frontend/.eslintrc.cjs b/apps/wing/project-templates/wing/react-vite/frontend/.eslintrc.cjs new file mode 100644 index 00000000000..d6c95379530 --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/.eslintrc.cjs @@ -0,0 +1,18 @@ +module.exports = { + root: true, + env: { browser: true, es2020: true }, + extends: [ + 'eslint:recommended', + 'plugin:@typescript-eslint/recommended', + 'plugin:react-hooks/recommended', + ], + ignorePatterns: ['dist', '.eslintrc.cjs'], + parser: '@typescript-eslint/parser', + plugins: ['react-refresh'], + rules: { + 'react-refresh/only-export-components': [ + 'warn', + { allowConstantExport: true }, + ], + }, +} diff --git a/apps/wing/project-templates/wing/react-vite/frontend/.gitignore b/apps/wing/project-templates/wing/react-vite/frontend/.gitignore new file mode 100644 index 00000000000..a547bf36d8d --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/.gitignore @@ -0,0 +1,24 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/apps/wing/project-templates/wing/react-vite/frontend/README.md b/apps/wing/project-templates/wing/react-vite/frontend/README.md new file mode 100644 index 00000000000..0d6babeddbd --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/README.md @@ -0,0 +1,30 @@ +# React + TypeScript + Vite + +This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules. + +Currently, two official plugins are available: + +- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh +- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh + +## Expanding the ESLint configuration + +If you are developing a production application, we recommend updating the configuration to enable type aware lint rules: + +- Configure the top-level `parserOptions` property like this: + +```js +export default { + // other rules... + parserOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + project: ['./tsconfig.json', './tsconfig.node.json'], + tsconfigRootDir: __dirname, + }, +} +``` + +- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked` +- Optionally add `plugin:@typescript-eslint/stylistic-type-checked` +- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list diff --git a/apps/wing/project-templates/wing/react-vite/frontend/index.html b/apps/wing/project-templates/wing/react-vite/frontend/index.html new file mode 100644 index 00000000000..e4b78eae123 --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/index.html @@ -0,0 +1,13 @@ + + + + + + + Vite + React + TS + + +
+ + + diff --git a/apps/wing/project-templates/wing/react-vite/frontend/package.json b/apps/wing/project-templates/wing/react-vite/frontend/package.json new file mode 100644 index 00000000000..7ee69d28788 --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/package.json @@ -0,0 +1,29 @@ +{ + "name": "frontend", + "private": true, + "version": "0.0.0", + "type": "module", + "scripts": { + "dev": "vite", + "build": "tsc && vite build", + "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", + "preview": "vite preview" + }, + "dependencies": { + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-use-websocket": "^4.7.0" + }, + "devDependencies": { + "@types/react": "^18.2.56", + "@types/react-dom": "^18.2.19", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", + "@vitejs/plugin-react": "^4.2.1", + "eslint": "^8.56.0", + "eslint-plugin-react-hooks": "^4.6.0", + "eslint-plugin-react-refresh": "^0.4.5", + "typescript": "^5.2.2", + "vite": "^5.1.4" + } +} diff --git a/apps/wing/project-templates/wing/react-vite/frontend/public/vite.svg b/apps/wing/project-templates/wing/react-vite/frontend/public/vite.svg new file mode 100644 index 00000000000..e7b8dfb1b2a --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/public/vite.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/wing/project-templates/wing/react-vite/frontend/src/App.css b/apps/wing/project-templates/wing/react-vite/frontend/src/App.css new file mode 100644 index 00000000000..b9d355df2a5 --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/src/App.css @@ -0,0 +1,42 @@ +#root { + max-width: 1280px; + margin: 0 auto; + padding: 2rem; + text-align: center; +} + +.logo { + height: 6em; + padding: 1.5em; + will-change: filter; + transition: filter 300ms; +} +.logo:hover { + filter: drop-shadow(0 0 2em #646cffaa); +} +.logo.react:hover { + filter: drop-shadow(0 0 2em #61dafbaa); +} + +@keyframes logo-spin { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } +} + +@media (prefers-reduced-motion: no-preference) { + a:nth-of-type(2) .logo { + animation: logo-spin infinite 20s linear; + } +} + +.card { + padding: 2em; +} + +.read-the-docs { + color: #888; +} diff --git a/apps/wing/project-templates/wing/react-vite/frontend/src/App.tsx b/apps/wing/project-templates/wing/react-vite/frontend/src/App.tsx new file mode 100644 index 00000000000..8d1132d6dcd --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/src/App.tsx @@ -0,0 +1,59 @@ +import { useState, useEffect } from 'react' +import reactLogo from './assets/react.svg' +import viteLogo from '/vite.svg' +import './App.css' +import useWebSocket from 'react-use-websocket'; + +const API_URL = window.wing.env.API_URL; +const WS_URL = window.wing.env.WS_URL; + +function App() { + const [count, setCount] = useState("0"); + const incrementCount = async () => { + const response = await fetch(`${API_URL}/counter`, { + method: "POST" + }); + setCount(await response.text()); + } + const updateCount = async () => { + const response = await fetch(`${API_URL}/counter`); + setCount(await response.text()); + } + + useWebSocket(WS_URL, { + onMessage: () => { + updateCount(); + } + }); + + useEffect(() => { + updateCount(); + }, []); + + return ( + <> +
+ + Vite logo + + + React logo + +
+

{window.wing.env.TITLE}

+
+ +

+ Edit src/App.tsx and save to test HMR +

+
+

+ Click on the Vite and React logos to learn more +

+ + ) +} + +export default App; diff --git a/apps/wing/project-templates/wing/react-vite/frontend/src/assets/react.svg b/apps/wing/project-templates/wing/react-vite/frontend/src/assets/react.svg new file mode 100644 index 00000000000..6c87de9bb33 --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/src/assets/react.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/wing/project-templates/wing/react-vite/frontend/src/index.css b/apps/wing/project-templates/wing/react-vite/frontend/src/index.css new file mode 100644 index 00000000000..6119ad9a8fa --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/src/index.css @@ -0,0 +1,68 @@ +:root { + font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif; + line-height: 1.5; + font-weight: 400; + + color-scheme: light dark; + color: rgba(255, 255, 255, 0.87); + background-color: #242424; + + font-synthesis: none; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +a { + font-weight: 500; + color: #646cff; + text-decoration: inherit; +} +a:hover { + color: #535bf2; +} + +body { + margin: 0; + display: flex; + place-items: center; + min-width: 320px; + min-height: 100vh; +} + +h1 { + font-size: 3.2em; + line-height: 1.1; +} + +button { + border-radius: 8px; + border: 1px solid transparent; + padding: 0.6em 1.2em; + font-size: 1em; + font-weight: 500; + font-family: inherit; + background-color: #1a1a1a; + cursor: pointer; + transition: border-color 0.25s; +} +button:hover { + border-color: #646cff; +} +button:focus, +button:focus-visible { + outline: 4px auto -webkit-focus-ring-color; +} + +@media (prefers-color-scheme: light) { + :root { + color: #213547; + background-color: #ffffff; + } + a:hover { + color: #747bff; + } + button { + background-color: #f9f9f9; + } +} diff --git a/apps/wing/project-templates/wing/react-vite/frontend/src/main.tsx b/apps/wing/project-templates/wing/react-vite/frontend/src/main.tsx new file mode 100644 index 00000000000..3d7150da80e --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/src/main.tsx @@ -0,0 +1,10 @@ +import React from 'react' +import ReactDOM from 'react-dom/client' +import App from './App.tsx' +import './index.css' + +ReactDOM.createRoot(document.getElementById('root')!).render( + + + , +) diff --git a/apps/wing/project-templates/wing/react-vite/frontend/src/vite-env.d.ts b/apps/wing/project-templates/wing/react-vite/frontend/src/vite-env.d.ts new file mode 100644 index 00000000000..11f02fe2a00 --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/src/vite-env.d.ts @@ -0,0 +1 @@ +/// diff --git a/apps/wing/project-templates/wing/react-vite/frontend/tsconfig.json b/apps/wing/project-templates/wing/react-vite/frontend/tsconfig.json new file mode 100644 index 00000000000..a7fc6fbf23d --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/tsconfig.json @@ -0,0 +1,25 @@ +{ + "compilerOptions": { + "target": "ES2020", + "useDefineForClassFields": true, + "lib": ["ES2020", "DOM", "DOM.Iterable"], + "module": "ESNext", + "skipLibCheck": true, + + /* Bundler mode */ + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "react-jsx", + + /* Linting */ + "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true + }, + "include": ["src"], + "references": [{ "path": "./tsconfig.node.json" }] +} diff --git a/apps/wing/project-templates/wing/react-vite/frontend/tsconfig.node.json b/apps/wing/project-templates/wing/react-vite/frontend/tsconfig.node.json new file mode 100644 index 00000000000..97ede7ee6f2 --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/tsconfig.node.json @@ -0,0 +1,11 @@ +{ + "compilerOptions": { + "composite": true, + "skipLibCheck": true, + "module": "ESNext", + "moduleResolution": "bundler", + "allowSyntheticDefaultImports": true, + "strict": true + }, + "include": ["vite.config.ts"] +} diff --git a/apps/wing/project-templates/wing/react-vite/frontend/vite.config.ts b/apps/wing/project-templates/wing/react-vite/frontend/vite.config.ts new file mode 100644 index 00000000000..5a33944a9b4 --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/frontend/vite.config.ts @@ -0,0 +1,7 @@ +import { defineConfig } from 'vite' +import react from '@vitejs/plugin-react' + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [react()], +}) diff --git a/apps/wing/project-templates/wing/react-vite/package.json b/apps/wing/project-templates/wing/react-vite/package.json new file mode 100644 index 00000000000..0466a535d8a --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "@winglibs/websockets": "^0.3.1" + } +} From 4d18b358f1b4a71d94033a189472d3fbb6ccada4 Mon Sep 17 00:00:00 2001 From: Ainvoner Date: Wed, 13 Mar 2024 10:43:58 +0200 Subject: [PATCH 2/7] update template --- .../project-templates/wing/react-vite/backend/main.w | 11 ++++++++--- .../project-templates/wing/react-vite/package.json | 10 +++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/apps/wing/project-templates/wing/react-vite/backend/main.w b/apps/wing/project-templates/wing/react-vite/backend/main.w index 01b30a8d72f..7ee85a38bf7 100644 --- a/apps/wing/project-templates/wing/react-vite/backend/main.w +++ b/apps/wing/project-templates/wing/react-vite/backend/main.w @@ -1,6 +1,7 @@ bring cloud; bring expect; bring vite; +bring http; bring "./broadcaster.w" as broadcaster; let my_broadcaster = new broadcaster.Broadcaster() as "Broadcaster"; @@ -30,7 +31,11 @@ api.post("/counter", inflight () => { }; }); -test "broadcast counter increment" { - counter.inc(); - my_broadcaster.broadcast("refresh"); +test "api counter increment and get" { + log("counter initial value: {counter.peek()}"); + assert(counter.peek() == 0); + http.post(api.url + "/counter"); + let res = http.get(api.url + "/counter"); + log("counter value after increment: {res.body}"); + assert(res.body == "1"); } diff --git a/apps/wing/project-templates/wing/react-vite/package.json b/apps/wing/project-templates/wing/react-vite/package.json index 0466a535d8a..3ef81049e77 100644 --- a/apps/wing/project-templates/wing/react-vite/package.json +++ b/apps/wing/project-templates/wing/react-vite/package.json @@ -1,5 +1,13 @@ { + "name": "my-app", + "version": "0.0.0", + "description": "A description of my application", + "author": "Your Name", + "license": "MIT", + "scripts": { + "postinstall": "(cd backend && npm install) && (cd frontend && npm install)" + }, "dependencies": { - "@winglibs/websockets": "^0.3.1" + "@winglibs/websockets": "^0.3.2" } } From da9e20ed2469ec8d67ab9d26261e6d5105cae3cb Mon Sep 17 00:00:00 2001 From: Ainvoner Date: Wed, 13 Mar 2024 10:52:40 +0200 Subject: [PATCH 3/7] Update main.w --- apps/wing/project-templates/wing/react-vite/backend/main.w | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/wing/project-templates/wing/react-vite/backend/main.w b/apps/wing/project-templates/wing/react-vite/backend/main.w index 7ee85a38bf7..c80edfec2a5 100644 --- a/apps/wing/project-templates/wing/react-vite/backend/main.w +++ b/apps/wing/project-templates/wing/react-vite/backend/main.w @@ -2,9 +2,9 @@ bring cloud; bring expect; bring vite; bring http; -bring "./broadcaster.w" as broadcaster; +bring "./broadcaster.w" as b; -let my_broadcaster = new broadcaster.Broadcaster() as "Broadcaster"; +let my_broadcaster = new b.Broadcaster() as "Broadcaster"; let api = new cloud.Api(cors: true); let counter = new cloud.Counter(); From b420988650469dd28a3d49dc840e614fa4a67f26 Mon Sep 17 00:00:00 2001 From: Ainvoner Date: Wed, 13 Mar 2024 12:17:52 +0200 Subject: [PATCH 4/7] Update init.test.ts --- apps/wing/src/commands/init.test.ts | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/apps/wing/src/commands/init.test.ts b/apps/wing/src/commands/init.test.ts index 9417bca8420..f97ab3d65ea 100644 --- a/apps/wing/src/commands/init.test.ts +++ b/apps/wing/src/commands/init.test.ts @@ -21,17 +21,23 @@ describe.each(templates)("new %s --language=wing", (template) => { console.log = log; }); - test(`wing new ${template} && wing test main.w`, async () => { - const workdir = await generateTmpDir(); - process.chdir(workdir); - - await init(template, { language: "wing" }); - - await cliTest(["main.w"], { - platform: ["sim"], - clean: false, - }); - }); + test( + `wing new ${template} && wing test main.w`, + async () => { + const workdir = await generateTmpDir(); + process.chdir(workdir); + + await init(template, { language: "wing" }); + + await cliTest(["main.w"], { + platform: ["sim"], + clean: false, + }); + }, + { + timeout: 500_000, // npm install can take a long time + } + ); }); describe("new --list-templates", () => { From 710a01b043102797a6b3597f30713c0340ad3c7d Mon Sep 17 00:00:00 2001 From: Ainvoner Date: Thu, 14 Mar 2024 14:24:58 +0200 Subject: [PATCH 5/7] update tests --- .../wing/react-vite/backend/package.json | 2 +- apps/wing/src/commands/init.test.ts | 93 +++++++++++++++---- 2 files changed, 78 insertions(+), 17 deletions(-) diff --git a/apps/wing/project-templates/wing/react-vite/backend/package.json b/apps/wing/project-templates/wing/react-vite/backend/package.json index fbafc0ca1a3..2274cd6cc62 100644 --- a/apps/wing/project-templates/wing/react-vite/backend/package.json +++ b/apps/wing/project-templates/wing/react-vite/backend/package.json @@ -6,6 +6,6 @@ "license": "MIT", "wing": true, "dependencies": { - "@winglibs/vite": "^0.1.1" + "@winglibs/vite": "^0.1.2" } } diff --git a/apps/wing/src/commands/init.test.ts b/apps/wing/src/commands/init.test.ts index f97ab3d65ea..ccbff4280e9 100644 --- a/apps/wing/src/commands/init.test.ts +++ b/apps/wing/src/commands/init.test.ts @@ -10,7 +10,7 @@ vitest.mock("inquirer"); const templates = projectTemplateNames(); -describe.each(templates)("new %s --language=wing", (template) => { +describe("new empty --language=wing", () => { let log: any; beforeEach(() => { log = console.log; @@ -21,23 +21,84 @@ describe.each(templates)("new %s --language=wing", (template) => { console.log = log; }); - test( - `wing new ${template} && wing test main.w`, - async () => { - const workdir = await generateTmpDir(); - process.chdir(workdir); + test(`wing new empty && wing test main.w`, async () => { + const workdir = await generateTmpDir(); + process.chdir(workdir); + + await init("empty", { language: "wing" }); + + await cliTest(["main.w"], { + platform: ["sim"], + clean: false, + }); + }); +}); + +describe("new http-api --language=wing", () => { + let log: any; + beforeEach(() => { + log = console.log; + console.log = vi.fn(); + }); + + afterEach(() => { + console.log = log; + }); + + test(`wing new http-api && wing test main.w`, async () => { + const workdir = await generateTmpDir(); + process.chdir(workdir); + + await init("http-api", { language: "wing" }); + + await cliTest(["main.w"], { + platform: ["sim"], + clean: false, + }); + }); +}); + +describe("new private-api --language=wing", () => { + let log: any; + beforeEach(() => { + log = console.log; + console.log = vi.fn(); + }); + + afterEach(() => { + console.log = log; + }); - await init(template, { language: "wing" }); + test(`wing new private-api && wing test main.w`, async () => { + const workdir = await generateTmpDir(); + process.chdir(workdir); - await cliTest(["main.w"], { - platform: ["sim"], - clean: false, - }); - }, - { - timeout: 500_000, // npm install can take a long time - } - ); + await init("private-api", { language: "wing" }); + + await cliTest(["main.w"], { + platform: ["sim"], + clean: false, + }); + }); +}); + +describe("new react-vite --language=wing", () => { + let log: any; + beforeEach(() => { + log = console.log; + console.log = vi.fn(); + }); + + afterEach(() => { + console.log = log; + }); + + test(`wing new react-vite`, async () => { + const workdir = await generateTmpDir(); + process.chdir(workdir); + + await init("react-vite", { language: "wing" }); + }); }); describe("new --list-templates", () => { From 0c0f6b5a26631638dea3c9725ffe6f13654d939e Mon Sep 17 00:00:00 2001 From: Ainvoner Date: Mon, 18 Mar 2024 11:19:17 +0200 Subject: [PATCH 6/7] feat(cli): react-vite template Part of react-vite use case. Based on react-vite-websockets wing workshop. resolves: https://github.com/winglang/wing/issues/5928 --- .../wing/react-vite/backend/main.w | 8 +- .../wing/react-vite/backend/utils.js | 1 + apps/wing/src/commands/init.test.ts | 73 +------------------ 3 files changed, 11 insertions(+), 71 deletions(-) create mode 100644 apps/wing/project-templates/wing/react-vite/backend/utils.js diff --git a/apps/wing/project-templates/wing/react-vite/backend/main.w b/apps/wing/project-templates/wing/react-vite/backend/main.w index c80edfec2a5..9867c4aeb03 100644 --- a/apps/wing/project-templates/wing/react-vite/backend/main.w +++ b/apps/wing/project-templates/wing/react-vite/backend/main.w @@ -4,12 +4,18 @@ bring vite; bring http; bring "./broadcaster.w" as b; +// Winglang doesn't have a built-in support for __dirname yet, so we use a workaround to get the current directory. +// @see tracking issue: https://github.com/winglang/wing/issues/3736 +class Utils { + extern "utils.js" pub static __dirname(): str; +} + let my_broadcaster = new b.Broadcaster() as "Broadcaster"; let api = new cloud.Api(cors: true); let counter = new cloud.Counter(); let my_vite = new vite.Vite( - root: "../frontend", + root: "{Utils.__dirname()}/../frontend", publicEnv: { TITLE: "Wing + Vite + React", API_URL: api.url, diff --git a/apps/wing/project-templates/wing/react-vite/backend/utils.js b/apps/wing/project-templates/wing/react-vite/backend/utils.js new file mode 100644 index 00000000000..e89ea1e8cd3 --- /dev/null +++ b/apps/wing/project-templates/wing/react-vite/backend/utils.js @@ -0,0 +1 @@ +exports.__dirname = () => __dirname; diff --git a/apps/wing/src/commands/init.test.ts b/apps/wing/src/commands/init.test.ts index ccbff4280e9..9417bca8420 100644 --- a/apps/wing/src/commands/init.test.ts +++ b/apps/wing/src/commands/init.test.ts @@ -10,7 +10,7 @@ vitest.mock("inquirer"); const templates = projectTemplateNames(); -describe("new empty --language=wing", () => { +describe.each(templates)("new %s --language=wing", (template) => { let log: any; beforeEach(() => { log = console.log; @@ -21,11 +21,11 @@ describe("new empty --language=wing", () => { console.log = log; }); - test(`wing new empty && wing test main.w`, async () => { + test(`wing new ${template} && wing test main.w`, async () => { const workdir = await generateTmpDir(); process.chdir(workdir); - await init("empty", { language: "wing" }); + await init(template, { language: "wing" }); await cliTest(["main.w"], { platform: ["sim"], @@ -34,73 +34,6 @@ describe("new empty --language=wing", () => { }); }); -describe("new http-api --language=wing", () => { - let log: any; - beforeEach(() => { - log = console.log; - console.log = vi.fn(); - }); - - afterEach(() => { - console.log = log; - }); - - test(`wing new http-api && wing test main.w`, async () => { - const workdir = await generateTmpDir(); - process.chdir(workdir); - - await init("http-api", { language: "wing" }); - - await cliTest(["main.w"], { - platform: ["sim"], - clean: false, - }); - }); -}); - -describe("new private-api --language=wing", () => { - let log: any; - beforeEach(() => { - log = console.log; - console.log = vi.fn(); - }); - - afterEach(() => { - console.log = log; - }); - - test(`wing new private-api && wing test main.w`, async () => { - const workdir = await generateTmpDir(); - process.chdir(workdir); - - await init("private-api", { language: "wing" }); - - await cliTest(["main.w"], { - platform: ["sim"], - clean: false, - }); - }); -}); - -describe("new react-vite --language=wing", () => { - let log: any; - beforeEach(() => { - log = console.log; - console.log = vi.fn(); - }); - - afterEach(() => { - console.log = log; - }); - - test(`wing new react-vite`, async () => { - const workdir = await generateTmpDir(); - process.chdir(workdir); - - await init("react-vite", { language: "wing" }); - }); -}); - describe("new --list-templates", () => { let log: any; beforeEach(() => { From d50cac4c8ab1b4c0e9a94e8fbd685ebf109cb81d Mon Sep 17 00:00:00 2001 From: Ainvoner Date: Mon, 18 Mar 2024 12:23:49 +0200 Subject: [PATCH 7/7] Update main.w --- .../project-templates/wing/react-vite/backend/main.w | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/wing/project-templates/wing/react-vite/backend/main.w b/apps/wing/project-templates/wing/react-vite/backend/main.w index 9867c4aeb03..2a86fb86de4 100644 --- a/apps/wing/project-templates/wing/react-vite/backend/main.w +++ b/apps/wing/project-templates/wing/react-vite/backend/main.w @@ -2,7 +2,7 @@ bring cloud; bring expect; bring vite; bring http; -bring "./broadcaster.w" as b; +bring "./broadcaster.w" as broadcaster; // Winglang doesn't have a built-in support for __dirname yet, so we use a workaround to get the current directory. // @see tracking issue: https://github.com/winglang/wing/issues/3736 @@ -10,18 +10,18 @@ class Utils { extern "utils.js" pub static __dirname(): str; } -let my_broadcaster = new b.Broadcaster() as "Broadcaster"; +let myBroadcaster = new broadcaster.Broadcaster() as "Broadcaster"; let api = new cloud.Api(cors: true); let counter = new cloud.Counter(); -let my_vite = new vite.Vite( +let website = new vite.Vite( root: "{Utils.__dirname()}/../frontend", publicEnv: { TITLE: "Wing + Vite + React", API_URL: api.url, - WS_URL: my_broadcaster.url + WS_URL: myBroadcaster.url } -) as "Vite"; +) as "Vite Website"; api.get("/counter", inflight () => { return { @@ -31,7 +31,7 @@ api.get("/counter", inflight () => { api.post("/counter", inflight () => { let prev = counter.inc(); - my_broadcaster.broadcast("refresh"); + myBroadcaster.broadcast("refresh"); return { body: "{prev + 1}" };