Skip to content

Commit

Permalink
Merge pull request #5 from thuliteio/next
Browse files Browse the repository at this point in the history
Update for migration from Hyas to Thulite
  • Loading branch information
h-enk authored Sep 3, 2024
2 parents 5d8383c + c2dde4f commit 2cecf5c
Show file tree
Hide file tree
Showing 97 changed files with 1,037 additions and 991 deletions.
22 changes: 22 additions & 0 deletions .codesandbox/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
// These tasks will run in order when initializing your CodeSandbox project.
"setupTasks": [
{
"name": "Install Dependencies",
"command": "npm install"
}
],

// These tasks can be run from CodeSandbox. Running one will open a log in the app.
"tasks": {
"start": {
"name": "dev",
"command": "npm run dev -- --baseURL=/ --appendPort=false --liveReloadPort=443 --bind=0.0.0.0",
"runAtStart": true
},
"install": {
"name": "install dependencies",
"command": "npm install"
}
}
}
19 changes: 19 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04

RUN apt-get update && \
apt-get install -y \
ca-certificates \
nodejs \
npm \
wget && \
update-ca-certificates

ARG HUGO_VERSION="0.131.0"
RUN wget --quiet "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz" && \
tar xzf hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz && \
rm -r hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz && \
mv hugo /usr/bin && \
chmod 755 /usr/bin/hugo

WORKDIR /src
COPY ./ /src
5 changes: 5 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"build": {
"dockerfile": "./Dockerfile"
}
}
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Sample workflow for building and deploying a Hyas site to GitHub Pages
name: Deploy Hyas site to Pages
# Sample workflow for building and deploying a Thulite site to GitHub Pages
name: Deploy Thulite site to Pages

on:
# Runs on pushes targeting the default branch
Expand Down Expand Up @@ -32,7 +32,7 @@ jobs:
build:
runs-on: ubuntu-latest
env:
HUGO_VERSION: 0.126.0
HUGO_VERSION: 0.131.0
steps:
- name: Install Hugo CLI
run: |
Expand Down
8 changes: 6 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
!.npmrc
!.gitignore
.env
.netlify
.hugo_build.lock
node_modules
public
resources
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020-2024 Hyas
Copyright (c) 2020-2024 Thulite

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Deploy Doks to GitHub Pages

