From b86a618b34ac8ac3377f8d6d0d748e1a8ec25dd8 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Sat, 13 May 2023 14:22:26 -0400 Subject: [PATCH] Adjust the Makefile dependency calculations --- Makefile | 8 ++----- kifu/pwa/Makefile | 13 +++++++++-- package-lock.json | 58 ++++++++++++++++++++++++++++++----------------- package.json | 2 +- 4 files changed, 51 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 92a0aeb..940003b 100644 --- a/Makefile +++ b/Makefile @@ -51,14 +51,10 @@ kifu-gtk/dev: cd kifu/gtk && make dev kifu-pwa: - pushd kifu/ffi/wasm && make && popd - pushd kifu/core-types && make && popd cd kifu/pwa && make release kifu-pwa/dev: - pushd kifu/ffi/wasm && make && popd - pushd kifu/core-types && make && popd pushd kifu/pwa && make dev -kifu-pwa/test-server: - pushd kifu/pwa && make test-server +kifu-pwa/server: + pushd kifu/pwa && make server diff --git a/kifu/pwa/Makefile b/kifu/pwa/Makefile index 251b688..0dc31ec 100644 --- a/kifu/pwa/Makefile +++ b/kifu/pwa/Makefile @@ -1,7 +1,16 @@ -dev: +release: kifu-wasm core-types + NODE_ENV=production npm run build + +dev: kifu-wasm core-types npm run build -test-server: +kifu-wasm: + pushd ../ffi/wasm && make && popd + +core-types: + pushd ../core-types && make && popd + +server: npx http-server ./dist diff --git a/package-lock.json b/package-lock.json index 9aac826..753687b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "workspaces": [ "kifu/ffi/wasm/pkg", "kifu/core-types", - "kifu/kifu-pwa" + "kifu/pwa" ] }, "kifu/core-types": { @@ -20,6 +20,22 @@ "version": "0.1.0" }, "kifu/kifu-pwa": { + "version": "1.0.0", + "extraneous": true, + "license": "GPL-3.0-or-later", + "dependencies": { + "lodash": "^4.17.21" + }, + "devDependencies": { + "@types/lodash": "^4.14.194", + "copy-webpack-plugin": "^11.0.0", + "ts-loader": "^9.4.2", + "typescript": "^5.0.4", + "webpack": "^5.82.0", + "webpack-cli": "^5.1.0" + } + }, + "kifu/pwa": { "version": "1.0.0", "license": "GPL-3.0-or-later", "dependencies": { @@ -175,9 +191,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.1.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.2.tgz", - "integrity": "sha512-CTO/wa8x+rZU626cL2BlbCDzydgnFNgc19h4YvizpTO88MFQxab8wqisxaofQJ/9bLGugRdWIuX/TbIs6VVF6g==", + "version": "20.1.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.4.tgz", + "integrity": "sha512-At4pvmIOki8yuwLtd7BNHl3CiWNbtclUbNtScGx4OHfBd4/oWoJC8KRCIxXwkdndzhxOsPXihrsOoydxBjlE9Q==", "dev": true }, "node_modules/@webassemblyjs/ast": { @@ -395,9 +411,9 @@ } }, "node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, "peerDependencies": { "acorn": "^8" @@ -510,9 +526,9 @@ "dev": true }, "node_modules/caniuse-lite": { - "version": "1.0.30001486", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001486.tgz", - "integrity": "sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==", + "version": "1.0.30001487", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001487.tgz", + "integrity": "sha512-83564Z3yWGqXsh2vaH/mhXfEM0wX+NlBCm1jYHOb97TrTWJEmPTccZgeLTPBUUb0PNVo+oomb7wkimZBIERClA==", "dev": true, "funding": [ { @@ -653,9 +669,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.388", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.388.tgz", - "integrity": "sha512-xZ0y4zjWZgp65okzwwt00f2rYibkFPHUv9qBz+Vzn8cB9UXIo9Zc6Dw81LJYhhNt0G/vR1OJEfStZ49NKl0YxQ==", + "version": "1.4.394", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.394.tgz", + "integrity": "sha512-0IbC2cfr8w5LxTz+nmn2cJTGafsK9iauV2r5A5scfzyovqLrxuLoxOHE5OBobP3oVIggJT+0JfKnw9sm87c8Hw==", "dev": true }, "node_modules/enhanced-resolve": { @@ -1051,7 +1067,7 @@ "dev": true }, "node_modules/kifu-pwa": { - "resolved": "kifu/kifu-pwa", + "resolved": "kifu/pwa", "link": true }, "node_modules/kifu-wasm": { @@ -1444,9 +1460,9 @@ } }, "node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", + "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -1762,9 +1778,9 @@ } }, "node_modules/webpack": { - "version": "5.82.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.0.tgz", - "integrity": "sha512-iGNA2fHhnDcV1bONdUu554eZx+XeldsaeQ8T67H6KKHl2nUSwX8Zm7cmzOA46ox/X1ARxf7Bjv8wQ/HsB5fxBg==", + "version": "5.82.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.1.tgz", + "integrity": "sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", @@ -1776,7 +1792,7 @@ "acorn-import-assertions": "^1.7.6", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.13.0", + "enhanced-resolve": "^5.14.0", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", diff --git a/package.json b/package.json index 9ce3a4d..6ccb9b0 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,6 @@ "workspaces": [ "kifu/ffi/wasm/pkg", "kifu/core-types", - "kifu/kifu-pwa" + "kifu/pwa" ] }