Skip to content

Commit

Permalink
Merge branch 'master' into twios-2024-08-11
Browse files Browse the repository at this point in the history
  • Loading branch information
BobrImperator committed Jan 14, 2025
2 parents eabdbcf + e48f311 commit 9ea2ee4
Show file tree
Hide file tree
Showing 574 changed files with 10,849 additions and 22,859 deletions.
6 changes: 6 additions & 0 deletions .eleventy.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ module.exports = function (eleventyConfig) {
eleventyConfig.addCollection("elixirPosts", require("./collections/elixirPosts"));
eleventyConfig.addCollection("rustPosts", require("./collections/rustPosts"));
eleventyConfig.addCollection("sveltePosts", require("./collections/sveltePosts"));
eleventyConfig.addCollection("travelPosts", require("./collections/travelPosts"));
eleventyConfig.addCollection("authors", require("./collections/authors"));
eleventyConfig.addCollection("authorsPostsPaged", require("./collections/authorsPostsPaged"));
eleventyConfig.addCollection("tags", require("./collections/tags"));
Expand Down Expand Up @@ -224,6 +225,11 @@ module.exports = function (eleventyConfig) {
return response.data.replace("<svg", `<svg focusable="false" role="presentation"`);
});

eleventyConfig.addShortcode("mastodonHandleUrl", handle => {
const [user, server] = handle.split("@").filter(Boolean);
return `https://${server}/@${user}`;
});

