diff --git a/.eslintrc.json b/.eslintrc.json index 4e96c98..aab63b8 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -51,6 +51,12 @@ "dist/" ], "overrides": [ + { + "files": "bin/**/*.[mc]js", + "env": { + "node": true + } + }, { "files": "dev/**/*.[mc]js", "env": { diff --git a/changelog.md b/changelog.md index 03e5c54..d644948 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # Changelog for Weavy +## v19.0.4 + + + +* Minimum requirements for uikit-react now includes react v16 and optionally react-scripts v5. + ## v19.0.3 diff --git a/dev/auth-server.mjs b/dev/auth-server.mjs index 3fe1b28..eb7f56f 100644 --- a/dev/auth-server.mjs +++ b/dev/auth-server.mjs @@ -55,7 +55,7 @@ app.post("/webhooks", (req, res) => { res.end("OK"); }); -app.get("/contextual/:id", async (req, res) => { +app.get("/api/contextual/:id", async (req, res) => { // setup contextual app let response = await fetch(new URL("/api/apps/init", weavyUrl), { method: "POST", @@ -72,7 +72,7 @@ app.get("/contextual/:id", async (req, res) => { res.end(await response.text()); }); -app.get("/token", async (req, res) => { +app.get("/api/token", async (req, res) => { let username = currentUser; // get user from session if ((!req.query.refresh || req.query.refresh === "false") && _tokens.find((t) => t.username === username)) { diff --git a/dev/dev-server.mjs b/dev/dev-server.mjs index 3f4154f..f05fb57 100644 --- a/dev/dev-server.mjs +++ b/dev/dev-server.mjs @@ -26,7 +26,7 @@ const server = createServer(esbuildDevelopmentConfig, { static: "./demo", proxy: (path) => { if (path.startsWith("/api")) { - return path.replace(/^\/api/, "http://localhost:3001"); + return path.replace(/^\/api/, "http://localhost:3001/api"); } }, onSendHtml: (html) => { diff --git a/package-lock.json b/package-lock.json index 6e7a1d4..6b932d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@weavy/uikit-web", - "version": "19.0.3", + "version": "19.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@weavy/uikit-web", - "version": "19.0.3", + "version": "19.0.4", "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.11.1", @@ -30,6 +30,9 @@ "lodash.throttle": "^4.1.1", "pdfjs-dist": "^3.11.174" }, + "bin": { + "weavy": "bin/weavy-cli.mjs" + }, "devDependencies": { "@lit/localize-tools": "^0.7.1", "@open-wc/testing": "^4.0.0", diff --git a/package.json b/package.json index 1a0e2d0..6426782 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@weavy/uikit-web", - "version": "19.0.3", + "version": "19.0.4", "author": "Weavy", "description": "Web components UI-kit for Weavy", "homepage": "https://github.com/weavy/weavy-uikit-web", @@ -32,6 +32,9 @@ "test:build": "web-test-runner --config dev/web-test-runner.config.mjs", "test:watch": "web-test-runner --config dev/web-test-runner.config.mjs --watch" }, + "bin": { + "weavy": "./bin/weavy-cli.mjs" + }, "dependencies": { "@codemirror/autocomplete": "^6.11.1", "@codemirror/commands": "^6.3.2", diff --git a/tsconfig.json b/tsconfig.json index 54df144..d20c0c8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -56,6 +56,7 @@ "exclude": [ "node_modules", "dev/**/*.[mc]js", + "bin/**/*.[mc]js", "**/dist/*" ] } \ No newline at end of file