Skip to content

Commit 5ee72da

Browse files
committed
Merge branch 'master' of https://github.com/h5bp/create-html5-boilerplate into screengif
2 parents e3f7512 + a62c589 commit 5ee72da

File tree

6 files changed

+950
-706
lines changed

6 files changed

+950
-706
lines changed

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: npm
4+
directory: "/"
5+
schedule:
6+
interval: weekly
7+
time: "03:00"
8+
open-pull-requests-limit: 10

.github/workflows/coveralls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
node-version: [12.x]
18+
node-version: [10.x, 12.x, 14.x]
1919

2020
steps:
2121
- name: Get npm cache directory

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ npm start
2121
Using `npm init`
2222

2323
```
24-
npm init create-html5-boilerplate new-site
24+
npm init html5-boilerplate new-site
2525
cd new-site
2626
npm install
2727
npm start

lib/cli.js

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const path = require("path");
44
const chalk = require("chalk");
55
const langsList = require("./countries.json");
66
const prompts = require("prompts");
7-
// const semver = require("semver");
87
const fuzzy = require("fuzzy");
98
const ora = require("ora");
109
const { extract } = require("pacote");
@@ -14,14 +13,15 @@ const os = require("os");
1413
const packageName = "html5-boilerplate";
1514
const tempDir = os.tmpdir() + `/${packageName}-staging`;
1615
const elapsed = require("elapsed-time-logger");
16+
const compareVersions = require("compare-versions");
1717
let spinner;
1818

1919
module.exports = async (argvs) => {
2020
const argv = yargs_parser(argvs, {
2121
alias: { release: ["r"], yes: ["y"] },
2222
});
2323
const timer = elapsed.start();
24-
const version = argv["release"] || "latest";
24+
const version = (argv["release"] || "latest").toString();
2525
const targetDir = path.resolve(argv["_"][0] || "./");
2626
spinner = ora(
2727
`Downloading ${packageName} version '${version}' to ${targetDir}`
@@ -73,8 +73,10 @@ const onLoad = async (targetDir, version, argv) => {
7373
return { title: `${v.title} (${v.value})`, value: v.value };
7474
});
7575
langListOut.splice(1, 0, { title: "Enter custom", value: "custom" });
76-
const questions = [
77-
{
76+
let lang = argv.lang;
77+
/* istanbul ignore if */
78+
if (!lang) {
79+
let { langChoice } = await prompts({
7880
type: "autocomplete",
7981
name: "langChoice",
8082
message: "Select language",
@@ -84,12 +86,7 @@ const onLoad = async (targetDir, version, argv) => {
8486
.filter(input, choices, { extract: (el) => el.title })
8587
.map((v) => v.original);
8688
},
87-
},
88-
];
89-
let lang = argv.lang;
90-
/* istanbul ignore if */
91-
if (!lang) {
92-
let { langChoice } = await prompts(questions);
89+
});
9390
if (langChoice === "custom") {
9491
let { customLang } = await prompts({
9592
type: "text",
@@ -100,13 +97,31 @@ const onLoad = async (targetDir, version, argv) => {
10097
}
10198
lang = langChoice || "";
10299
}
100+
const isJqueryIncluded =
101+
version !== "latest" && compareVersions(version, "8.0.0"); // jQuery removed in >= v8
102+
let removeJqueryFlag = false;
103+
if (isJqueryIncluded) {
104+
let { removeJquery } = await prompts({
105+
type: "confirm",
106+
name: "removeJquery",
107+
message: "Remove jQuery?",
108+
initial: true,
109+
});
110+
removeJqueryFlag = removeJquery;
111+
}
103112
try {
104113
const indexFile = targetDir + "/index.html";
105114
const sourceHTML = await fs.readFile(indexFile, "utf-8");
106-
const resultHTML = sourceHTML.replace(
115+
let resultHTML = sourceHTML.replace(
107116
/(<html.*lang=)\"([^"]*)\"/gi,
108117
`$1"${lang}"`
109118
);
119+
if (removeJqueryFlag) {
120+
resultHTML = resultHTML.replace(
121+
/(<script>window\.jQuery.*<\/script>|<script src=".*jquery.*<\/script>)/gi,
122+
""
123+
);
124+
}
110125
await fs.writeFile(indexFile, resultHTML);
111126
} catch (err) {
112127
/* istanbul ignore next */

0 commit comments

Comments
 (0)