Skip to content

Commit 312444a

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 20de3d8 + 33b7bf8 commit 312444a

File tree

9 files changed

+1682
-9184
lines changed

9 files changed

+1682
-9184
lines changed

.github/workflows/xkpasswd.yml

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Simple workflow for deploying static content to GitHub Pages
2+
name: Deploy xkpasswd to Pages
3+
4+
on:
5+
# Runs on pushes targeting the default branch
6+
push:
7+
branches: ["main"]
8+
9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
13+
permissions:
14+
contents: read
15+
pages: write
16+
id-token: write
17+
18+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
19+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
20+
concurrency:
21+
group: "pages"
22+
cancel-in-progress: false
23+
24+
jobs:
25+
# Single deploy job since we're just deploying
26+
deploy:
27+
environment:
28+
name: github-pages
29+
url: ${{ steps.deployment.outputs.page_url }}
30+
runs-on: ubuntu-latest
31+
steps:
32+
- name: Checkout
33+
uses: actions/checkout@v4
34+
- name: Use Node.js '18.x'
35+
uses: actions/setup-node@v3
36+
with:
37+
node-version: '18.x'
38+
cache: 'npm'
39+
- run: npm ci
40+
- run: npm run build --if-present
41+
- run: npm test
42+
- run: npm run docs
43+
44+
- name: Setup Pages
45+
uses: actions/configure-pages@v4
46+
- name: Upload artifact
47+
uses: actions/upload-pages-artifact@v3
48+
with:
49+
# Upload entire repository
50+
path: 'dist'
51+
- name: Deploy to GitHub Pages
52+
id: deployment
53+
uses: actions/deploy-pages@v4

README.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1+
![XKPasswdJS](https://github.com/bartificer/xkpasswd-js/actions/workflows/xkpasswd.yml/badge.svg)
2+
13
# XKPasswdJS — The Official JavaScript Port of Crypt::HSXKPasswd
24

35
[Bart Busschots](https://www.bartb.ie/) created the [Crypt::HSXKPasswd](https://metacpan.org/pod/Crypt::HSXKPasswd) Perl module to be a liberally licensed ([2-clause BSD](https://opensource.org/licenses/BSD-2-Clause)) password generator for producing secure but memorable passwords using the word-based approach made famous by the [*Correct Horse Battery Staple* XKCD comic](https://xkcd.com/936/).
46

57
![To anyone who understands information theory and security and is in an infuriating argument with someone who does not (possibly involving mixed case), I sincerely apologize.](https://imgs.xkcd.com/comics/password_strength.png)
6-
8+
79
Bart is leading this port of the Perl module to JavaScript with the [NosillaCast community](https://podfeet.com/slack) as part of the on-going Programming By Stealth blog/podcast series](https://pbs.bartificer.net) he produces with [Allison Sheridan](https://www.podfeet.com/blog/about/).
810

11+
## Current version of the app
12+
13+
For anyone interesting in just playing with the current version, which is rather limited in functionality, you can check out the app here: <a href="https://bartificer.github.io/xkpasswd-js/">XKPasswd</a>
14+
915
## Project Plan
1016

1117
The plan is to develop this port in the following broad stages:
@@ -118,4 +124,4 @@ When writing code, make sure it's in line with the project's ESLint configuratio
118124
When writing doc comments:
119125

120126
1. Use `@param` to specify parameters (don't use `@args`).
121-
2. Use `@returns` to describe return values (don't use `@return`).
127+
2. Use `@returns` to describe return values (don't use `@return`).

jsdoc.conf.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
"include": [
99
"./src/"
1010
],
11-
"includePattern": ".+\\.(mjs|js|jsdoc)$"
11+
"includePattern": ".+\\.(mjs|js|jsdoc)$",
12+
"excludePattern": ".*statistics.*"
1213
},
14+
"sourceType": "module",
1315
"plugins": [
1416
"plugins/markdown"
1517
],

0 commit comments

Comments
 (0)