savanni
/
monorepo
1
0
Fork 0
Code Issues 69 Pull Requests Projects 6 Releases Wiki Activity

Adjust the Makefile dependency calculations

This commit is contained in:
Savanni D'Gerinel 2023-05-13 14:22:26 -04:00
parent 297e7f70c4
commit b86a618b34
4 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -51,14 +51,10 @@ kifu-gtk/dev:
cd kifu/gtk && make dev cd kifu/gtk && make dev
kifu-pwa: kifu-pwa:
pushd kifu/ffi/wasm && make && popd
pushd kifu/core-types && make && popd
cd kifu/pwa && make release cd kifu/pwa && make release
kifu-pwa/dev: kifu-pwa/dev:
pushd kifu/ffi/wasm && make && popd
pushd kifu/core-types && make && popd
pushd kifu/pwa && make dev pushd kifu/pwa && make dev
kifu-pwa/test-server: kifu-pwa/server:
pushd kifu/pwa && make test-server pushd kifu/pwa && make server

13
kifu/pwa/Makefile
View File

@ -1,7 +1,16 @@
dev: release: kifu-wasm core-types
NODE_ENV=production npm run build
dev: kifu-wasm core-types
npm run build npm run build
test-server: kifu-wasm:
pushd ../ffi/wasm && make && popd
core-types:
pushd ../core-types && make && popd
server:
npx http-server ./dist npx http-server ./dist

58
package-lock.json generated
View File

@ -8,7 +8,7 @@
"workspaces": [ "workspaces": [
"kifu/ffi/wasm/pkg", "kifu/ffi/wasm/pkg",
"kifu/core-types", "kifu/core-types",
"kifu/kifu-pwa" "kifu/pwa"
] ]
}, },
"kifu/core-types": { "kifu/core-types": {
@ -20,6 +20,22 @@
"version": "0.1.0" "version": "0.1.0"
}, },
"kifu/kifu-pwa": { "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", "version": "1.0.0",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"dependencies": { "dependencies": {
@ -175,9 +191,9 @@
"dev": true "dev": true
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "20.1.2", "version": "20.1.4",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.4.tgz",
"integrity": "sha512-CTO/wa8x+rZU626cL2BlbCDzydgnFNgc19h4YvizpTO88MFQxab8wqisxaofQJ/9bLGugRdWIuX/TbIs6VVF6g==", "integrity": "sha512-At4pvmIOki8yuwLtd7BNHl3CiWNbtclUbNtScGx4OHfBd4/oWoJC8KRCIxXwkdndzhxOsPXihrsOoydxBjlE9Q==",
"dev": true "dev": true
}, },
"node_modules/@webassemblyjs/ast": { "node_modules/@webassemblyjs/ast": {
@ -395,9 +411,9 @@
} }
}, },
"node_modules/acorn-import-assertions": { "node_modules/acorn-import-assertions": {
"version": "1.8.0", "version": "1.9.0",
"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
"integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
"dev": true, "dev": true,
"peerDependencies": { "peerDependencies": {
"acorn": "^8" "acorn": "^8"
@ -510,9 +526,9 @@
"dev": true "dev": true
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001486", "version": "1.0.30001487",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001486.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001487.tgz",
"integrity": "sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==", "integrity": "sha512-83564Z3yWGqXsh2vaH/mhXfEM0wX+NlBCm1jYHOb97TrTWJEmPTccZgeLTPBUUb0PNVo+oomb7wkimZBIERClA==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -653,9 +669,9 @@
} }
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.4.388", "version": "1.4.394",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.388.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.394.tgz",
"integrity": "sha512-xZ0y4zjWZgp65okzwwt00f2rYibkFPHUv9qBz+Vzn8cB9UXIo9Zc6Dw81LJYhhNt0G/vR1OJEfStZ49NKl0YxQ==", "integrity": "sha512-0IbC2cfr8w5LxTz+nmn2cJTGafsK9iauV2r5A5scfzyovqLrxuLoxOHE5OBobP3oVIggJT+0JfKnw9sm87c8Hw==",
"dev": true "dev": true
}, },
"node_modules/enhanced-resolve": { "node_modules/enhanced-resolve": {
@ -1051,7 +1067,7 @@
"dev": true "dev": true
}, },
"node_modules/kifu-pwa": { "node_modules/kifu-pwa": {
"resolved": "kifu/kifu-pwa", "resolved": "kifu/pwa",
"link": true "link": true
}, },
"node_modules/kifu-wasm": { "node_modules/kifu-wasm": {
@ -1444,9 +1460,9 @@
} }
}, },
"node_modules/semver": { "node_modules/semver": {
"version": "7.5.0", "version": "7.5.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
"integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
@ -1762,9 +1778,9 @@
} }
}, },
"node_modules/webpack": { "node_modules/webpack": {
"version": "5.82.0", "version": "5.82.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.1.tgz",
"integrity": "sha512-iGNA2fHhnDcV1bONdUu554eZx+XeldsaeQ8T67H6KKHl2nUSwX8Zm7cmzOA46ox/X1ARxf7Bjv8wQ/HsB5fxBg==", "integrity": "sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/eslint-scope": "^3.7.3", "@types/eslint-scope": "^3.7.3",
@ -1776,7 +1792,7 @@
"acorn-import-assertions": "^1.7.6", "acorn-import-assertions": "^1.7.6",
"browserslist": "^4.14.5", "browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2", "chrome-trace-event": "^1.0.2",
"enhanced-resolve": "^5.13.0", "enhanced-resolve": "^5.14.0",
"es-module-lexer": "^1.2.1", "es-module-lexer": "^1.2.1",
"eslint-scope": "5.1.1", "eslint-scope": "5.1.1",
"events": "^3.2.0", "events": "^3.2.0",

2
package.json
View File

@ -3,6 +3,6 @@
"workspaces": [ "workspaces": [
"kifu/ffi/wasm/pkg", "kifu/ffi/wasm/pkg",
"kifu/core-types", "kifu/core-types",
"kifu/kifu-pwa" "kifu/pwa"
] ]
} }