eleventyConfig.setServerOptions({
watch: ["./dist/assets/css/*.css", "./dist/assets/js/*.js"],
});
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ jobs:
lint:
name: Linting
runs-on: ubuntu-latest
if: ${{ github.event_name != 'schedule' }}

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/setup-node@v4
with:
registry-url: "https://registry.npmjs.org"
Expand All @@ -34,9 +35,10 @@ jobs:
visual-regressions:
name: 'Visual Regressions'
runs-on: ubuntu-latest
if: ${{ github.event_name != 'schedule' }}

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/setup-node@v4
with:
registry-url: "https://registry.npmjs.org"
Expand All @@ -62,9 +64,10 @@ jobs:
performance:
name: 'Performance'
runs-on: ubuntu-latest
if: ${{ github.event_name != 'schedule' }}

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: actions/setup-node@v4
Expand All @@ -91,9 +94,10 @@ jobs:
crawl:
name: 'Crawl Links'
runs-on: ubuntu-latest
if: ${{ github.event_name != 'schedule' }}

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: actions/setup-node@v4
Expand All @@ -118,9 +122,10 @@ jobs:
gravity:
name: 'Gravity'
runs-on: ubuntu-latest
if: ${{ github.event_name != 'schedule' }}

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ module.exports = {
{
files: "*.md",
options: {
proseWrap: "never",
printWidth: 80,
proseWrap: "always",
},
},
{
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ The source code for [https://mainmatter.com](https://mainmatter.com).

## Copyright

Copyright &copy; 2019-2022 Mainmatter GmbH (https://mainmatter.com), released
under the
[Creative Commons Attribution-NonCommercial 4.0 International license](https://creativecommons.org/licenses/by-nc/4.0/).
Copyright &copy; 2019-2022 Mainmatter GmbH (https://mainmatter.com), released under the [Creative Commons Attribution-NonCommercial 4.0 International license](https://creativecommons.org/licenses/by-nc/4.0/).
10 changes: 10 additions & 0 deletions collections/travelPosts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const livePosts = require("./posts");

module.exports = collection => {
const allPosts = livePosts(collection);
return allPosts.filter(
post =>
Array.isArray(post.data.tags) &&
post.data.tags.some(t => t.match(/^process/) || t.match(/^culture/) || t.match(/^consulting/))
);
};
18 changes: 13 additions & 5 deletions config/this-week-in-open-source.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
"rust-lang/www.rust-lang.org",
"dimforge/rapier.rs",
"marcoow/pacesetter",
"mainmatter/cargo-autoinherit"
"mainmatter/cargo-autoinherit",
"mainmatter/100-exercises-to-learn-rust",
"mainmatter/gerust"
]
},
{
Expand Down Expand Up @@ -88,7 +90,8 @@
"sveltejs/language-tools",
"svecosystem/runed",
"mainmatter/sheepdog",
"paoloricciuti/optimistikit"
"paoloricciuti/optimistikit",
"animotionjs/animotion"
]
},
{
Expand Down Expand Up @@ -205,7 +208,9 @@
"adopted-ember-addons/ember-drag-drop",
"tleunen/babel-plugin-module-resolver",
"snewcomer/intersection-observer-admin",
"mansona/auto-reveal-theme-mainmatter"
"mansona/auto-reveal-theme-mainmatter",
"formatjs/formatjs",
"vitejs/vite"
]
},
{
Expand Down Expand Up @@ -464,7 +469,9 @@
"ember-cli/ember-cli-deprecation-workflow",
"ember-cli/babel-plugin-debug-macros",
"adopted-ember-addons/ember-sortable",
"elwayman02/ember-resize-modifier"
"elwayman02/ember-resize-modifier",
"ember-codemods/tagless-ember-components-codemod",
"adopted-ember-addons/ember-paper"
]
},
{
Expand Down Expand Up @@ -563,7 +570,8 @@
"oscard0m/example-probot-vercel-ts",
"paoloricciuti/darkmodething",
"mansona/testing-release-plan",
"BlueCutOfficial/site-cv"
"BlueCutOfficial/site-cv",
"mainmatter/gravity_dummy"
],
"exclude_closed_not_merged": true,
"output_path": "src/twios/",
Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
# redirect old "Web-based Services in Rust" landing page to regular workshop
[[redirects]]
from = "https://rust-web-services-workshop.mainmatter.com/*"
to = "https://mainmatter.com/services/workshops/web-based-services-in-rust/"
to = "https://mainmatter.com/services/workshops/build-production-ready-apis-in-rust/"
force = true

# redirect old "Web-based Servides in Rust" workshop to new one
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,33 +34,33 @@
},
"devDependencies": {
"@11ty/eleventy": "^2.0.1",
"@11ty/eleventy-img": "^4.0.0",
"@11ty/eleventy-img": "^6.0.0",
"@11ty/eleventy-navigation": "^0.3.2",
"@11ty/eleventy-plugin-rss": "1.2.0",
"@11ty/eleventy-plugin-syntaxhighlight": "5.0.0",
"@lhci/cli": "^0.13.0",
"@lhci/cli": "^0.14.0",
"@percy/cli": "^1.28.7",
"@quasibit/eleventy-plugin-sitemap": "^2.1.5",
"@rollup/plugin-commonjs": "^26.0.1",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-commonjs": "^28.0.0",
"@rollup/plugin-node-resolve": "^16.0.0",
"@rollup/plugin-terser": "^0.4.4",
"@tbranyen/jsdom": "13.0.0",
"broken-link-checker": "^0.7.8",
"colors": "^1.4.0",
"cross-env": "7.0.3",
"dayjs": "^1.10.4",
"eslint": "^9.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-prettier": "^10.0.0",
"eslint-plugin-n": "^17.0.0",
"eslint-plugin-prettier": "^5.1.3",
"express": "^4.18.1",
"html-minifier": "4.0.0",
"markdown-it": "14.1.0",
"markdown-it-footnote": "^4.0.0",
"netlify-plugin-11ty": "^1.1.0",
"npm-run-all2": "^6.0.0",
"prettier": "3.2.5",
"prettier-plugin-jinja-template": "^1.3.3",
"npm-run-all2": "^7.0.0",
"prettier": "3.4.2",
"prettier-plugin-jinja-template": "^2.0.0",
"replace-in-file": "^7.0.0",
"rollup": "^4.18.0",
"sass": "^1.32.8",
Expand All @@ -83,7 +83,7 @@
"node": ">=20"
},
"volta": {
"node": "20.15.1",
"pnpm": "9.7.0"
"node": "22.13.0",
"pnpm": "9.15.4"
}
}
Loading

0 comments on commit 9ea2ee4

Please sign in to comment.