Skip to content

Commit

Permalink
Merge branch 'master' into 11ty#1036-add-skip-parameter-for-pagination
Browse files Browse the repository at this point in the history
  • Loading branch information
Snapstromegon authored Jul 1, 2023
2 parents 418e816 + 8e88b07 commit 31fbd60
Show file tree
Hide file tree
Showing 168 changed files with 8,040 additions and 3,998 deletions.
5 changes: 4 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
root = true

[*]
#TODO
#indent_style = tab
indent_style = space
indent_size = 2
end_of_line = lf
Expand All @@ -12,4 +14,5 @@ charset = utf-8
insert_final_newline = true

[/test/stubs*/**]
insert_final_newline = unset
insert_final_newline = unset
trim_trailing_whitespace = false
19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/enhancement.md

This file was deleted.

34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Feature request!
description: Enhancements. e.g. “I wish Eleventy did this.” Suggest an idea!
labels: [enhancement]
body:
- type: markdown
attributes:
value: |
Before opening a feature request, please search for the feature in the existing issues.
---
Thank you for taking the time to file a feature request. To address this feature as fast as possible, we need some information.
- type: textarea
id: problem
attributes:
label: Is your feature request related to a problem? Please describe.
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when ...
- type: textarea
id: solution
attributes:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.
validations:
required: true
- type: textarea
id: alternative
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
- type: textarea
id: context
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
32 changes: 0 additions & 32 deletions .github/ISSUE_TEMPLATE/possible-bug.md

This file was deleted.

63 changes: 63 additions & 0 deletions .github/ISSUE_TEMPLATE/possible-bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: I’m having trouble with Eleventy
description: Have a problem? It might be a bug! Create a report to help us improve.
labels: [needs-triage]
body:
- type: markdown
attributes:
value: |
Before opening a bug report, please search for the behavior in the existing issues.
---
Thank you for taking the time to file a bug report. To address this bug as fast as possible, we need some information.
- type: input
id: os
attributes:
label: Operating system
description: Which operating system do you use?
placeholder: macOS Big Sur 11.5.2
validations:
required: true
- type: input
id: eleventy
attributes:
label: Eleventy
description: Which version of Eleventy do you use?
placeholder: eleventy --version or npx @11ty/eleventy --version
validations:
required: true
- type: textarea
id: bug-description
attributes:
label: Describe the bug
description: A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: repro
attributes:
label: Reproduction steps
description: Steps to reproduce the behavior.
value: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See an error
- type: textarea
id: expected
attributes:
label: Expected behavior
description: A clear and concise description of what you expected to happen.
- type: input
id: repro-url
attributes:
label: Reproduction URL
description: "Optional: The URL to the **public** repository for the reproduction. _[parser:url]_"
placeholder: e.g. https://github.com/zachleat/zachleat.com
validations:
required: false
- type: textarea
id: screenshots
attributes:
label: Screenshots
description: "Optional: If applicable, add screenshots to help explain your problem."
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
node: ["14", "16", "18"]
node: ["14", "16", "18", "20"]
name: Node.js ${{ matrix.node }} on ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
# cache: npm
Expand Down
3 changes: 2 additions & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"arrowParens": "always"
"arrowParens": "always",
"printWidth": 100
}
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) 2017–2022 Zach Leatherman @zachleat
Copyright (c) 2017–2023 Zach Leatherman @zachleat

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
31 changes: 8 additions & 23 deletions cmd.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,20 @@ try {
let errorHandler = new EleventyErrorHandler();
const EleventyCommandCheckError = require("./src/EleventyCommandCheckError");
const argv = require("minimist")(process.argv.slice(2), {
string: [
"input",
"output",
"formats",
"config",
"pathprefix",
"port",
"to",
],
string: ["input", "output", "formats", "config", "pathprefix", "port", "to"],
boolean: [
"quiet",
"version",
"watch",
"dryrun",
"help",
"serve",
"passthroughall",
"incremental",
"ignore-initial",
],
default: {
quiet: null,
"ignore-initial": false,
},
unknown: function (unknownArgument) {
throw new EleventyCommandCheckError(
Expand All @@ -56,10 +49,7 @@ try {
errorHandler.fatal(error, "Uncaught exception");
});
process.on("rejectionHandled", (promise) => {
errorHandler.warn(
promise,
"A promise rejection was handled asynchronously"
);
errorHandler.warn(promise, "A promise rejection was handled asynchronously");
});

if (argv.version) {
Expand All @@ -68,10 +58,12 @@ try {
console.log(Eleventy.getHelp());
} else {
let elev = new Eleventy(argv.input, argv.output, {
source: "cli",
// --quiet and --quiet=true both resolve to true
quietMode: argv.quiet,
configPath: argv.config,
source: "cli",
pathPrefix: argv.pathprefix,
runMode: argv.serve ? "serve" : argv.watch ? "watch" : "build",
});

// reuse ErrorHandler instance in Eleventy
Expand All @@ -82,18 +74,11 @@ try {
elev.setIsVerbose(false);
}

elev.setPathPrefix(argv.pathprefix);
elev.setDryRun(argv.dryrun);
elev.setIgnoreInitial(argv["ignore-initial"]);
elev.setIncrementalBuild(argv.incremental);
elev.setPassthroughAll(argv.passthroughall);
elev.setFormats(argv.formats);

if (argv.watch) {
elev.setRunMode("watch");
} else if (argv.serve) {
elev.setRunMode("serve");
}

// careful, we can’t use async/await here to error properly
// with old node versions in `please-upgrade-node` above.
elev
Expand Down
Loading

0 comments on commit 31fbd60

Please sign in to comment.