Example repo showing how to publish your Doks site to GitHub Pages by using [GitHub Actions](https://github.com/features/actions) to automatically build and deploy your site.
Example repo showing how to publish your Doks site to GitHub Pages by using [GitHub Actions](https://docs.github.com/en/actions) to automatically build and deploy your site.

Our [Deploy your Hyas Site to GitHub Pages](https://docs.gethyas.com/guides/deploy/github/) guide has step-by-step instructions for deploying your Doks/Hyas site to GitHub pages.
Our [Deploy your Thulite Site to GitHub Pages](https://docs.thulite.io/guides/deploy/github/) guide has step-by-step instructions for deploying your Doks/Thulite site to GitHub pages.
2 changes: 1 addition & 1 deletion assets/jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"compilerOptions": {
"baseUrl": ".",
"paths": {
"*": ["*", "..\\node_modules\\@hyas\\doks-core\\assets\\*"]
"*": ["*", "..\\node_modules\\@thulite\\doks-core\\assets\\*"]
}
}
}
4 changes: 2 additions & 2 deletions config/_default/hugo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
title = "My Docs"
baseurl = "http://localhost:1313/doks-gh-pages/"
baseurl = "http://localhost/"
canonifyURLs = false
disableAliases = true
disableHugoGeneratorInject = true
Expand All @@ -17,7 +17,7 @@ defaultContentLanguage = "en"
disableLanguages = ["de", "nl"]
defaultContentLanguageInSubdir = false

copyRight = "Copyright (c) 2020-2024 Hyas"
copyRight = "Copyright (c) 2020-2024 Thulite"

[build.buildStats]
enable = true
Expand Down
4 changes: 2 additions & 2 deletions config/_default/languages.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[en.params]
languageISO = "EN"
languageTag = "en-US"
footer = 'Brought to you by <a class="text-muted" href="https://gethyas.com/">Hyas</a>'
footer = 'Brought to you by <a class="text-muted" href="https://thulite.io/">Thulite</a>'
alertText = '<a class="alert-link stretched-link fw-normal" href="/blog/example-post/">Doks version 1.0 just shipped!</a>'

[de]
Expand All @@ -15,7 +15,7 @@
[de.params]
languageISO = "DE"
languageTag = "de-DE"
footer = 'Gebaut mit <a class="text-muted" href="https://gethyas.com/">Hyas</a>'
footer = 'Gebaut mit <a class="text-muted" href="https://thulite.io/">Thulite</a>'
alertText = 'Neue Version ist da! <a class="alert-link stretched-link" href="https://getdoks.org/blog/doks-v0.5/">Doks v0.5</a>'

[nl]
Expand Down
4 changes: 2 additions & 2 deletions config/_default/markup.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ defaultMarkdownHandler = "goldmark"
lineNumbersInTable = false
noClasses = false
noHl = false
style = 'github-dark'
tabWidth = 4
style = 'monokai'
tabWidth = 2

[tableOfContents]
endLevel = 3
Expand Down
14 changes: 0 additions & 14 deletions config/_default/menus.toml

This file was deleted.

21 changes: 18 additions & 3 deletions config/_default/menus/menus.en.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
weight = 30

# [[social]]
# name = "Twitter"
# name = "X"
# pre = '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-brand-x" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M4 4l11.733 16h4.267l-11.733 -16z"></path><path d="M4 20l6.768 -6.768m2.46 -2.46l6.772 -6.772"></path></svg>'
# url = "https://twitter.com/getdoks"
# weight = 10
#
#
# [[social]]
# name = "Discord"
# pre = '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-brand-discord" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M8 12a1 1 0 1 0 2 0a1 1 0 0 0 -2 0"></path><path d="M14 12a1 1 0 1 0 2 0a1 1 0 0 0 -2 0"></path><path d="M8.5 17c0 1 -1.356 3 -1.832 3c-1.429 0 -2.698 -1.667 -3.333 -3c-.635 -1.667 -.476 -5.833 1.428 -11.5c1.388 -1.015 2.782 -1.34 4.237 -1.5l.975 1.923a11.913 11.913 0 0 1 4.053 0l.972 -1.923c1.5 .16 3.043 .485 4.5 1.5c2 5.667 2.167 9.833 1.5 11.5c-.667 1.333 -2 3 -3.5 3c-.5 0 -2 -2 -2 -3"></path><path d="M7 16.5c3.5 1 6.5 1 10 0"></path></svg>'
Expand All @@ -54,10 +54,25 @@
[[social]]
name = "GitHub"
pre = '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-brand-github" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M9 19c-4.3 1.4 -4.3 -2.5 -6 -3m12 5v-3.5c0 -1 .1 -1.4 -.5 -2c2.8 -.3 5.5 -1.4 5.5 -6a4.6 4.6 0 0 0 -1.3 -3.2a4.2 4.2 0 0 0 -.1 -3.2s-1.1 -.3 -3.5 1.3a12.3 12.3 0 0 0 -6.2 0c-2.4 -1.6 -3.5 -1.3 -3.5 -1.3a4.2 4.2 0 0 0 -.1 3.2a4.6 4.6 0 0 0 -1.3 3.2c0 4.6 2.7 5.7 5.5 6c-.6 .6 -.6 1.2 -.5 2v3.5"></path></svg>'
url = "https://github.com/gethyas/doks"
url = "https://github.com/thuliteio/doks"
post = "v0.1.0"
weight = 30

# [[sidebar_docs]]
# name = "Guides"
# pageRef = "/docs/guides"
# weight = 10
#
# [[sidebar_docs]]
# name = "Reference"
# pageRef = "/docs/reference"
# weight = 20
#
# [[sidebar_docs]]
# name = "Resources"
# pageRef = "/docs/resources"
# weight = 30

[[footer]]
name = "Privacy Policy"
url = "/privacy/"
Expand Down
2 changes: 1 addition & 1 deletion config/_default/menus/menus.nl.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
weight = 10

[[social]]
name = "Twitter"
name = "X"
pre = "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\" class=\"feather feather-twitter\"><path d=\"M23 3a10.9 10.9 0 0 1-3.14 1.53 4.48 4.48 0 0 0-7.86 3v1A10.66 10.66 0 0 1 3 4s-4 9 5 13a11.64 11.64 0 0 1-7 2c9 5 20 0 20-11.5a4.5 4.5 0 0 0-.08-.83A7.72 7.72 0 0 0 23 3z\"></path></svg>"
url = "https://twitter.com/getdoks"
weight = 20
Expand Down
26 changes: 13 additions & 13 deletions config/_default/module.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# mounts
## archetypes
[[mounts]]
source = "node_modules/@hyas/doks-core/archetypes"
source = "node_modules/@thulite/doks-core/archetypes"
target = "archetypes"

[[mounts]]
Expand All @@ -10,15 +10,15 @@

## assets
[[mounts]]
source = "node_modules/@hyas/core/assets"
source = "node_modules/@thulite/core/assets"
target = "assets"

[[mounts]]
source = "node_modules/@hyas/images/assets"
source = "node_modules/@thulite/images/assets"
target = "assets"

[[mounts]]
source = "node_modules/@hyas/doks-core/assets"
source = "node_modules/@thulite/doks-core/assets"
target = "assets"

[[mounts]]
Expand All @@ -36,7 +36,7 @@

## data
[[mounts]]
source = "node_modules/@hyas/doks-core/data"
source = "node_modules/@thulite/doks-core/data"
target = "data"

[[mounts]]
Expand All @@ -45,7 +45,7 @@

## i18n
[[mounts]]
source = "node_modules/@hyas/doks-core/i18n"
source = "node_modules/@thulite/doks-core/i18n"
target = "i18n"

[[mounts]]
Expand All @@ -54,23 +54,23 @@

## layouts
[[mounts]]
source = "node_modules/@hyas/core/layouts"
source = "node_modules/@thulite/core/layouts"
target = "layouts"

[[mounts]]
source = "node_modules/@hyas/seo/layouts"
source = "node_modules/@thulite/seo/layouts"
target = "layouts"

[[mounts]]
source = "node_modules/@hyas/images/layouts"
source = "node_modules/@thulite/images/layouts"
target = "layouts"

[[mounts]]
source = "node_modules/@hyas/doks-core/layouts"
source = "node_modules/@thulite/doks-core/layouts"
target = "layouts"

[[mounts]]
source = "node_modules/@hyas/inline-svg/layouts"
source = "node_modules/@thulite/inline-svg/layouts"
target = "layouts"

[[mounts]]
Expand All @@ -79,9 +79,9 @@

## static
[[mounts]]
source = "node_modules/@hyas/doks-core/static"
source = "node_modules/@thulite/doks-core/static"
target = "static"

[[mounts]]
source = "static"
target = "static"
target = "static"
16 changes: 8 additions & 8 deletions config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ mainSections = ["docs"]
[social]
twitter = "getdoks"

# Doks (@hyas/doks-core)
# Doks (@thulite/doks-core)
[doks]
# Color mode
colorMode = "auto" # auto (default), light or dark
Expand Down Expand Up @@ -100,9 +100,9 @@ mainSections = ["docs"]
errorLevel = 'ignore' # ignore (default), warning, or error (fails the build)
highlightBroken = false # true or false (default)

# Images (@hyas/images)
[hyas_images]
[hyas_images.defaults]
# Images (@thulite/images)
[thulite_images]
[thulite_images.defaults]
decoding = "async" # sync, async, or auto (default)
fetchpriority = "auto" # high, low, or auto (default)
loading = "lazy" # eager or lazy (default)
Expand All @@ -111,11 +111,11 @@ mainSections = ["docs"]
process = "" # "fill 1600x900" or "fill 2100x900" for example
lqip = "16x webp q20" # "16x webp q20" or "21x webp q20" for example

# Inline SVG (@hyas/inline-svg)
# Inline SVG (@thulite/inline-svg)
[inline_svg]
iconSetDir = "tabler-icons" # "tabler-icons" (default)

# SEO (@hyas/seo)
# SEO (@thulite/seo)
[seo]
[seo.title]
separator = " | "
Expand All @@ -129,8 +129,8 @@ mainSections = ["docs"]
[seo.schemas]
type = "Organization" # Organization (default) or Person
logo = "favicon-512x512.png" # Logo of Organization — favicon-512x512.png (default)
name = "Hyas" # Name of Organization or Person
sameAs = [] # E.g. ["https://github.com/gethyas/hyas", "https://fosstodon.org/@hyas"]
name = "Thulite" # Name of Organization or Person
sameAs = [] # E.g. ["https://github.com/thuliteio/thulite", "https://fosstodon.org/@thulite"]
images = ["cover.png"] # ["cover.png"] (default)
article = [] # Article sections
newsArticle = [] # NewsArticle sections
Expand Down
30 changes: 15 additions & 15 deletions config/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module.exports = {
presets: [
[
'@babel/preset-env',
{
targets: {
browsers: [
// Best practice: https://github.com/babel/babel/issues/7789
'>=1%',
'not ie 11',
'not op_mini all',
],
},
},
],
],
presets: [
[
'@babel/preset-env',
{
targets: {
browsers: [
// Best practice: https://github.com/babel/babel/issues/7789
'>=1%',
'not ie 11',
'not op_mini all'
]
}
}
]
]
};
1 change: 1 addition & 0 deletions config/next/hugo.toml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# Overrides for next environment
baseurl = "/"
3 changes: 2 additions & 1 deletion config/postcss.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ module.exports = {
'hiding',
'page-item',
'page-link',
...whitelister(['./assets/scss/**/*.scss', './node_modules/@hyas/doks-core/assets/scss/components/_code.scss', './node_modules/@hyas/doks-core/assets/scss/components/_expressive-code.scss', './node_modules/@hyas/doks-core/assets/scss/common/_syntax.scss'])
'not-content',
...whitelister(['./assets/scss/**/*.scss', './node_modules/@thulite/doks-core/assets/scss/components/_code.scss', './node_modules/@thulite/doks-core/assets/scss/components/_expressive-code.scss', './node_modules/@thulite/doks-core/assets/scss/common/_syntax.scss'])
]
})
]
Expand Down
2 changes: 1 addition & 1 deletion config/production/hugo.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Overrides for production environment
baseurl = "https://gethyas.github.io/doks-gh-pages/"
baseurl = "/"
Loading

0 comments on commit 2cecf5c

Please sign in to comment.