From 8b26bcf554a121ab6c60e5eb40c9830b53f0e74e Mon Sep 17 00:00:00 2001 From: weeryan17 Date: Sun, 7 Jan 2024 12:18:52 -0500 Subject: [PATCH 1/5] Allow building for arm --- Dockerfile | 2 +- package.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 457e61f..bbc062e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine as base +FROM node:20-alpine as base WORKDIR /app # Build layer diff --git a/package.json b/package.json index 334dbff..06a17a1 100644 --- a/package.json +++ b/package.json @@ -27,5 +27,10 @@ "eslint-config-prettier": "^9.0.0", "eslint-import-resolver-typescript": "^3.6.0", "eslint-plugin-prettier": "^5.0.0" + }, + "pnpm": { + "overides": { + "rollup": "@rollup/wasm-node" + } } } From 6828e314976fbd7ac0e3c0b0e93a2a0e5bdfe9f5 Mon Sep 17 00:00:00 2001 From: weeryan17 Date: Sun, 7 Jan 2024 12:20:42 -0500 Subject: [PATCH 2/5] Whops missed an r --- package.json | 2 +- pnpm-lock.yaml | 234 +++++++++++-------------------------------------- 2 files changed, 54 insertions(+), 182 deletions(-) diff --git a/package.json b/package.json index 06a17a1..3ef5742 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "eslint-plugin-prettier": "^5.0.0" }, "pnpm": { - "overides": { + "overrides": { "rollup": "@rollup/wasm-node" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c1fecdc..1d9f1b5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,9 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + rollup: '@rollup/wasm-node' + dependencies: h3: specifier: ^1.10.0 @@ -572,123 +575,123 @@ packages: tslib: 2.6.2 dev: true - /@rollup/plugin-alias@5.1.0(rollup@4.9.4): + /@rollup/plugin-alias@5.1.0(rollup@@rollup+wasm-node): resolution: {integrity: sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + rollup: '@rollup/wasm-node' peerDependenciesMeta: rollup: optional: true dependencies: - rollup: 4.9.4 + rollup: link:@rollup/wasm-node slash: 4.0.0 dev: false - /@rollup/plugin-commonjs@25.0.7(rollup@4.9.4): + /@rollup/plugin-commonjs@25.0.7(rollup@@rollup+wasm-node): resolution: {integrity: sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^2.68.0||^3.0.0||^4.0.0 + rollup: '@rollup/wasm-node' peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.9.4) + '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 is-reference: 1.2.1 magic-string: 0.30.5 - rollup: 4.9.4 + rollup: link:@rollup/wasm-node dev: false - /@rollup/plugin-inject@5.0.5(rollup@4.9.4): + /@rollup/plugin-inject@5.0.5(rollup@@rollup+wasm-node): resolution: {integrity: sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + rollup: '@rollup/wasm-node' peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.9.4) + '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) estree-walker: 2.0.2 magic-string: 0.30.5 - rollup: 4.9.4 + rollup: link:@rollup/wasm-node dev: false - /@rollup/plugin-json@6.1.0(rollup@4.9.4): + /@rollup/plugin-json@6.1.0(rollup@@rollup+wasm-node): resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + rollup: '@rollup/wasm-node' peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.9.4) - rollup: 4.9.4 + '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) + rollup: link:@rollup/wasm-node dev: false - /@rollup/plugin-node-resolve@15.2.3(rollup@4.9.4): + /@rollup/plugin-node-resolve@15.2.3(rollup@@rollup+wasm-node): resolution: {integrity: sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^2.78.0||^3.0.0||^4.0.0 + rollup: '@rollup/wasm-node' peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.9.4) + '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-builtin-module: 3.2.1 is-module: 1.0.0 resolve: 1.22.4 - rollup: 4.9.4 + rollup: link:@rollup/wasm-node dev: false - /@rollup/plugin-replace@5.0.5(rollup@4.9.4): + /@rollup/plugin-replace@5.0.5(rollup@@rollup+wasm-node): resolution: {integrity: sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + rollup: '@rollup/wasm-node' peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.9.4) + '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) magic-string: 0.30.5 - rollup: 4.9.4 + rollup: link:@rollup/wasm-node dev: false - /@rollup/plugin-terser@0.4.4(rollup@4.9.4): + /@rollup/plugin-terser@0.4.4(rollup@@rollup+wasm-node): resolution: {integrity: sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^2.0.0||^3.0.0||^4.0.0 + rollup: '@rollup/wasm-node' peerDependenciesMeta: rollup: optional: true dependencies: - rollup: 4.9.4 + rollup: link:@rollup/wasm-node serialize-javascript: 6.0.1 smob: 1.4.0 terser: 5.19.4 dev: false - /@rollup/plugin-wasm@6.2.2(rollup@4.9.4): + /@rollup/plugin-wasm@6.2.2(rollup@@rollup+wasm-node): resolution: {integrity: sha512-gpC4R1G9Ni92ZIRTexqbhX7U+9estZrbhP+9SRb0DW9xpB9g7j34r+J2hqrcW/lRI7dJaU84MxZM0Rt82tqYPQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + rollup: '@rollup/wasm-node' peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.9.4) - rollup: 4.9.4 + '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) + rollup: link:@rollup/wasm-node dev: false /@rollup/pluginutils@4.2.1: @@ -699,11 +702,11 @@ packages: picomatch: 2.3.1 dev: false - /@rollup/pluginutils@5.1.0(rollup@4.9.4): + /@rollup/pluginutils@5.1.0(rollup@@rollup+wasm-node): resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + rollup: '@rollup/wasm-node' peerDependenciesMeta: rollup: optional: true @@ -711,112 +714,8 @@ packages: '@types/estree': 1.0.1 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 4.9.4 - dev: false - - /@rollup/rollup-android-arm-eabi@4.9.4: - resolution: {integrity: sha512-ub/SN3yWqIv5CWiAZPHVS1DloyZsJbtXmX4HxUTIpS0BHm9pW5iYBo2mIZi+hE3AeiTzHz33blwSnhdUo+9NpA==} - cpu: [arm] - os: [android] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-android-arm64@4.9.4: - resolution: {integrity: sha512-ehcBrOR5XTl0W0t2WxfTyHCR/3Cq2jfb+I4W+Ch8Y9b5G+vbAecVv0Fx/J1QKktOrgUYsIKxWAKgIpvw56IFNA==} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-darwin-arm64@4.9.4: - resolution: {integrity: sha512-1fzh1lWExwSTWy8vJPnNbNM02WZDS8AW3McEOb7wW+nPChLKf3WG2aG7fhaUmfX5FKw9zhsF5+MBwArGyNM7NA==} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-darwin-x64@4.9.4: - resolution: {integrity: sha512-Gc6cukkF38RcYQ6uPdiXi70JB0f29CwcQ7+r4QpfNpQFVHXRd0DfWFidoGxjSx1DwOETM97JPz1RXL5ISSB0pA==} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-arm-gnueabihf@4.9.4: - resolution: {integrity: sha512-g21RTeFzoTl8GxosHbnQZ0/JkuFIB13C3T7Y0HtKzOXmoHhewLbVTFBQZu+z5m9STH6FZ7L/oPgU4Nm5ErN2fw==} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-arm64-gnu@4.9.4: - resolution: {integrity: sha512-TVYVWD/SYwWzGGnbfTkrNpdE4HON46orgMNHCivlXmlsSGQOx/OHHYiQcMIOx38/GWgwr/po2LBn7wypkWw/Mg==} - cpu: [arm64] - os: [linux] - requiresBuild: true + rollup: link:@rollup/wasm-node dev: false - optional: true - - /@rollup/rollup-linux-arm64-musl@4.9.4: - resolution: {integrity: sha512-XcKvuendwizYYhFxpvQ3xVpzje2HHImzg33wL9zvxtj77HvPStbSGI9czrdbfrf8DGMcNNReH9pVZv8qejAQ5A==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-riscv64-gnu@4.9.4: - resolution: {integrity: sha512-LFHS/8Q+I9YA0yVETyjonMJ3UA+DczeBd/MqNEzsGSTdNvSJa1OJZcSH8GiXLvcizgp9AlHs2walqRcqzjOi3A==} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-x64-gnu@4.9.4: - resolution: {integrity: sha512-dIYgo+j1+yfy81i0YVU5KnQrIJZE8ERomx17ReU4GREjGtDW4X+nvkBak2xAUpyqLs4eleDSj3RrV72fQos7zw==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-x64-musl@4.9.4: - resolution: {integrity: sha512-RoaYxjdHQ5TPjaPrLsfKqR3pakMr3JGqZ+jZM0zP2IkDtsGa4CqYaWSfQmZVgFUCgLrTnzX+cnHS3nfl+kB6ZQ==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-win32-arm64-msvc@4.9.4: - resolution: {integrity: sha512-T8Q3XHV+Jjf5e49B4EAaLKV74BbX7/qYBRQ8Wop/+TyyU0k+vSjiLVSHNWdVd1goMjZcbhDmYZUYW5RFqkBNHQ==} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-win32-ia32-msvc@4.9.4: - resolution: {integrity: sha512-z+JQ7JirDUHAsMecVydnBPWLwJjbppU+7LZjffGf+Jvrxq+dVjIE7By163Sc9DKc3ADSU50qPVw0KonBS+a+HQ==} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-win32-x64-msvc@4.9.4: - resolution: {integrity: sha512-LfdGXCV9rdEify1oxlN9eamvDSjv9md9ZVMAbNHA87xqIfFCxImxan9qZ8+Un54iK2nnqPlbnSi4R54ONtbWBw==} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: false - optional: true /@sindresorhus/merge-streams@1.0.0: resolution: {integrity: sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==} @@ -827,10 +726,6 @@ packages: resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==} dev: false - /@types/estree@1.0.5: - resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} - dev: false - /@types/http-proxy@1.17.14: resolution: {integrity: sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==} dependencies: @@ -2964,15 +2859,15 @@ packages: dependencies: '@cloudflare/kv-asset-handler': 0.3.0 '@netlify/functions': 2.4.1 - '@rollup/plugin-alias': 5.1.0(rollup@4.9.4) - '@rollup/plugin-commonjs': 25.0.7(rollup@4.9.4) - '@rollup/plugin-inject': 5.0.5(rollup@4.9.4) - '@rollup/plugin-json': 6.1.0(rollup@4.9.4) - '@rollup/plugin-node-resolve': 15.2.3(rollup@4.9.4) - '@rollup/plugin-replace': 5.0.5(rollup@4.9.4) - '@rollup/plugin-terser': 0.4.4(rollup@4.9.4) - '@rollup/plugin-wasm': 6.2.2(rollup@4.9.4) - '@rollup/pluginutils': 5.1.0(rollup@4.9.4) + '@rollup/plugin-alias': 5.1.0(rollup@@rollup+wasm-node) + '@rollup/plugin-commonjs': 25.0.7(rollup@@rollup+wasm-node) + '@rollup/plugin-inject': 5.0.5(rollup@@rollup+wasm-node) + '@rollup/plugin-json': 6.1.0(rollup@@rollup+wasm-node) + '@rollup/plugin-node-resolve': 15.2.3(rollup@@rollup+wasm-node) + '@rollup/plugin-replace': 5.0.5(rollup@@rollup+wasm-node) + '@rollup/plugin-terser': 0.4.4(rollup@@rollup+wasm-node) + '@rollup/plugin-wasm': 6.2.2(rollup@@rollup+wasm-node) + '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) '@types/http-proxy': 1.17.14 '@vercel/nft': 0.24.4 archiver: 6.0.1 @@ -3013,8 +2908,8 @@ packages: pkg-types: 1.0.3 pretty-bytes: 6.1.1 radix3: 1.1.0 - rollup: 4.9.4 - rollup-plugin-visualizer: 5.12.0(rollup@4.9.4) + rollup: link:@rollup/wasm-node + rollup-plugin-visualizer: 5.12.0(rollup@@rollup+wasm-node) scule: 1.1.1 semver: 7.5.4 serve-placeholder: 2.0.1 @@ -3024,7 +2919,7 @@ packages: uncrypto: 0.1.3 unctx: 2.3.1 unenv: 1.9.0 - unimport: 3.7.1(rollup@4.9.4) + unimport: 3.7.1(rollup@@rollup+wasm-node) unstorage: 1.10.1 transitivePeerDependencies: - '@azure/app-configuration' @@ -3491,46 +3386,23 @@ packages: dependencies: glob: 7.2.3 - /rollup-plugin-visualizer@5.12.0(rollup@4.9.4): + /rollup-plugin-visualizer@5.12.0(rollup@@rollup+wasm-node): resolution: {integrity: sha512-8/NU9jXcHRs7Nnj07PF2o4gjxmm9lXIrZ8r175bT9dK8qoLlvKTwRMArRCMgpMGlq8CTLugRvEmyMeMXIU2pNQ==} engines: {node: '>=14'} hasBin: true peerDependencies: - rollup: 2.x || 3.x || 4.x + rollup: '@rollup/wasm-node' peerDependenciesMeta: rollup: optional: true dependencies: open: 8.4.2 picomatch: 2.3.1 - rollup: 4.9.4 + rollup: link:@rollup/wasm-node source-map: 0.7.4 yargs: 17.7.2 dev: false - /rollup@4.9.4: - resolution: {integrity: sha512-2ztU7pY/lrQyXSCnnoU4ICjT/tCG9cdH3/G25ERqE3Lst6vl2BCM5hL2Nw+sslAvAf+ccKsAq1SkKQALyqhR7g==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - dependencies: - '@types/estree': 1.0.5 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.9.4 - '@rollup/rollup-android-arm64': 4.9.4 - '@rollup/rollup-darwin-arm64': 4.9.4 - '@rollup/rollup-darwin-x64': 4.9.4 - '@rollup/rollup-linux-arm-gnueabihf': 4.9.4 - '@rollup/rollup-linux-arm64-gnu': 4.9.4 - '@rollup/rollup-linux-arm64-musl': 4.9.4 - '@rollup/rollup-linux-riscv64-gnu': 4.9.4 - '@rollup/rollup-linux-x64-gnu': 4.9.4 - '@rollup/rollup-linux-x64-musl': 4.9.4 - '@rollup/rollup-win32-arm64-msvc': 4.9.4 - '@rollup/rollup-win32-ia32-msvc': 4.9.4 - '@rollup/rollup-win32-x64-msvc': 4.9.4 - fsevents: 2.3.3 - dev: false - /run-applescript@5.0.0: resolution: {integrity: sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==} engines: {node: '>=12'} @@ -4019,10 +3891,10 @@ packages: engines: {node: '>=18'} dev: false - /unimport@3.7.1(rollup@4.9.4): + /unimport@3.7.1(rollup@@rollup+wasm-node): resolution: {integrity: sha512-V9HpXYfsZye5bPPYUgs0Otn3ODS1mDUciaBlXljI4C2fTwfFpvFZRywmlOu943puN9sncxROMZhsZCjNXEpzEQ==} dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.9.4) + '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) acorn: 8.11.3 escape-string-regexp: 5.0.0 estree-walker: 3.0.3 From b16ebe48b0b03111c877131472788b3f7d2bae4b Mon Sep 17 00:00:00 2001 From: weeryan17 Date: Sun, 7 Jan 2024 12:22:14 -0500 Subject: [PATCH 3/5] add rollup to dev dependencies --- package.json | 5 ++- pnpm-lock.yaml | 118 +++++++++++++++++++++++++++---------------------- 2 files changed, 69 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 3ef5742..f44679c 100644 --- a/package.json +++ b/package.json @@ -26,11 +26,12 @@ "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prettier": "^9.0.0", "eslint-import-resolver-typescript": "^3.6.0", - "eslint-plugin-prettier": "^5.0.0" + "eslint-plugin-prettier": "^5.0.0", + "@rollup/wasm-node": "^4.9.4" }, "pnpm": { "overrides": { - "rollup": "@rollup/wasm-node" + "rollup": "npm:@rollup/wasm-node" } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d9f1b5..98dfa9a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,7 @@ settings: excludeLinksFromLockfile: false overrides: - rollup: '@rollup/wasm-node' + rollup: npm:@rollup/wasm-node dependencies: h3: @@ -19,6 +19,9 @@ dependencies: version: 2.8.1 devDependencies: + '@rollup/wasm-node': + specifier: ^4.9.4 + version: 4.9.4 '@typescript-eslint/eslint-plugin': specifier: ^6.7.0 version: 6.7.0(@typescript-eslint/parser@6.7.0)(eslint@8.49.0)(typescript@5.2.2) @@ -575,123 +578,123 @@ packages: tslib: 2.6.2 dev: true - /@rollup/plugin-alias@5.1.0(rollup@@rollup+wasm-node): + /@rollup/plugin-alias@5.1.0(@rollup/wasm-node@4.9.4): resolution: {integrity: sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: '@rollup/wasm-node' + rollup: npm:@rollup/wasm-node peerDependenciesMeta: rollup: optional: true dependencies: - rollup: link:@rollup/wasm-node + rollup: /@rollup/wasm-node@4.9.4 slash: 4.0.0 dev: false - /@rollup/plugin-commonjs@25.0.7(rollup@@rollup+wasm-node): + /@rollup/plugin-commonjs@25.0.7(@rollup/wasm-node@4.9.4): resolution: {integrity: sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: '@rollup/wasm-node' + rollup: npm:@rollup/wasm-node peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) + '@rollup/pluginutils': 5.1.0(@rollup/wasm-node@4.9.4) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 is-reference: 1.2.1 magic-string: 0.30.5 - rollup: link:@rollup/wasm-node + rollup: /@rollup/wasm-node@4.9.4 dev: false - /@rollup/plugin-inject@5.0.5(rollup@@rollup+wasm-node): + /@rollup/plugin-inject@5.0.5(@rollup/wasm-node@4.9.4): resolution: {integrity: sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: '@rollup/wasm-node' + rollup: npm:@rollup/wasm-node peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) + '@rollup/pluginutils': 5.1.0(@rollup/wasm-node@4.9.4) estree-walker: 2.0.2 magic-string: 0.30.5 - rollup: link:@rollup/wasm-node + rollup: /@rollup/wasm-node@4.9.4 dev: false - /@rollup/plugin-json@6.1.0(rollup@@rollup+wasm-node): + /@rollup/plugin-json@6.1.0(@rollup/wasm-node@4.9.4): resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: '@rollup/wasm-node' + rollup: npm:@rollup/wasm-node peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) - rollup: link:@rollup/wasm-node + '@rollup/pluginutils': 5.1.0(@rollup/wasm-node@4.9.4) + rollup: /@rollup/wasm-node@4.9.4 dev: false - /@rollup/plugin-node-resolve@15.2.3(rollup@@rollup+wasm-node): + /@rollup/plugin-node-resolve@15.2.3(@rollup/wasm-node@4.9.4): resolution: {integrity: sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: '@rollup/wasm-node' + rollup: npm:@rollup/wasm-node peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) + '@rollup/pluginutils': 5.1.0(@rollup/wasm-node@4.9.4) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-builtin-module: 3.2.1 is-module: 1.0.0 resolve: 1.22.4 - rollup: link:@rollup/wasm-node + rollup: /@rollup/wasm-node@4.9.4 dev: false - /@rollup/plugin-replace@5.0.5(rollup@@rollup+wasm-node): + /@rollup/plugin-replace@5.0.5(@rollup/wasm-node@4.9.4): resolution: {integrity: sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: '@rollup/wasm-node' + rollup: npm:@rollup/wasm-node peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) + '@rollup/pluginutils': 5.1.0(@rollup/wasm-node@4.9.4) magic-string: 0.30.5 - rollup: link:@rollup/wasm-node + rollup: /@rollup/wasm-node@4.9.4 dev: false - /@rollup/plugin-terser@0.4.4(rollup@@rollup+wasm-node): + /@rollup/plugin-terser@0.4.4(@rollup/wasm-node@4.9.4): resolution: {integrity: sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: '@rollup/wasm-node' + rollup: npm:@rollup/wasm-node peerDependenciesMeta: rollup: optional: true dependencies: - rollup: link:@rollup/wasm-node + rollup: /@rollup/wasm-node@4.9.4 serialize-javascript: 6.0.1 smob: 1.4.0 terser: 5.19.4 dev: false - /@rollup/plugin-wasm@6.2.2(rollup@@rollup+wasm-node): + /@rollup/plugin-wasm@6.2.2(@rollup/wasm-node@4.9.4): resolution: {integrity: sha512-gpC4R1G9Ni92ZIRTexqbhX7U+9estZrbhP+9SRb0DW9xpB9g7j34r+J2hqrcW/lRI7dJaU84MxZM0Rt82tqYPQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: '@rollup/wasm-node' + rollup: npm:@rollup/wasm-node peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) - rollup: link:@rollup/wasm-node + '@rollup/pluginutils': 5.1.0(@rollup/wasm-node@4.9.4) + rollup: /@rollup/wasm-node@4.9.4 dev: false /@rollup/pluginutils@4.2.1: @@ -702,11 +705,11 @@ packages: picomatch: 2.3.1 dev: false - /@rollup/pluginutils@5.1.0(rollup@@rollup+wasm-node): + /@rollup/pluginutils@5.1.0(@rollup/wasm-node@4.9.4): resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: '@rollup/wasm-node' + rollup: npm:@rollup/wasm-node peerDependenciesMeta: rollup: optional: true @@ -714,9 +717,18 @@ packages: '@types/estree': 1.0.1 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: link:@rollup/wasm-node + rollup: /@rollup/wasm-node@4.9.4 dev: false + /@rollup/wasm-node@4.9.4: + resolution: {integrity: sha512-K9ZPYMCxP7sBElj5du0En/zpbhXTQxpWI7RlF+8bNpLUozhzg2Pcx2h3cBCzV7xtiUt0dc+pF2Ib3/Sg8R0JMA==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + dependencies: + '@types/estree': 1.0.5 + optionalDependencies: + fsevents: 2.3.3 + /@sindresorhus/merge-streams@1.0.0: resolution: {integrity: sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==} engines: {node: '>=18'} @@ -726,6 +738,9 @@ packages: resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==} dev: false + /@types/estree@1.0.5: + resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} + /@types/http-proxy@1.17.14: resolution: {integrity: sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==} dependencies: @@ -2050,7 +2065,6 @@ packages: engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] requiresBuild: true - dev: false optional: true /function-bind@1.1.1: @@ -2859,15 +2873,15 @@ packages: dependencies: '@cloudflare/kv-asset-handler': 0.3.0 '@netlify/functions': 2.4.1 - '@rollup/plugin-alias': 5.1.0(rollup@@rollup+wasm-node) - '@rollup/plugin-commonjs': 25.0.7(rollup@@rollup+wasm-node) - '@rollup/plugin-inject': 5.0.5(rollup@@rollup+wasm-node) - '@rollup/plugin-json': 6.1.0(rollup@@rollup+wasm-node) - '@rollup/plugin-node-resolve': 15.2.3(rollup@@rollup+wasm-node) - '@rollup/plugin-replace': 5.0.5(rollup@@rollup+wasm-node) - '@rollup/plugin-terser': 0.4.4(rollup@@rollup+wasm-node) - '@rollup/plugin-wasm': 6.2.2(rollup@@rollup+wasm-node) - '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) + '@rollup/plugin-alias': 5.1.0(@rollup/wasm-node@4.9.4) + '@rollup/plugin-commonjs': 25.0.7(@rollup/wasm-node@4.9.4) + '@rollup/plugin-inject': 5.0.5(@rollup/wasm-node@4.9.4) + '@rollup/plugin-json': 6.1.0(@rollup/wasm-node@4.9.4) + '@rollup/plugin-node-resolve': 15.2.3(@rollup/wasm-node@4.9.4) + '@rollup/plugin-replace': 5.0.5(@rollup/wasm-node@4.9.4) + '@rollup/plugin-terser': 0.4.4(@rollup/wasm-node@4.9.4) + '@rollup/plugin-wasm': 6.2.2(@rollup/wasm-node@4.9.4) + '@rollup/pluginutils': 5.1.0(@rollup/wasm-node@4.9.4) '@types/http-proxy': 1.17.14 '@vercel/nft': 0.24.4 archiver: 6.0.1 @@ -2908,8 +2922,8 @@ packages: pkg-types: 1.0.3 pretty-bytes: 6.1.1 radix3: 1.1.0 - rollup: link:@rollup/wasm-node - rollup-plugin-visualizer: 5.12.0(rollup@@rollup+wasm-node) + rollup: /@rollup/wasm-node@4.9.4 + rollup-plugin-visualizer: 5.12.0(@rollup/wasm-node@4.9.4) scule: 1.1.1 semver: 7.5.4 serve-placeholder: 2.0.1 @@ -2919,7 +2933,7 @@ packages: uncrypto: 0.1.3 unctx: 2.3.1 unenv: 1.9.0 - unimport: 3.7.1(rollup@@rollup+wasm-node) + unimport: 3.7.1(@rollup/wasm-node@4.9.4) unstorage: 1.10.1 transitivePeerDependencies: - '@azure/app-configuration' @@ -3386,19 +3400,19 @@ packages: dependencies: glob: 7.2.3 - /rollup-plugin-visualizer@5.12.0(rollup@@rollup+wasm-node): + /rollup-plugin-visualizer@5.12.0(@rollup/wasm-node@4.9.4): resolution: {integrity: sha512-8/NU9jXcHRs7Nnj07PF2o4gjxmm9lXIrZ8r175bT9dK8qoLlvKTwRMArRCMgpMGlq8CTLugRvEmyMeMXIU2pNQ==} engines: {node: '>=14'} hasBin: true peerDependencies: - rollup: '@rollup/wasm-node' + rollup: npm:@rollup/wasm-node peerDependenciesMeta: rollup: optional: true dependencies: open: 8.4.2 picomatch: 2.3.1 - rollup: link:@rollup/wasm-node + rollup: /@rollup/wasm-node@4.9.4 source-map: 0.7.4 yargs: 17.7.2 dev: false @@ -3891,10 +3905,10 @@ packages: engines: {node: '>=18'} dev: false - /unimport@3.7.1(rollup@@rollup+wasm-node): + /unimport@3.7.1(@rollup/wasm-node@4.9.4): resolution: {integrity: sha512-V9HpXYfsZye5bPPYUgs0Otn3ODS1mDUciaBlXljI4C2fTwfFpvFZRywmlOu943puN9sncxROMZhsZCjNXEpzEQ==} dependencies: - '@rollup/pluginutils': 5.1.0(rollup@@rollup+wasm-node) + '@rollup/pluginutils': 5.1.0(@rollup/wasm-node@4.9.4) acorn: 8.11.3 escape-string-regexp: 5.0.0 estree-walker: 3.0.3 From f47e4f9ec1044d6a8993cec83a3848bab8f42421 Mon Sep 17 00:00:00 2001 From: weeryan17 Date: Sun, 7 Jan 2024 12:29:42 -0500 Subject: [PATCH 4/5] Update workflows --- .github/workflows/cloudflare.yml | 4 ++-- .github/workflows/linting.yml | 12 ++++++------ .github/workflows/publish.yml | 13 ++++++++----- .github/workflows/release.yml | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cloudflare.yml b/.github/workflows/cloudflare.yml index f136b82..606bfa2 100644 --- a/.github/workflows/cloudflare.yml +++ b/.github/workflows/cloudflare.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 60 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: pnpm/action-setup@v2 with: @@ -20,7 +20,7 @@ jobs: - name: Install Node.js uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 20 cache: 'pnpm' - name: Install packages diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 4cfbb9c..d1e80df 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -14,16 +14,16 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - uses: pnpm/action-setup@v2 with: version: latest - name: Install Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'pnpm' - name: Install packages @@ -41,16 +41,16 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - uses: pnpm/action-setup@v2 with: version: latest - name: Install Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'pnpm' - name: Install pnpm packages diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3308cf9..cd2a8e0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,17 +19,17 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Docker buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Get version id: package-version uses: martinbeentjes/npm-get-version-action@main - name: Log into registry ${{ env.REGISTRY }} - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -37,7 +37,7 @@ jobs: - name: Extract Docker metadata id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} flavor: | @@ -47,9 +47,12 @@ jobs: - name: Build and push Docker image id: build-and-push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: push: true + platforms: linux/amd64,linux/arm64,linux/arm context: . labels: ${{ steps.meta.outputs.labels }} tags: ${{ steps.meta.outputs.tags }} + cache-from: type=gha + cache-to: type=gha,mode=max diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7ede8a4..fb7e367 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - uses: pnpm/action-setup@v2 with: From 6bb6914798ea046242d0d868470d5fde1c2bf2ea Mon Sep 17 00:00:00 2001 From: weeryan17 Date: Sun, 7 Jan 2024 12:47:41 -0500 Subject: [PATCH 5/5] Add docker build to testing --- .../workflows/{linting.yml => linting_testing.yml} | 14 ++++++++++++++ 1 file changed, 14 insertions(+) rename .github/workflows/{linting.yml => linting_testing.yml} (80%) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting_testing.yml similarity index 80% rename from .github/workflows/linting.yml rename to .github/workflows/linting_testing.yml index d1e80df..0d74f93 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting_testing.yml @@ -58,3 +58,17 @@ jobs: - name: Build Project run: pnpm build + + docker: + name: Build docker + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Build + uses: docker/build-push-action@v5