From 075debe3e267ec8046c28817170c6ceba658d461 Mon Sep 17 00:00:00 2001 From: pnwmatt <180812017+pnwmatt@users.noreply.github.com> Date: Thu, 6 Feb 2025 19:49:47 -0800 Subject: [PATCH 1/7] Update deploy --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6a2eb1e..5a82685 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "copy-assets": "rimraf build && mkdir -p build/v2 && cp -r public/* build/v2", "debug": "elm-live src/Main.elm --warn --dir=public/ --port=3000 -- --output=public/app.js --debug", "debug:all": "./scripts/watch-live.sh", - "deploy": "npm run build && npm run optimize && gh-pages --add --dist build/", + "deploy": "npm run build && npm run optimize && gh-pages --add --dist build/v2", "optimize": "uglifyjs build/v2/app.js -c -m -o build/v2/app.js", "live": "elm-live src/Main.elm --port=3000 --dir=public/ -- --output=public/app.js", "live:style": "chokidar 'public/**/*.css' -c 'touch src/Main.elm'", From 97cdf9e31b54302179574a56023086bbc3a6e633 Mon Sep 17 00:00:00 2001 From: pnwmatt <180812017+pnwmatt@users.noreply.github.com> Date: Thu, 6 Feb 2025 19:57:44 -0800 Subject: [PATCH 2/7] Tweaks --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a82685..ab8a693 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "copy-assets": "rimraf build && mkdir -p build/v2 && cp -r public/* build/v2", "debug": "elm-live src/Main.elm --warn --dir=public/ --port=3000 -- --output=public/app.js --debug", "debug:all": "./scripts/watch-live.sh", - "deploy": "npm run build && npm run optimize && gh-pages --add --dist build/v2", + "deploy": "npm run build && npm run optimize && gh-pages --dist build/v2", "optimize": "uglifyjs build/v2/app.js -c -m -o build/v2/app.js", "live": "elm-live src/Main.elm --port=3000 --dir=public/ -- --output=public/app.js", "live:style": "chokidar 'public/**/*.css' -c 'touch src/Main.elm'", From e152bb13a8716089525e23a89baed80a5889fa5e Mon Sep 17 00:00:00 2001 From: pnwmatt <180812017+pnwmatt@users.noreply.github.com> Date: Thu, 6 Feb 2025 19:58:59 -0800 Subject: [PATCH 3/7] Prevent github from building jekyll --- .nojekyll | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .nojekyll diff --git a/.nojekyll b/.nojekyll new file mode 100644 index 0000000..e69de29 From 49eca809191e8294f6da9a952c2f048ee0637f84 Mon Sep 17 00:00:00 2001 From: pnwmatt <180812017+pnwmatt@users.noreply.github.com> Date: Thu, 6 Feb 2025 19:59:55 -0800 Subject: [PATCH 4/7] Tell Github not to jekyll build --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ab8a693..1a40fb6 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "copy-assets": "rimraf build && mkdir -p build/v2 && cp -r public/* build/v2", "debug": "elm-live src/Main.elm --warn --dir=public/ --port=3000 -- --output=public/app.js --debug", "debug:all": "./scripts/watch-live.sh", - "deploy": "npm run build && npm run optimize && gh-pages --dist build/v2", + "deploy": "npm run build && npm run optimize && gh-pages --dotfiles --dist build/v2", "optimize": "uglifyjs build/v2/app.js -c -m -o build/v2/app.js", "live": "elm-live src/Main.elm --port=3000 --dir=public/ -- --output=public/app.js", "live:style": "chokidar 'public/**/*.css' -c 'touch src/Main.elm'", From 2dfcf6a51f2b77f02c2267ca82f2c1209c9321f5 Mon Sep 17 00:00:00 2001 From: pnwmatt <180812017+pnwmatt@users.noreply.github.com> Date: Thu, 6 Feb 2025 20:08:16 -0800 Subject: [PATCH 5/7] Move nojekyll to the right spot --- .nojekyll => public/.nojekyll | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .nojekyll => public/.nojekyll (100%) diff --git a/.nojekyll b/public/.nojekyll similarity index 100% rename from .nojekyll rename to public/.nojekyll From 408ff19a0ea24558125f862f0b08a71a991e5e52 Mon Sep 17 00:00:00 2001 From: pnwmatt <180812017+pnwmatt@users.noreply.github.com> Date: Thu, 6 Feb 2025 20:08:47 -0800 Subject: [PATCH 6/7] Manually move .nojekyll to the right spot --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1a40fb6..10c3c2b 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "An alternative Web client for Mastodon.", "scripts": { "build": "npm run copy-assets && elm make src/Main.elm --optimize --output=build/v2/app.js", - "copy-assets": "rimraf build && mkdir -p build/v2 && cp -r public/* build/v2", + "copy-assets": "rimraf build && mkdir -p build/v2 && cp -r public/* build/v2 && cp public/.nojekyll build/v2/.", "debug": "elm-live src/Main.elm --warn --dir=public/ --port=3000 -- --output=public/app.js --debug", "debug:all": "./scripts/watch-live.sh", "deploy": "npm run build && npm run optimize && gh-pages --dotfiles --dist build/v2", From e04bd3c6faf9393f99ba4cc707324af0d5d35b69 Mon Sep 17 00:00:00 2001 From: pnwmatt <180812017+pnwmatt@users.noreply.github.com> Date: Thu, 6 Feb 2025 20:25:26 -0800 Subject: [PATCH 7/7] Instead of storing a file, just touch the .nojekyll file --- package.json | 2 +- public/.nojekyll | 0 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 public/.nojekyll diff --git a/package.json b/package.json index 10c3c2b..5e3556f 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "An alternative Web client for Mastodon.", "scripts": { "build": "npm run copy-assets && elm make src/Main.elm --optimize --output=build/v2/app.js", - "copy-assets": "rimraf build && mkdir -p build/v2 && cp -r public/* build/v2 && cp public/.nojekyll build/v2/.", + "copy-assets": "rimraf build && mkdir -p build/v2 && cp -r public/* build/v2 && touch build/v2/.nojekyll", "debug": "elm-live src/Main.elm --warn --dir=public/ --port=3000 -- --output=public/app.js --debug", "debug:all": "./scripts/watch-live.sh", "deploy": "npm run build && npm run optimize && gh-pages --dotfiles --dist build/v2", diff --git a/public/.nojekyll b/public/.nojekyll deleted file mode 100644 index e69de29..0000000