Skip to content

Commit

Permalink
Merge branch 'h5bp:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
wqdygkd authored Oct 15, 2023
2 parents f28f712 + e45c4a7 commit 8d0ac73
Show file tree
Hide file tree
Showing 52 changed files with 1,384 additions and 6,231 deletions.
10 changes: 6 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
Please take a moment to review this document in order to make the contribution
process easy and effective for everyone involved.

*Please submit one PR per question*

Following these guidelines helps to communicate that you respect the time of
the developers managing and developing this open source project. In return,
they should reciprocate that respect in addressing your issue or assessing
Expand Down Expand Up @@ -39,8 +41,8 @@ Adhering to the following process is the best way to get your work included in t
2. If you cloned a while ago, get the latest changes from upstream:

```bash
git checkout master
git pull upstream master
git checkout main
git pull upstream main
```

3. Create a new topic branch (off the main project development branch) to
Expand All @@ -53,7 +55,7 @@ Adhering to the following process is the best way to get your work included in t
4. Locally merge (or rebase) the upstream development branch into your topic branch:

```bash
git pull [--rebase] upstream master
git pull [--rebase] upstream main
```

5. Set-up the website
Expand All @@ -70,7 +72,7 @@ Our website is made with [Eleventy](https://11ty.io).
* If you are looking to edit infrastructure/templating files of the website and not sure how to, [check their docs](https://11ty.io/docs).
* If you are looking to change a question/translation file, just change the markdown file you want and the website will be updated once it is deployed.

6. Squash your commits down to a single one (we want to keep the master branch nice and clean)
6. Squash your commits down to a single one (we want to keep the main branch nice and clean)

7. Push your topic branch up to your fork:

Expand Down
7 changes: 5 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
interval: monthly
time: "03:00"
open-pull-requests-limit: 10
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: monthly
38 changes: 38 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: "CodeQL"

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
schedule:
- cron: '34 20 * * 0'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
27 changes: 27 additions & 0 deletions .github/workflows/gh-pages-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Eleventy Build
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ main ]

jobs:
build_deploy:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: "16.x"
- run: npm install
- name: Build
uses: TartanLlama/actions-eleventy@master
with:
args: --config=config/eleventy.config.js --pathprefix=Front-end-Developer-Interview-Questions
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
publish_dir: ./_site
publish_branch: gh-pages
github_token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2012 - 2019 Contributors to https://github.com/h5bp/Front-end-Developer-Interview-Questions
Copyright (c) 2012 - 2023 Contributors to https://github.com/h5bp/Front-end-Developer-Interview-Questions

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ You can read more about this project & its history [here](https://h5bp.org/Front
The project is currently maintained by:

- [@roblarsen](https://github.com/roblarsen)
- [@vvscode](https://github.com/vvscode)

## Contributors

Expand Down
16 changes: 0 additions & 16 deletions config/deploy.sh

This file was deleted.

5 changes: 4 additions & 1 deletion config/eleventy.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const { DateTime } = require('luxon')
const CleanCSS = require('clean-css')
const UglifyJS = require('uglify-es')
const htmlmin = require('html-minifier')
const { EleventyI18nPlugin } = require("@11ty/eleventy");
const syntaxHighlight = require('@11ty/eleventy-plugin-syntaxhighlight')
const markdown = require('markdown-it')({
html: true,
Expand All @@ -17,7 +18,9 @@ const markdown = require('markdown-it')({

module.exports = eleventyConfig => {
eleventyConfig.addPlugin(syntaxHighlight)

eleventyConfig.addPlugin(EleventyI18nPlugin, {
defaultLanguage: 'en',
});
eleventyConfig.setLibrary('md', markdown)

eleventyConfig.addFilter('cssmin', code => {
Expand Down
Loading

0 comments on commit 8d0ac73

Please sign in to comment.