Skip to content

Commit 6d03029

Browse files
committed
feat: remove jQuery in <v8
1 parent e9f5bc5 commit 6d03029

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

lib/cli.js

Lines changed: 13 additions & 8 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,6 +13,7 @@ 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) => {
@@ -97,20 +97,25 @@ const onLoad = async (targetDir, version, argv) => {
9797
}
9898
lang = langChoice || "";
9999
}
100-
let { jquery } = await prompts({
101-
type: "confirm",
102-
name: "jquery",
103-
message: "Remove jQuery?",
104-
initial: true,
105-
});
100+
const isJqueryIncluded = compareVersions(version.toString(), "8.0.0"); // jQuery removed in >= v8
101+
let removeJqueryFlag = false;
102+
if (isJqueryIncluded) {
103+
let { removeJquery } = await prompts({
104+
type: "confirm",
105+
name: "removeJquery",
106+
message: "Remove jQuery?",
107+
initial: true,
108+
});
109+
removeJqueryFlag = removeJquery;
110+
}
106111
try {
107112
const indexFile = targetDir + "/index.html";
108113
const sourceHTML = await fs.readFile(indexFile, "utf-8");
109114
let resultHTML = sourceHTML.replace(
110115
/(<html.*lang=)\"([^"]*)\"/gi,
111116
`$1"${lang}"`
112117
);
113-
if (jquery) {
118+
if (removeJqueryFlag) {
114119
resultHTML = resultHTML.replace(
115120
/(<script>window\.jQuery.*<\/script>|<script src=".*jquery.*<\/script>)/gi,
116121
""

package-lock.json

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
],
3131
"dependencies": {
3232
"chalk": "^4.0.0",
33+
"compare-versions": "^3.6.0",
3334
"elapsed-time-logger": "^1.1.2",
3435
"fast-glob": "^3.2.2",
3536
"fs-extra": "^9.0.0",
3637
"fuzzy": "^0.1.3",
3738
"ora": "^4.0.4",
3839
"pacote": "^11.1.10",
3940
"prompts": "^2.3.2",
40-
"semver": "^7.3.2",
4141
"yargs-parser": "^18.1.3"
4242
},
4343
"devDependencies": {

0 commit comments

Comments
 (0)