From 4a1db0938d5c1b75b30e9d6ebf7da4d5ea0024b0 Mon Sep 17 00:00:00 2001 From: Aaron Sherber Date: Tue, 10 Sep 2024 13:22:23 -0400 Subject: [PATCH 1/2] Deploy to AWS instead of Vercel Added AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY to secrets --- .github/workflows/deploy-to-aws.yml | 38 ++++++ package.json | 3 +- pnpm-lock.yaml | 175 +--------------------------- src/routes/__layout.svelte | 2 + src/routes/docs/rgp-lua.svelte | 2 +- svelte.config.js | 27 ++--- 6 files changed, 55 insertions(+), 192 deletions(-) create mode 100644 .github/workflows/deploy-to-aws.yml diff --git a/.github/workflows/deploy-to-aws.yml b/.github/workflows/deploy-to-aws.yml new file mode 100644 index 0000000..4709c0d --- /dev/null +++ b/.github/workflows/deploy-to-aws.yml @@ -0,0 +1,38 @@ +name: Deploy site to AWS + +on: + push: + pull_request: + branches: + - main + +jobs: + build_and_deploy: + name: Build and deploy + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@v4 + + - name: Setup node + uses: actions/setup-node@v4 + with: + node-version: '16' + + - name: Install dependencies + uses: pnpm/action-setup@v4 + with: + version: 8 + run_install: true + + - name: Build site + run: pnpm run build + + - name: Deploy to AWS + if: github.event_name == 'push' + uses: onramper/action-deploy-aws-static-site@v3.2.0 + with: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + domain: finalelua.com + publish_dir: ./build \ No newline at end of file diff --git a/package.json b/package.json index fbe6558..bf949a7 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "devDependencies": { "@nick-mazuk/eslint-config": "0.8.27", "@nick-mazuk/ui-config": "0.10.64", - "@sveltejs/adapter-vercel": "1.0.0-next.32", + "@sveltejs/adapter-static": "1.0.0-next.13", "@sveltejs/kit": "1.0.0-next.138", "@types/fs-extra": "9.0.9", "@types/js-search": "1.4.0", @@ -43,7 +43,6 @@ "@docsearch/js": "3", "@nick-mazuk/lib": "0.8.54", "@nick-mazuk/ui-svelte": "0.29.19", - "@sveltejs/adapter-static": "1.0.0-next.13", "date-fns": "2.23.0", "js-search": "2.0.0", "marked": "^11.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d8e1e6e..2e52af1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,9 +17,6 @@ dependencies: '@nick-mazuk/ui-svelte': specifier: 0.29.19 version: 0.29.19(@nick-mazuk/lib@0.8.54)(@nick-mazuk/ui-config@0.10.64)(@tiptap/extension-text-style@2.1.13)(tailwindcss@2.2.19) - '@sveltejs/adapter-static': - specifier: 1.0.0-next.13 - version: 1.0.0-next.13 date-fns: specifier: 2.23.0 version: 2.23.0 @@ -40,9 +37,9 @@ devDependencies: '@nick-mazuk/ui-config': specifier: 0.10.64 version: 0.10.64(tailwindcss@2.2.19) - '@sveltejs/adapter-vercel': - specifier: 1.0.0-next.32 - version: 1.0.0-next.32 + '@sveltejs/adapter-static': + specifier: 1.0.0-next.13 + version: 1.0.0-next.13 '@sveltejs/kit': specifier: 1.0.0-next.138 version: 1.0.0-next.138(svelte@3.38.2) @@ -456,12 +453,6 @@ packages: /@sveltejs/adapter-static@1.0.0-next.13: resolution: {integrity: sha512-zaXJlWK9JfrjrE6nG5etB8kf4DSkbE3H8Ql6gmCk3WjdvpY85a60TMYBU9OK2iunkqpHnPYiMUGEnOGYmWlLYA==} - dev: false - - /@sveltejs/adapter-vercel@1.0.0-next.32: - resolution: {integrity: sha512-ZcltaS5bAobGD5P0z7xJIjPHSlGpF7padMIkqTzJxwMEb/acGgdO5yzDS8XUEaSNgj+prpD2oG8+gm33ds8x0A==} - dependencies: - esbuild: 0.13.15 dev: true /@sveltejs/kit@1.0.0-next.138(svelte@3.38.2): @@ -1680,14 +1671,6 @@ packages: is-symbol: 1.0.4 dev: true - /esbuild-android-arm64@0.13.15: - resolution: {integrity: sha512-m602nft/XXeO8YQPUDVoHfjyRVPdPgjyyXOxZ44MK/agewFFkPa8tUo6lAzSWh5Ui5PB4KR9UIFTSBKh/RrCmg==} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - /esbuild-android-arm64@0.14.0: resolution: {integrity: sha512-X7BjFiRRNfxPNg1aT5zw4xK1vbvX2IvDPcEp4bv0CEXgR39UzuOMUsQoG92aZgj8JGs8jxQAZc8k9dVJ1WL2BA==} cpu: [arm64] @@ -1696,14 +1679,6 @@ packages: dev: true optional: true - /esbuild-darwin-64@0.13.15: - resolution: {integrity: sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ==} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /esbuild-darwin-64@0.14.0: resolution: {integrity: sha512-43vtt407jMp1kEXiaY0dEIGjOREax9F1+qMI0+F9tJyr06EHAofnbLL6cTmLgdPy/pMhltSvOJ8EddJrrOBgpQ==} cpu: [x64] @@ -1712,14 +1687,6 @@ packages: dev: true optional: true - /esbuild-darwin-arm64@0.13.15: - resolution: {integrity: sha512-i1FZssTVxUqNlJ6cBTj5YQj4imWy3m49RZRnHhLpefFIh0To05ow9DTrXROTE1urGTQCloFUXTX8QfGJy1P8dQ==} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /esbuild-darwin-arm64@0.14.0: resolution: {integrity: sha512-hMbT5YiBrFL763mnwR9BqNtq9XtJgJRxYs7Ad++KUd+ZhMoVE0Rs/YLe1oor9uBGhHLqQsZuJ2dUHjCsfT/iDg==} cpu: [arm64] @@ -1728,14 +1695,6 @@ packages: dev: true optional: true - /esbuild-freebsd-64@0.13.15: - resolution: {integrity: sha512-G3dLBXUI6lC6Z09/x+WtXBXbOYQZ0E8TDBqvn7aMaOCzryJs8LyVXKY4CPnHFXZAbSwkCbqiPuSQ1+HhrNk7EA==} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /esbuild-freebsd-64@0.14.0: resolution: {integrity: sha512-mx68HRYIZo6ZiHbWk5Md+mDJoDw779yWkJQAaBnXwOkGbDeA3JmPZjp6IPfy2P+n3emK9z6g4pKiebp1tQGVoQ==} cpu: [x64] @@ -1744,14 +1703,6 @@ packages: dev: true optional: true - /esbuild-freebsd-arm64@0.13.15: - resolution: {integrity: sha512-KJx0fzEDf1uhNOZQStV4ujg30WlnwqUASaGSFPhznLM/bbheu9HhqZ6mJJZM32lkyfGJikw0jg7v3S0oAvtvQQ==} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /esbuild-freebsd-arm64@0.14.0: resolution: {integrity: sha512-iM8u+zTagh0WGn2FTTxi7DII/ycVzYyuf2Df6eP2ZX+vlx2FjaduhagRkpyhjfmEyhfJOrYSAR5R1biNPcA+VA==} cpu: [arm64] @@ -1760,14 +1711,6 @@ packages: dev: true optional: true - /esbuild-linux-32@0.13.15: - resolution: {integrity: sha512-ZvTBPk0YWCLMCXiFmD5EUtB30zIPvC5Itxz0mdTu/xZBbbHJftQgLWY49wEPSn2T/TxahYCRDWun5smRa0Tu+g==} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-32@0.14.0: resolution: {integrity: sha512-dWHotI2qlXWZyza7n85UubBj0asjpM7FTtQYDaRQKxoCJpCnSzq3aD55IJthiggZHXj2tAML9Bc5xjVLsBJR0w==} cpu: [ia32] @@ -1776,14 +1719,6 @@ packages: dev: true optional: true - /esbuild-linux-64@0.13.15: - resolution: {integrity: sha512-eCKzkNSLywNeQTRBxJRQ0jxRCl2YWdMB3+PkWFo2BBQYC5mISLIVIjThNtn6HUNqua1pnvgP5xX0nHbZbPj5oA==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-64@0.14.0: resolution: {integrity: sha512-7buo31kp1/yKWPm9vU44FEUwkeIROrIgnCDV9KLMLSbOjGEHBZXYJ2L0p4ZnB7Z+m5YiW7F/AfJu0/1E87nOeQ==} cpu: [x64] @@ -1792,14 +1727,6 @@ packages: dev: true optional: true - /esbuild-linux-arm64@0.13.15: - resolution: {integrity: sha512-bYpuUlN6qYU9slzr/ltyLTR9YTBS7qUDymO8SV7kjeNext61OdmqFAzuVZom+OLW1HPHseBfJ/JfdSlx8oTUoA==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-arm64@0.14.0: resolution: {integrity: sha512-9LBtCH2RkhDBwoAYksTtXljN6hlxxoL6a3ymNfXJG9JxFUQddOfhajXZdObFn/hgGkAFwx8dXqw+FnPm0FCzSg==} cpu: [arm64] @@ -1808,14 +1735,6 @@ packages: dev: true optional: true - /esbuild-linux-arm@0.13.15: - resolution: {integrity: sha512-wUHttDi/ol0tD8ZgUMDH8Ef7IbDX+/UsWJOXaAyTdkT7Yy9ZBqPg8bgB/Dn3CZ9SBpNieozrPRHm0BGww7W/jA==} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-arm@0.14.0: resolution: {integrity: sha512-fgybXQwPRT4Io01+aD+yphcLOLRVGqbSdhvaDK3qBwqUvspFsq4QkI7PeeYpuQdBZWiRKLoi9v5r90l7JO/s+g==} cpu: [arm] @@ -1824,14 +1743,6 @@ packages: dev: true optional: true - /esbuild-linux-mips64le@0.13.15: - resolution: {integrity: sha512-KlVjIG828uFPyJkO/8gKwy9RbXhCEUeFsCGOJBepUlpa7G8/SeZgncUEz/tOOUJTcWMTmFMtdd3GElGyAtbSWg==} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-mips64le@0.14.0: resolution: {integrity: sha512-Xz7soOqWeCWcLp15biPM08To+s0k1E/2q0pQZNQ+SY9S5H2vU4ujDXqKjxFc24G9CrOeUNEOXTkh+JldBGbTCA==} cpu: [mips64el] @@ -1840,14 +1751,6 @@ packages: dev: true optional: true - /esbuild-linux-ppc64le@0.13.15: - resolution: {integrity: sha512-h6gYF+OsaqEuBjeesTBtUPw0bmiDu7eAeuc2OEH9S6mV9/jPhPdhOWzdeshb0BskRZxPhxPOjqZ+/OqLcxQwEQ==} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-ppc64le@0.14.0: resolution: {integrity: sha512-fuBXTyUaZKxpmp43Nf0M1uI1OmZv/COcME9PG7NQ/EniwC680Xj5xQFhEBDVnvQQ+6xOnXdfPSojJq7gQxrORQ==} cpu: [ppc64] @@ -1856,14 +1759,6 @@ packages: dev: true optional: true - /esbuild-netbsd-64@0.13.15: - resolution: {integrity: sha512-3+yE9emwoevLMyvu+iR3rsa+Xwhie7ZEHMGDQ6dkqP/ndFzRHkobHUKTe+NCApSqG5ce2z4rFu+NX/UHnxlh3w==} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: true - optional: true - /esbuild-netbsd-64@0.14.0: resolution: {integrity: sha512-pQaECTKr/iCXtn1qjwih+cvoZzbZ+P3NwLQo4uo/IesklbPTR5eF4d85L1vPFVgff+itBMxbbB7aoRznSglN3A==} cpu: [x64] @@ -1872,14 +1767,6 @@ packages: dev: true optional: true - /esbuild-openbsd-64@0.13.15: - resolution: {integrity: sha512-wTfvtwYJYAFL1fSs8yHIdf5GEE4NkbtbXtjLWjM3Cw8mmQKqsg8kTiqJ9NJQe5NX/5Qlo7Xd9r1yKMMkHllp5g==} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: true - optional: true - /esbuild-openbsd-64@0.14.0: resolution: {integrity: sha512-HiaqQX9HMb9u3eYvKZ86+m/paQwASJSIjXiRTFpFusypjtU2NJqWb/LiRvhfmwC6rb7YHwCSPx+juSM7M+20bA==} cpu: [x64] @@ -1888,14 +1775,6 @@ packages: dev: true optional: true - /esbuild-sunos-64@0.13.15: - resolution: {integrity: sha512-lbivT9Bx3t1iWWrSnGyBP9ODriEvWDRiweAs69vI+miJoeKwHWOComSRukttbuzjZ8r1q0mQJ8Z7yUsDJ3hKdw==} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: true - optional: true - /esbuild-sunos-64@0.14.0: resolution: {integrity: sha512-TkMQOSiSU3fHLV3M+OKUgLZt5L7TpcBcMRvtFw1cTxAnX8eT+1qkWVLiDM8ow1C3P7PW3bkGY3LW8vOs8o/jBA==} cpu: [x64] @@ -1904,14 +1783,6 @@ packages: dev: true optional: true - /esbuild-windows-32@0.13.15: - resolution: {integrity: sha512-fDMEf2g3SsJ599MBr50cY5ve5lP1wyVwTe6aLJsM01KtxyKkB4UT+fc5MXQFn3RLrAIAZOG+tHC+yXObpSn7Nw==} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - /esbuild-windows-32@0.14.0: resolution: {integrity: sha512-0h7E50JHgyLd7TkqSIH0VzBhngWspxPHuq/crDAMnh4s4tW8zWCMLIz2c1HVwHfZsh7d5+C4/yBaQeJTHXGvIA==} cpu: [ia32] @@ -1920,14 +1791,6 @@ packages: dev: true optional: true - /esbuild-windows-64@0.13.15: - resolution: {integrity: sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ==} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /esbuild-windows-64@0.14.0: resolution: {integrity: sha512-RxnovPOoQS5Id4mbdIUm96L0GIg+ZME4FthbErw1kZZabLi9eLp1gR3vSwkZXKbK8Z76uDkSW0EN74i1XWVpiQ==} cpu: [x64] @@ -1936,14 +1799,6 @@ packages: dev: true optional: true - /esbuild-windows-arm64@0.13.15: - resolution: {integrity: sha512-zzvyCVVpbwQQATaf3IG8mu1IwGEiDxKkYUdA4FpoCHi1KtPa13jeScYDjlW0Qh+ebWzpKfR2ZwvqAQkSWNcKjA==} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /esbuild-windows-arm64@0.14.0: resolution: {integrity: sha512-66KsVlT6lGDWgDKQsAlojxgUhZkkjVeosMVRdb913OwtcOjszceg6zFD748jzp9CUgAseHCNJqFmYOyBzneSEQ==} cpu: [arm64] @@ -1958,30 +1813,6 @@ packages: requiresBuild: true dev: true - /esbuild@0.13.15: - resolution: {integrity: sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw==} - hasBin: true - requiresBuild: true - optionalDependencies: - esbuild-android-arm64: 0.13.15 - esbuild-darwin-64: 0.13.15 - esbuild-darwin-arm64: 0.13.15 - esbuild-freebsd-64: 0.13.15 - esbuild-freebsd-arm64: 0.13.15 - esbuild-linux-32: 0.13.15 - esbuild-linux-64: 0.13.15 - esbuild-linux-arm: 0.13.15 - esbuild-linux-arm64: 0.13.15 - esbuild-linux-mips64le: 0.13.15 - esbuild-linux-ppc64le: 0.13.15 - esbuild-netbsd-64: 0.13.15 - esbuild-openbsd-64: 0.13.15 - esbuild-sunos-64: 0.13.15 - esbuild-windows-32: 0.13.15 - esbuild-windows-64: 0.13.15 - esbuild-windows-arm64: 0.13.15 - dev: true - /esbuild@0.14.0: resolution: {integrity: sha512-UOnSKRAyZondxdLrOXnI/mesUmU/GvDTcajCvxoIaObzMeQcn0HyoGtvbfATnazlx799ZqFSyIZGLXFszkjy3A==} hasBin: true diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index b0d4cf6..e99aa0d 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -22,6 +22,8 @@ const githubRepoUrl = 'https://github.com/finale-lua/lua-scripts' const facebookGroupUrl = 'https://www.facebook.com/groups/742277119576336/' + export const prerender = true + const helpPages: TocItems = [ { text: 'Install plugin', diff --git a/src/routes/docs/rgp-lua.svelte b/src/routes/docs/rgp-lua.svelte index d5a16a0..1b56e38 100644 --- a/src/routes/docs/rgp-lua.svelte +++ b/src/routes/docs/rgp-lua.svelte @@ -60,7 +60,7 @@ Lua is case sensitive. The basic Lua syntax is very similar to other computer la However, to really take advantage of the full power of Lua, there are other very powerful tools (such as iterators, closures and coroutines) to explore. -Both _RGP Lua_ and _JW Lua_ include all the standard Lua modules (\`string\`, \`math\`, \`file\`, etc). Additionally, _RGP Lua_ embeds [\`luasocket\`](https://aiq0.github.io/luasocket/index.html) if you select the **Enable Debugging** option when you [configure](/docs/rgp-lua//docs/rgp-lua/rgp-lua-configuration) it (or with the \`finaleplugin.LoadLuaSocket\` option). These modules can be used in any Finale Lua script, such as : +Both _RGP Lua_ and _JW Lua_ include all the standard Lua modules (\`string\`, \`math\`, \`file\`, etc). Additionally, _RGP Lua_ embeds [\`luasocket\`](https://aiq0.github.io/luasocket/index.html) if you select the **Enable Debugging** option when you [configure](/docs/rgp-lua/rgp-lua-configuration) it (or with the \`finaleplugin.LoadLuaSocket\` option). These modules can be used in any Finale Lua script, such as : \`\`\`lua print (math.random(1, 10)) diff --git a/svelte.config.js b/svelte.config.js index 4582ca9..490608b 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,4 +1,4 @@ -import adapter from '@sveltejs/adapter-vercel' +import adapter from '@sveltejs/adapter-static' import sveltePreprocess from 'svelte-preprocess' import { imagetools } from 'vite-imagetools' import imagePreprocess from './image-preprocess.cjs' @@ -14,21 +14,14 @@ export default { imagePreprocess(), ], kit: { - adapter: adapter(), - target: '#svelte', - files: { - assets: 'static', - hooks: 'src/hooks', - lib: 'src/lib', - routes: 'src/routes', - serviceWorker: 'src/service-worker', - template: 'src/app.html', - }, - prerender: { - pages: ['*'], - }, - vite: { - plugins: [imagetools()], - }, + adapter: adapter({ + // default options are shown. On some platforms + // these options are set automatically — see below + pages: 'build', + assets: 'build', + fallback: undefined, + precompress: false, + strict: true + }) }, } From 52b763b90045f39ca1bf49824e6382cdadb3b127 Mon Sep 17 00:00:00 2001 From: Aaron Sherber Date: Sun, 15 Dec 2024 16:55:23 -0500 Subject: [PATCH 2/2] Only run on pushes to main --- .github/workflows/deploy-to-aws.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-to-aws.yml b/.github/workflows/deploy-to-aws.yml index 4709c0d..c13cd3b 100644 --- a/.github/workflows/deploy-to-aws.yml +++ b/.github/workflows/deploy-to-aws.yml @@ -2,6 +2,8 @@ name: Deploy site to AWS on: push: + branches: + - main pull_request: branches: - main