From 6397b8a8c9ea5aeaab0cb01c759ec7d87bd3d6d0 Mon Sep 17 00:00:00 2001 From: Maciej Jur Date: Wed, 14 Feb 2024 23:36:16 +0100 Subject: [PATCH] build: add Makefile --- Makefile | 15 ++++++ package.json | 8 +-- pnpm-lock.yaml | 127 ++++++++++++++++++++++-------------------------- tools/cloc.sh | 6 --- tools/deploy.sh | 6 --- 5 files changed, 76 insertions(+), 86 deletions(-) create mode 100644 Makefile delete mode 100755 tools/cloc.sh delete mode 100755 tools/deploy.sh diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ca1a8cf --- /dev/null +++ b/Makefile @@ -0,0 +1,15 @@ +dev: + pnpm run astro dev + +build: + pnpm run astro build + +deploy: build + rsync -Pavz ./dist/ kamoshi:/var/www/kamoshi.org --delete + +preview: build + pnpm run astro preview + +treesitter: + cd ./tools/treesitter; \ + pnpm run build diff --git a/package.json b/package.json index 58627b5..52ab9f9 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,6 @@ "private": true, "version": "0.0.1", "scripts": { - "dev": "astro dev", - "start": "astro dev", - "build": "astro build", - "preview": "astro preview", "astro": "astro" }, "dependencies": { @@ -15,7 +11,7 @@ "@astrojs/svelte": "^5.0.3", "@citation-js/plugin-bibtex": "^0.7.8", "@js-temporal/polyfill": "^0.4.4", - "astro": "^4.3.6", + "astro": "^4.3.7", "astro-pagefind": "^1.4.0", "chart.js": "^4.4.1", "citation-js": "^0.7.8", @@ -33,7 +29,7 @@ "remark-parse": "^11.0.0", "remark-rehype": "^11.1.0", "reveal.js": "^5.0.4", - "svelte": "5.0.0-next.52", + "svelte": "5.0.0-next.54", "unified": "^11.0.4", "unist-util-visit": "^5.0.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e5ebfe1..aff5392 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,10 +7,10 @@ settings: dependencies: '@astrojs/mdx': specifier: ^2.1.1 - version: 2.1.1(astro@4.3.6) + version: 2.1.1(astro@4.3.7) '@astrojs/svelte': specifier: ^5.0.3 - version: 5.0.3(astro@4.3.6)(svelte@5.0.0-next.52)(typescript@5.3.3)(vite@5.1.1) + version: 5.0.3(astro@4.3.7)(svelte@5.0.0-next.54)(typescript@5.3.3)(vite@5.1.2) '@citation-js/plugin-bibtex': specifier: ^0.7.8 version: 0.7.8(@citation-js/core@0.7.6) @@ -18,11 +18,11 @@ dependencies: specifier: ^0.4.4 version: 0.4.4 astro: - specifier: ^4.3.6 - version: 4.3.6(sass@1.70.0)(typescript@5.3.3) + specifier: ^4.3.7 + version: 4.3.7(sass@1.70.0)(typescript@5.3.3) astro-pagefind: specifier: ^1.4.0 - version: 1.4.0(astro@4.3.6) + version: 1.4.0(astro@4.3.7) chart.js: specifier: ^4.4.1 version: 4.4.1 @@ -72,8 +72,8 @@ dependencies: specifier: ^5.0.4 version: 5.0.4 svelte: - specifier: 5.0.0-next.52 - version: 5.0.0-next.52 + specifier: 5.0.0-next.54 + version: 5.0.0-next.54 unified: specifier: ^11.0.4 version: 11.0.4 @@ -103,9 +103,6 @@ devDependencies: sharp: specifier: ^0.33.2 version: 0.33.2 - treesitter: - specifier: file:/home/kamov/Desktop/treesitter - version: file:../../Desktop/treesitter packages: @@ -146,7 +143,7 @@ packages: - supports-color dev: false - /@astrojs/mdx@2.1.1(astro@4.3.6): + /@astrojs/mdx@2.1.1(astro@4.3.7): resolution: {integrity: sha512-AgGFdE7HOGmoFooGvMSatkA9FiSKwyVW7ImHot/bXJ6uAbFfu6iG2ht18Cf1pT22Hda/6iSCGWusFvBv0/EnKQ==} engines: {node: '>=18.14.1'} peerDependencies: @@ -155,7 +152,7 @@ packages: '@astrojs/markdown-remark': 4.2.1 '@mdx-js/mdx': 3.0.1 acorn: 8.11.3 - astro: 4.3.6(sass@1.70.0)(typescript@5.3.3) + astro: 4.3.7(sass@1.70.0)(typescript@5.3.3) es-module-lexer: 1.4.1 estree-util-visit: 2.0.0 github-slugger: 2.0.0 @@ -179,17 +176,17 @@ packages: prismjs: 1.29.0 dev: false - /@astrojs/svelte@5.0.3(astro@4.3.6)(svelte@5.0.0-next.52)(typescript@5.3.3)(vite@5.1.1): + /@astrojs/svelte@5.0.3(astro@4.3.7)(svelte@5.0.0-next.54)(typescript@5.3.3)(vite@5.1.2): resolution: {integrity: sha512-6TUBRUxmsEczKPBT6oDUAfvzuFCmITuhZfKPT5ZtOOyj9XOVnEnj/Iobd3ajKUbpWNYX7qZVAd1KMkmJc1Nhsg==} engines: {node: '>=18.14.1'} peerDependencies: astro: ^4.0.0 svelte: ^4.0.0 || ^5.0.0-next.1 dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@5.0.0-next.52)(vite@5.1.1) - astro: 4.3.6(sass@1.70.0)(typescript@5.3.3) - svelte: 5.0.0-next.52 - svelte2tsx: 0.6.27(svelte@5.0.0-next.52)(typescript@5.3.3) + '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@5.0.0-next.54)(vite@5.1.2) + astro: 4.3.7(sass@1.70.0)(typescript@5.3.3) + svelte: 5.0.0-next.54 + svelte2tsx: 0.6.27(svelte@5.0.0-next.54)(typescript@5.3.3) transitivePeerDependencies: - supports-color - typescript @@ -270,7 +267,7 @@ packages: dependencies: '@babel/compat-data': 7.23.5 '@babel/helper-validator-option': 7.23.5 - browserslist: 4.22.3 + browserslist: 4.23.0 lru-cache: 5.1.1 semver: 6.3.1 dev: false @@ -956,8 +953,8 @@ packages: '@jridgewell/trace-mapping': 0.3.22 dev: false - /@jridgewell/resolve-uri@3.1.1: - resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} + /@jridgewell/resolve-uri@3.1.2: + resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} engines: {node: '>=6.0.0'} dev: false @@ -973,7 +970,7 @@ packages: /@jridgewell/trace-mapping@0.3.22: resolution: {integrity: sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==} dependencies: - '@jridgewell/resolve-uri': 3.1.1 + '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.4.15 dev: false @@ -1192,7 +1189,7 @@ packages: engines: {node: '>=10'} dev: false - /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@5.0.0-next.52)(vite@5.1.1): + /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@5.0.0-next.54)(vite@5.1.2): resolution: {integrity: sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==} engines: {node: ^18.0.0 || >=20} peerDependencies: @@ -1200,30 +1197,30 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@5.0.0-next.52)(vite@5.1.1) + '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@5.0.0-next.54)(vite@5.1.2) debug: 4.3.4 - svelte: 5.0.0-next.52 - vite: 5.1.1(sass@1.70.0) + svelte: 5.0.0-next.54 + vite: 5.1.2(sass@1.70.0) transitivePeerDependencies: - supports-color dev: false - /@sveltejs/vite-plugin-svelte@3.0.2(svelte@5.0.0-next.52)(vite@5.1.1): + /@sveltejs/vite-plugin-svelte@3.0.2(svelte@5.0.0-next.54)(vite@5.1.2): resolution: {integrity: sha512-MpmF/cju2HqUls50WyTHQBZUV3ovV/Uk8k66AN2gwHogNAG8wnW8xtZDhzNBsFJJuvmq1qnzA5kE7YfMJNFv2Q==} engines: {node: ^18.0.0 || >=20} peerDependencies: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@5.0.0-next.52)(vite@5.1.1) + '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@5.0.0-next.54)(vite@5.1.2) debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.7 - svelte: 5.0.0-next.52 - svelte-hmr: 0.15.3(svelte@5.0.0-next.52) - vite: 5.1.1(sass@1.70.0) - vitefu: 0.2.5(vite@5.1.1) + svelte: 5.0.0-next.54 + svelte-hmr: 0.15.3(svelte@5.0.0-next.54) + vite: 5.1.2(sass@1.70.0) + vitefu: 0.2.5(vite@5.1.2) transitivePeerDependencies: - supports-color dev: false @@ -1426,19 +1423,19 @@ packages: hasBin: true dev: false - /astro-pagefind@1.4.0(astro@4.3.6): + /astro-pagefind@1.4.0(astro@4.3.7): resolution: {integrity: sha512-WMUlS0TTqIDqygplj/cxKU+l3oI+zB2qgYNMZed5R5nXuw8HhAKATog9zazuN05TOSWxI2Ap9+9WAYnnJ+4C7A==} peerDependencies: astro: ^2.0.4 || ^3.0.0 || ^4.0.0 dependencies: '@pagefind/default-ui': 1.0.4 - astro: 4.3.6(sass@1.70.0)(typescript@5.3.3) + astro: 4.3.7(sass@1.70.0)(typescript@5.3.3) pagefind: 1.0.4 sirv: 2.0.4 dev: false - /astro@4.3.6(sass@1.70.0)(typescript@5.3.3): - resolution: {integrity: sha512-VYJGsBygMtPM/qTRgn5QdxkSILgjpW2uHVw3snp/Gkl+N9uRAAnuYxrUO7wkbLejfrmlb0nZyyKG+H5VDQPbeg==} + /astro@4.3.7(sass@1.70.0)(typescript@5.3.3): + resolution: {integrity: sha512-spdl+Ae6WZjQ0w8VBPq8ulN1hdN0m4EWvKG7ecgHjPQIHidMnzWJoZLEFEeKASqCGB1fDibqr7RDHoHkhZbp2Q==} engines: {node: '>=18.14.1', npm: '>=6.14.0'} hasBin: true dependencies: @@ -1502,8 +1499,8 @@ packages: tsconfck: 3.0.2(typescript@5.3.3) unist-util-visit: 5.0.0 vfile: 6.0.1 - vite: 5.1.1(sass@1.70.0) - vitefu: 0.2.5(vite@5.1.1) + vite: 5.1.2(sass@1.70.0) + vitefu: 0.2.5(vite@5.1.2) which-pm: 2.1.1 yargs-parser: 21.1.1 zod: 3.22.4 @@ -1543,19 +1540,19 @@ packages: dev: false optional: true - /bare-fs@2.1.3: - resolution: {integrity: sha512-Oa7F0QJV7We0mtKq7Tk246uiBrl7vun64cPEsJOEwv2vHjnVL9yO7aH3643aSrd4rXfVe7yhJ9LHZywQQAXKFQ==} + /bare-fs@2.1.5: + resolution: {integrity: sha512-5t0nlecX+N2uJqdxe9d18A98cp2u9BETelbjKpiVgQqzzmVNFYWEAjQHqS+2Khgto1vcwhik9cXucaj5ve2WWA==} requiresBuild: true dependencies: bare-events: 2.2.0 - bare-os: 2.1.2 + bare-os: 2.1.3 bare-path: 2.1.0 streamx: 2.15.8 dev: false optional: true - /bare-os@2.1.2: - resolution: {integrity: sha512-slQjOn78Q8itnzomNAamiKo5MDpEpV3JnoNZ93lyynaFh6paWcU+5c0GVcZ7EYIJC2unN2JGdF1qupdscYl0Yg==} + /bare-os@2.1.3: + resolution: {integrity: sha512-YMKOQzoMouGCrYgJ0rassKvmbTz+TYDOKKmu4JkfNXS/qKn+If1ODCMEXnmknQXfnB1PS8bR+uHu6xBgwAQXew==} requiresBuild: true dev: false optional: true @@ -1564,7 +1561,7 @@ packages: resolution: {integrity: sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw==} requiresBuild: true dependencies: - bare-os: 2.1.2 + bare-os: 2.1.3 dev: false optional: true @@ -1618,15 +1615,15 @@ packages: dependencies: fill-range: 7.0.1 - /browserslist@4.22.3: - resolution: {integrity: sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==} + /browserslist@4.23.0: + resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: caniuse-lite: 1.0.30001587 - electron-to-chromium: 1.4.665 + electron-to-chromium: 1.4.669 node-releases: 2.0.14 - update-browserslist-db: 1.0.13(browserslist@4.22.3) + update-browserslist-db: 1.0.13(browserslist@4.23.0) dev: false /buffer@5.7.1: @@ -1961,8 +1958,8 @@ packages: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} dev: false - /electron-to-chromium@1.4.665: - resolution: {integrity: sha512-UpyCWObBoD+nSZgOC2ToaIdZB0r9GhqT2WahPKiSki6ckkSuKhQNso8V2PrFcHBMleI/eqbKgVQgVC4Wni4ilw==} + /electron-to-chromium@1.4.669: + resolution: {integrity: sha512-E2SmpffFPrZhBSgf8ibqanRS2mpuk3FIRDzLDwt7WFpfgJMKDHJs0hmacyP0PS1cWsq0dVkwIIzlscNaterkPg==} dev: false /emoji-regex@10.3.0: @@ -4395,16 +4392,16 @@ packages: engines: {node: '>= 0.4'} dev: false - /svelte-hmr@0.15.3(svelte@5.0.0-next.52): + /svelte-hmr@0.15.3(svelte@5.0.0-next.54): resolution: {integrity: sha512-41snaPswvSf8TJUhlkoJBekRrABDXDMdpNpT2tfHIv4JuhgvHqLMhEPGtaQn0BmbNSTkuz2Ed20DF2eHw0SmBQ==} engines: {node: ^12.20 || ^14.13.1 || >= 16} peerDependencies: svelte: ^3.19.0 || ^4.0.0 dependencies: - svelte: 5.0.0-next.52 + svelte: 5.0.0-next.54 dev: false - /svelte2tsx@0.6.27(svelte@5.0.0-next.52)(typescript@5.3.3): + /svelte2tsx@0.6.27(svelte@5.0.0-next.54)(typescript@5.3.3): resolution: {integrity: sha512-E1uPW1o6VsbRz+nUk3fznZ2lSmCITAJoNu8AYefWSvIwE2pSB01i5sId4RMbWNzfcwCQl1DcgGShCPcldl4rvg==} peerDependencies: svelte: ^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0 @@ -4412,12 +4409,12 @@ packages: dependencies: dedent-js: 1.0.1 pascal-case: 3.1.2 - svelte: 5.0.0-next.52 + svelte: 5.0.0-next.54 typescript: 5.3.3 dev: false - /svelte@5.0.0-next.52: - resolution: {integrity: sha512-f7yhm97uEZx2QjLSMwlkq70nxepcaZ27FE+Hub1WTUuiRpigAs3y9M5x7abjJDbarp8604dBGNIe3Cp/5BRwAw==} + /svelte@5.0.0-next.54: + resolution: {integrity: sha512-ik+hXhlKdZozs+EruogLXb5PVZD8X8ekNBwQGBYcTpj1FD0sgWZxvUEQV4m0rE5LaUL3J5cmO4e8daOuPxIK/A==} engines: {node: '>=18'} dependencies: '@ampproject/remapping': 2.2.1 @@ -4463,7 +4460,7 @@ packages: pump: 3.0.0 tar-stream: 3.1.7 optionalDependencies: - bare-fs: 2.1.3 + bare-fs: 2.1.5 bare-path: 2.1.0 dev: false optional: true @@ -4680,13 +4677,13 @@ packages: unist-util-visit-parents: 6.0.1 dev: false - /update-browserslist-db@1.0.13(browserslist@4.22.3): + /update-browserslist-db@1.0.13(browserslist@4.23.0): resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' dependencies: - browserslist: 4.22.3 + browserslist: 4.23.0 escalade: 3.1.2 picocolors: 1.0.0 dev: false @@ -4733,8 +4730,8 @@ packages: vfile-message: 4.0.2 dev: false - /vite@5.1.1(sass@1.70.0): - resolution: {integrity: sha512-wclpAgY3F1tR7t9LL5CcHC41YPkQIpKUGeIuT8MdNwNZr6OqOTLs7JX5vIHAtzqLWXts0T+GDrh9pN2arneKqg==} + /vite@5.1.2(sass@1.70.0): + resolution: {integrity: sha512-uwiFebQbTWRIGbCaTEBVAfKqgqKNKMJ2uPXsXeLIZxM8MVMjoS3j0cG8NrPxdDIadaWnPSjrkLWffLSC+uiP3Q==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -4769,7 +4766,7 @@ packages: fsevents: 2.3.3 dev: false - /vitefu@0.2.5(vite@5.1.1): + /vitefu@0.2.5(vite@5.1.2): resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==} peerDependencies: vite: ^3.0.0 || ^4.0.0 || ^5.0.0 @@ -4777,7 +4774,7 @@ packages: vite: optional: true dependencies: - vite: 5.1.1(sass@1.70.0) + vite: 5.1.2(sass@1.70.0) dev: false /web-namespaces@2.0.1: @@ -4892,9 +4889,3 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} dev: false - - file:../../Desktop/treesitter: - resolution: {directory: ../../Desktop/treesitter, type: directory} - name: treesitter - engines: {node: '>= 10'} - dev: true diff --git a/tools/cloc.sh b/tools/cloc.sh deleted file mode 100755 index 66d4730..0000000 --- a/tools/cloc.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -cloc \ - --force-lang="agda",astro \ - --exclude-dir=node_modules,dist \ - . diff --git a/tools/deploy.sh b/tools/deploy.sh deleted file mode 100755 index 9faf127..0000000 --- a/tools/deploy.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -pnpm build -rsync -Pavz ./dist/ kamoshi:/var/www/kamoshi.org --delete -echo "Done" -