comparing 4c4c81b8aca7e521d4132358cdac2672642d9eb3 and main on pyrox.dev/blog

+19

.tangled/workflows/deploy.yaml

···

       1
       1
       +
       when:

     

       2
       2
       +
         - event: ["push"]

     

       3
       3
       +
           branch: ["main"]

     

       4
       4
       +
         - event: ["manual"]

     

       5
       5
       +
       

     

       6
       6
       +
       dependencies:

     

       7
       7
       +
         ## from nixpkgs

     

       8
       8
       +
         nixpkgs:

     

       9
       9
       +
           - nodejs

     

       10
       10
       +
           - git

     

       11
       11
       +
       steps:

     

       12
       12
       +
         - name: "Set up SSH Key"

     

       13
       13
       +
           command: "mkdir .ssh ; echo $SSH_KEY > .ssh/id_ed25519"

     

       14
       14
       +
       

     

       15
       15
       +
         - name: "Config Git"

     

       16
       16
       +
           command: "git config core.sshCommand 'ssh -i ~/.ssh/id_ed25519'"

     

       17
       17
       +
       

     

       18
       18
       +
         - name: "Deploy"

     

       19
       19
       +
           command: "./deploy.sh"

+35 -36

_config.ts

···

       44
       44
        
       import validateHTML from "./plugins/validateHTML.ts";

     

       45
       45
        
       import openInEditor from "./plugins/openInEditor.ts";

     

       46
       46
        
       import footnotes from "./plugins/footnotes.ts";

     

       47
       47
       -
       import checkAccessibility from "./plugins/checkAccessibility.ts";

     

       47
       47
       +
       // import checkAccessibility from "./plugins/checkAccessibility.ts";

     

       48
       48
        
       

     

       49
       49
        
       // Disabled Plugins:

     

       50
       50
        
       // import nav from "lume/plugins/nav.ts";

     
···

       57
       57
        
       // To Add:

     

       58
       58
        
       // https://deno.land/x/lume_shiki@0.0.16

     

       59
       59
        
       

     

       60
       60
       +
       const markdown = {

     

       61
       61
       +
         plugins: [

     

       62
       62
       +
           BiDirectionalLinks({

     

       63
       63
       +
             dir: Deno.cwd() + "/src/",

     

       64
       64
       +
             stillRenderNoMatched: false,

     

       65
       65
       +
             debug: false,

     

       66
       66
       +
           }),

     

       67
       67
       +
           mdItObsidianCallouts,

     

       68
       68
       +
           footnotes,

     

       69
       69
       +
         ],

     

       70
       70
       +
       };

     

       71
       71
       +
       

     

       60
       72
        
       const site = lume({

     

       61
       73
        
         src: "./src",

     

       62
       74
        
         location: new URL("https://pyrox.dev"),

     

       63
       63
       -
       }, {

     

       64
       64
       -
         markdown: {

     

       65
       65
       -
           plugins: [

     

       66
       66
       -
             [BiDirectionalLinks, {

     

       67
       67
       -
               dir: Deno.cwd() + "/src/",

     

       68
       68
       -
               stillRenderNoMatched: false,

     

       69
       69
       -
             }],

     

       70
       70
       -
             mdItObsidianCallouts,

     

       71
       71
       -
             footnotes,

     

       72
       72
       -
           ],

     

       73
       73
       -
         },

     

       74
       74
       -
       });

     

       75
       75
       +
         cssFile: "/styles.css",

     

       76
       76
       +
       }, { markdown });

     

       75
       77
        
       

     

       78
       78
       +
       // Ensure all URLs are to the final page links

     

       79
       79
       +
       site.use(resolveUrls());

     

       76
       80
        
       // Copy Static Files

     

       77
       77
       -
       site.ignore("/static/mocha.css");

     

       78
       78
       -
       site.add(".css");

     

       81
       81
       +
       // site.ignore("/static/mocha.css");

     

       79
       82
        
       site.add("static/.well-known", ".well-known");

     

       80
       80
       -
       site.add(".woff2");

     

       81
       81
       -
       // Tailwind CSS

     

       82
       82
       -
       site.use(tailwindcss());

     

       83
       83
        
       

     

       84
       84
        
       // Fonts

     

       85
       85
        
       site.use(

     

       86
       86
        
         googleFonts({

     

       87
       87
        
           subsets: ["latin", "latin-ext"],

     

       88
       88
       -
           folder: "/static/fonts/",

     

       89
       89
       -
           cssFile: "/static/fonts.css",

     

       88
       88
       +
           fontsFolder: "/static/fonts/",

     

       90
       89
        
           fonts:

     

       91
       90
        
             "https://fonts.googleapis.com/css2?family=IBM+Plex+Serif:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900",

     

       92
       91
        
         }),

     

       93
       92
        
       );

     

       94
       93
        
       

     

       94
       94
       +
       // Tailwind CSS

     

       95
       95
       +
       site.use(tailwindcss());

     

       96
       96
       +
       site.use(lightningcss({

     

       97
       97
       +
         options: {

     

       98
       98
       +
           minify: true,

     

       99
       99
       +
         },

     

       100
       100
       +
       }));

     

       101
       101
       +
       site.add([".css", ".woff2"]);

     

       102
       102
       +
       

     

       103
       103
       +
       // Source Map Generation

     

       104
       104
       +
       // Applies to CSS and JS

     

       105
       105
       +
       site.use(sourceMaps());

     

       106
       106
       +
       

     

       107
       107
       +
       site.use(slugifyUrls());

     

       95
       108
        
       site.use(picture());

     

       96
       109
        
       site.use(transformImages());

     

       97
       97
       -
       site.add(".png");

     

       110
       110
       +
       site.add([".png"]);

     

       98
       111
        
       // site.use(relations());

     

       99
       99
       -
       site.use(slugifyUrls());

     

       100
       112
        
       site.use(svgo());

     

       101
       113
        
       site.use(toml());

     

       102
       114
        
       

     
