Use parcel-bundler instead of gulp-concat

This commit is contained in:
Maddison Hellstrom 2018-08-12 19:18:52 -07:00
parent 0f022e6fbb
commit eaf74cc4f1
3 changed files with 8 additions and 52 deletions

View File

@ -1,5 +1,5 @@
const gulp = require("gulp") const gulp = require("gulp")
const concat = require("gulp-concat") // TODO: Use webpack instead of concat const parcel = require("gulp-parcel")
const replace = require("gulp-replace") const replace = require("gulp-replace")
const rename = require("gulp-rename") const rename = require("gulp-rename")
const eslint = require("gulp-eslint") const eslint = require("gulp-eslint")
@ -13,6 +13,7 @@ const compl = require("./completions")
const paths = { const paths = {
scripts: ["conf.priv.js", "completions.js", "conf.js"], scripts: ["conf.priv.js", "completions.js", "conf.js"],
entry: "conf.js",
gulpfile: ["gulpfile.js"], gulpfile: ["gulpfile.js"],
readme: ["README.tmpl.md"], readme: ["README.tmpl.md"],
screenshots: "assets/screenshots", screenshots: "assets/screenshots",
@ -38,7 +39,7 @@ gulp.task("gulp-autoreload", () => {
spawnChildren() spawnChildren()
}) })
gulp.task("clean", () => del(["build"])) gulp.task("clean", () => del(["build", ".cache", ".tmp-gulp-compile-*"]))
gulp.task("lint", () => gulp.task("lint", () =>
gulp gulp
@ -52,8 +53,9 @@ gulp.task("lint", () =>
.pipe(eslint()) .pipe(eslint())
.pipe(eslint.format())) .pipe(eslint.format()))
gulp.task("build", ["clean", "lint", "readme"], () => gulp.src(paths.scripts) gulp.task("build", ["clean", "lint", "readme"], () => gulp.src(paths.entry, { read: false })
.pipe(concat(".surfingkeys")) .pipe(parcel())
.pipe(rename(".surfingkeys"))
.pipe(gulp.dest("build"))) .pipe(gulp.dest("build")))
gulp.task("install", ["build"], () => gulp.src("build/.surfingkeys") gulp.task("install", ["build"], () => gulp.src("build/.surfingkeys")

View File

@ -26,7 +26,6 @@
"eslint-plugin-jsx-a11y": "^6.0.2", "eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-react": "^7.5.1", "eslint-plugin-react": "^7.5.1",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-concat": "^2.6.1",
"gulp-eslint": "^4.0.0", "gulp-eslint": "^4.0.0",
"gulp-parcel": "b0o/gulp-parcel#fix-g_options-undefined", "gulp-parcel": "b0o/gulp-parcel#fix-g_options-undefined",
"gulp-rename": "^1.2.2", "gulp-rename": "^1.2.2",

View File

@ -1069,18 +1069,10 @@ cli-width@^2.0.0:
version "2.2.0" version "2.2.0"
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
clone-buffer@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
clone-stats@^0.0.1: clone-stats@^0.0.1:
version "0.0.1" version "0.0.1"
resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
clone-stats@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
clone@^0.2.0: clone@^0.2.0:
version "0.2.0" version "0.2.0"
resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
@ -1093,14 +1085,6 @@ clone@^2.1.1:
version "2.1.2" version "2.1.2"
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
cloneable-readable@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.2.tgz#d591dee4a8f8bc15da43ce97dceeba13d43e2a65"
dependencies:
inherits "^2.0.1"
process-nextick-args "^2.0.0"
readable-stream "^2.3.5"
clones@^1.1.0: clones@^1.1.0:
version "1.1.0" version "1.1.0"
resolved "https://registry.yarnpkg.com/clones/-/clones-1.1.0.tgz#87e904132d6140c5c0b72006c08c0d05bd7b63b3" resolved "https://registry.yarnpkg.com/clones/-/clones-1.1.0.tgz#87e904132d6140c5c0b72006c08c0d05bd7b63b3"
@ -1219,12 +1203,6 @@ concat-stream@^1.6.0, concat-stream@~1.6.0:
readable-stream "^2.2.2" readable-stream "^2.2.2"
typedarray "^0.0.6" typedarray "^0.0.6"
concat-with-sourcemaps@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
dependencies:
source-map "^0.6.1"
config-chain@~1.1.5: config-chain@~1.1.5:
version "1.1.11" version "1.1.11"
resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
@ -2411,14 +2389,6 @@ grapheme-breaker@^0.3.2:
brfs "^1.2.0" brfs "^1.2.0"
unicode-trie "^0.3.1" unicode-trie "^0.3.1"
gulp-concat@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz#633d16c95d88504628ad02665663cee5a4793353"
dependencies:
concat-with-sourcemaps "^1.0.0"
through2 "^2.0.0"
vinyl "^2.0.0"
gulp-eslint@^4.0.0: gulp-eslint@^4.0.0:
version "4.0.2" version "4.0.2"
resolved "https://registry.yarnpkg.com/gulp-eslint/-/gulp-eslint-4.0.2.tgz#18a2a6768e4404cbf3e203239cb57474168fa606" resolved "https://registry.yarnpkg.com/gulp-eslint/-/gulp-eslint-4.0.2.tgz#18a2a6768e4404cbf3e203239cb57474168fa606"
@ -4473,7 +4443,7 @@ private@^0.1.6, private@^0.1.8:
version "0.1.8" version "0.1.8"
resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: process-nextick-args@~2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
@ -4595,7 +4565,7 @@ read-pkg@^2.0.0:
isarray "0.0.1" isarray "0.0.1"
string_decoder "~0.10.x" string_decoder "~0.10.x"
readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3: readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3:
version "2.3.6" version "2.3.6"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
dependencies: dependencies:
@ -4719,10 +4689,6 @@ replace-ext@0.0.1:
version "0.0.1" version "0.0.1"
resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
replace-ext@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
replacestream@^4.0.0: replacestream@^4.0.0:
version "4.0.3" version "4.0.3"
resolved "https://registry.yarnpkg.com/replacestream/-/replacestream-4.0.3.tgz#3ee5798092be364b1cdb1484308492cb3dff2f36" resolved "https://registry.yarnpkg.com/replacestream/-/replacestream-4.0.3.tgz#3ee5798092be364b1cdb1484308492cb3dff2f36"
@ -5517,17 +5483,6 @@ vinyl@^0.5.0:
clone-stats "^0.0.1" clone-stats "^0.0.1"
replace-ext "0.0.1" replace-ext "0.0.1"
vinyl@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
dependencies:
clone "^2.1.1"
clone-buffer "^1.0.0"
clone-stats "^1.0.0"
cloneable-readable "^1.0.0"
remove-trailing-separator "^1.0.1"
replace-ext "^1.0.0"
vlq@^0.2.2: vlq@^0.2.2:
version "0.2.3" version "0.2.3"
resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"