···

       118
       130
        
       site.use(toc({

     

       119
       131
        
         slugify: (s: string) => slugify(s),

     

       120
       132
        
       }));

     

       121
       121
       -
       

     

       122
       122
       -
       // Ensure all URLs are to the final page links

     

       123
       123
       -
       site.use(resolveUrls());

     

       124
       133
        
       

     

       125
       134
        
       // RSS/JSON Feed Generation

     

       126
       135
        
       site.use(

     
···

       151
       160
        
       );

     

       152
       161
        
       

     

       153
       162
        
       // CSS postprocessing

     

       154
       154
       -
       site.use(lightningcss({

     

       155
       155
       -
         options: {

     

       156
       156
       -
           minify: true,

     

       157
       157
       -
         },

     

       158
       158
       -
       }));

     

       159
       159
       -
       

     

       160
       163
        
       site.use(sitemap());

     

       161
       164
        
       

     

       162
       162
       -
       // Source Map Generation

     

       163
       163
       -
       // Applies to CSS and JS

     

       164
       164
       -
       site.use(sourceMaps());

     

       165
       165
       -
       

     

       166
       166
       -
       site.use(checkAccessibility());

     

       165
       165
       +
       // site.use(checkAccessibility());

     

       167
       166
        
       site.use(validateHTML());

     

       168
       167
        
       

     

       169
       168
        
       site.data("production", Deno.env.get("PRODUCTION") == "true");

+9 -3

deploy.sh

···

       1
       1
       +
       #!/usr/bin/env nix

     

       2
       2
       +
       #! nix develop --impure --command bash

     

       3
       3
       +
       

     

       4
       4
       +
       # Build site

     

       5
       5
       +
       deno task prod

     

       6
       6
       +
       

     

       1
       7
        
       COMMIT_ID=$(git rev-parse --short HEAD)

     

       2
       8
        
       

     

       3
       9
        
       echo "Cleaning up /tmp/pages..."

     
···

       17
       23
        
       

     

       18
       24
        
       echo "Making commit..."

     

       19
       25
        
       git add --all

     

       20
       20
       -
       git commit -m "Deploying $COMMIT_ID to PyroNet Git"

     

       26
       26
       +
       git commit -m "Deploying $COMMIT_ID to Tangled"

     

       21
       27
        
       

     

       22
       22
       -
       echo "Pushing to PyroNet Git..."

     

       23
       23
       -
       git remote add origin "https://git.pyrox.dev/pyrox/new-blog.git"

     

       28
       28
       +
       echo "Pushing to Tangled..."

     

       29
       29
       +
       git remote add origin " git@knot.pyrox.dev:pyrox.dev/blog"

     

       24
       30
        
       git push --force origin "pages:pages"

     

       25
       31
        
       

     

       26
       32
        
       echo "Cleaning up tmpdir..."

Compare changes