diff --git a/bin/webpack.js b/bin/webpack.js index 26442739bea..d4c8e959ee6 100755 --- a/bin/webpack.js +++ b/bin/webpack.js @@ -257,7 +257,7 @@ const stdout = argv.silent ? { write: () => {} - } + } // eslint-disable-line : process.stdout; function ifArg(name, fn, init) { diff --git a/lib/generators/add-generator.js b/lib/generators/add-generator.js index c2572b904cb..b57d814b3f7 100644 --- a/lib/generators/add-generator.js +++ b/lib/generators/add-generator.js @@ -1,4 +1,4 @@ -const Generator = require("webpack-fork-yeoman-generator"); +const Generator = require("yeoman-generator"); const glob = require("glob-all"); const path = require("path"); const Confirm = require("webpack-addons").Confirm; @@ -124,7 +124,7 @@ module.exports = class AddGenerator extends Generator { : webpackSchema.properties[action].anyOf ? webpackSchema.properties[action].anyOf.filter( p => p.properties || p.enum - ) + ) // eslint-disable-line : null; if (Array.isArray(defOrPropDescription)) { // Todo: Generalize these to go through the array, then merge enum with props if needed @@ -405,7 +405,7 @@ module.exports = class AddGenerator extends Generator { let othersDeepPropKey = deepPropAns.deepProp ? `what do you want the value of ${ deepPropAns.deepProp - } to be?` + } to be?` // eslint-disable-line : `what do you want to be the value of ${action} to be?`; // Push the answer to the array we have created, so we can use it later isDeepProp.push(deepPropAns.deepProp); diff --git a/lib/generators/init-generator.js b/lib/generators/init-generator.js index cab1763da64..5375ee13a59 100644 --- a/lib/generators/init-generator.js +++ b/lib/generators/init-generator.js @@ -1,6 +1,6 @@ "use strict"; -const Generator = require("webpack-fork-yeoman-generator"); +const Generator = require("yeoman-generator"); const chalk = require("chalk"); const logSymbols = require("log-symbols"); diff --git a/lib/generators/remove-generator.js b/lib/generators/remove-generator.js index 48bc2a1ecef..f249af53cfb 100644 --- a/lib/generators/remove-generator.js +++ b/lib/generators/remove-generator.js @@ -1,3 +1,3 @@ -const Generator = require("webpack-fork-yeoman-generator"); +const Generator = require("yeoman-generator"); module.exports = class RemoveGenerator extends Generator {}; diff --git a/lib/generators/update-generator.js b/lib/generators/update-generator.js index 3112467119d..fc0515c3b8f 100644 --- a/lib/generators/update-generator.js +++ b/lib/generators/update-generator.js @@ -1,3 +1,3 @@ -const Generator = require("webpack-fork-yeoman-generator"); +const Generator = require("yeoman-generator"); module.exports = class UpdateGenerator extends Generator {}; diff --git a/lib/generators/webpack-generator.js b/lib/generators/webpack-generator.js index 6353b28a3d2..561f10931f7 100644 --- a/lib/generators/webpack-generator.js +++ b/lib/generators/webpack-generator.js @@ -1,6 +1,6 @@ var path = require("path"); var mkdirp = require("mkdirp"); -var Generator = require("webpack-fork-yeoman-generator"); +var Generator = require("yeoman-generator"); var copyUtils = require("../utils/copy-utils"); /** diff --git a/lib/init/index.js b/lib/init/index.js index b6c91d6fbc5..8fb2b3f6140 100644 --- a/lib/init/index.js +++ b/lib/init/index.js @@ -1,7 +1,7 @@ "use strict"; const yeoman = require("yeoman-environment"); -const Generator = require("webpack-fork-yeoman-generator"); +const Generator = require("yeoman-generator"); const path = require("path"); const defaultGenerator = require("../generators/init-generator"); const runTransform = require("./transformations/index"); diff --git a/package.json b/package.json index 4c8be3e4364..97f97f6ab53 100644 --- a/package.json +++ b/package.json @@ -108,9 +108,9 @@ "uglifyjs-webpack-plugin": "^1.2.2", "v8-compile-cache": "^1.1.2", "webpack-addons": "^1.1.5", - "webpack-fork-yeoman-generator": "^1.1.1", "yargs": "9.0.1", - "yeoman-environment": "^2.0.0" + "yeoman-environment": "^2.0.0", + "yeoman-generator": "github:ev1stensberg/generator#Feature-getArgument" }, "peerDependencies": { "webpack": "^4.0.0-beta.1" diff --git a/yarn.lock b/yarn.lock index 4ea5375699f..31d97e03c88 100644 --- a/yarn.lock +++ b/yarn.lock @@ -194,10 +194,10 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" accepts@~1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f" + version "1.3.5" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" dependencies: - mime-types "~2.1.16" + mime-types "~2.1.18" negotiator "0.6.1" acorn-dynamic-import@^3.0.0: @@ -223,8 +223,8 @@ acorn@^3.0.4: resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" acorn@^5.0.0, acorn@^5.3.0, acorn@^5.4.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102" + version "5.5.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.0.tgz#1abb587fbf051f94e3de20e6b26ef910b1828298" add-stream@^1.0.0: version "1.0.0" @@ -482,7 +482,7 @@ async@^1.4.0, async@^1.5.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" -async@^2.0.0, async@^2.1.2, async@^2.1.4: +async@^2.0.0, async@^2.1.4: version "2.6.0" resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" dependencies: @@ -1582,22 +1582,7 @@ chardet@^0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" -chokidar@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -chokidar@^2.0.0: +chokidar@^2.0.0, chokidar@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7" dependencies: @@ -1865,8 +1850,8 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" + version "1.6.1" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26" dependencies: inherits "^2.0.3" readable-stream "^2.2.2" @@ -5202,8 +5187,8 @@ map-visit@^1.0.0: object-visit "^1.0.0" marked@~0.3.6: - version "0.3.16" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.16.tgz#2f188b7dfcfa6540fe9940adaf0f3b791c9a5cba" + version "0.3.17" + resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.17.tgz#607f06668b3c6b1246b28f13da76116ac1aa2d2b" md5-hex@^1.2.0: version "1.3.0" @@ -5376,7 +5361,7 @@ miller-rabin@^4.0.0: version "1.33.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" -mime-types@^2.1.12, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7: +mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7: version "2.1.18" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" dependencies: @@ -6280,8 +6265,8 @@ prettier-eslint@^8.5.0: typescript-eslint-parser "^11.0.0" prettier@^1.5.3, prettier@^1.7.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93" + version "1.11.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75" pretty-bytes@^4.0.2: version "4.0.2" @@ -7270,19 +7255,27 @@ spawn-wrap@^1.4.2: signal-exit "^3.0.2" which "^1.3.0" -spdx-correct@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40" +spdx-correct@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" dependencies: - spdx-license-ids "^1.0.2" + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" -spdx-expression-parse@~1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c" +spdx-exceptions@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9" -spdx-license-ids@^1.0.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" +spdx-expression-parse@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87" spdy-transport@^2.0.18: version "2.0.20" @@ -7717,8 +7710,8 @@ to-regex@^3.0.1: safe-regex "^1.1.0" tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" + version "2.3.4" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" dependencies: punycode "^1.4.1" @@ -7978,11 +7971,11 @@ v8-compile-cache@^1.1.2: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz#8d32e4f16974654657e676e0e467a348e89b0dc4" validate-npm-package-license@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" + version "3.0.3" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" dependencies: - spdx-correct "~1.0.0" - spdx-expression-parse "~1.0.0" + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" vary@~1.1.2: version "1.1.2" @@ -8067,12 +8060,12 @@ watch@~0.18.0: minimist "^1.2.0" watchpack@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac" + version "1.5.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz#231e783af830a22f8966f65c4c4bacc814072eed" dependencies: - async "^2.1.2" - chokidar "^1.7.0" + chokidar "^2.0.2" graceful-fs "^4.1.2" + neo-async "^2.5.0" wbuf@^1.1.0, wbuf@^1.7.2: version "1.7.2" @@ -8103,8 +8096,8 @@ webpack-dev-middleware@2.0.6: webpack-log "^1.0.1" webpack-dev-server@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.0.0.tgz#0ca2d293dc7a7b1a94fc5fd62cfca2a9fa61bcf7" + version "3.1.0" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.0.tgz#5d2365514d9dfa0d415502742d2cc28afc4a32d8" dependencies: ansi-html "0.0.7" array-includes "^3.0.3" @@ -8132,39 +8125,10 @@ webpack-dev-server@^3.0.0: strip-ansi "^3.0.0" supports-color "^5.1.0" webpack-dev-middleware "2.0.6" + webpack-log "^1.1.2" yargs "9.0.1" -webpack-fork-yeoman-generator@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/webpack-fork-yeoman-generator/-/webpack-fork-yeoman-generator-1.1.1.tgz#c92b454aba7df9ea392669188aa0330964acf76f" - dependencies: - async "^2.0.0" - chalk "^1.0.0" - cli-table "^0.3.1" - cross-spawn "^5.0.1" - dargs "^5.1.0" - dateformat "^2.0.0" - debug "^2.1.0" - detect-conflict "^1.0.0" - error "^7.0.2" - find-up "^2.1.0" - github-username "^4.0.0" - istextorbinary "^2.1.0" - lodash "^4.11.1" - mem-fs-editor "^3.0.0" - minimist "^1.2.0" - mkdirp "^0.5.0" - pretty-bytes "^4.0.2" - read-chunk "^2.0.0" - read-pkg-up "^2.0.0" - rimraf "^2.2.0" - run-async "^2.0.0" - shelljs "^0.7.0" - text-table "^0.2.0" - through2 "^2.0.0" - yeoman-environment "^1.1.0" - -webpack-log@^1.0.1: +webpack-log@^1.0.1, webpack-log@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.1.2.tgz#cdc76016537eed24708dc6aa3d1e52189efee107" dependencies: @@ -8469,3 +8433,33 @@ yeoman-environment@^2.0.0: mem-fs "^1.1.0" text-table "^0.2.0" untildify "^3.0.2" + +"yeoman-generator@github:ev1stensberg/generator#Feature-getArgument": + version "1.1.1" + resolved "https://codeload.github.com/ev1stensberg/generator/tar.gz/9e24fa31c85302ca1145ae34fc68b4f133251ca0" + dependencies: + async "^2.0.0" + chalk "^1.0.0" + cli-table "^0.3.1" + cross-spawn "^5.0.1" + dargs "^5.1.0" + dateformat "^2.0.0" + debug "^2.1.0" + detect-conflict "^1.0.0" + error "^7.0.2" + find-up "^2.1.0" + github-username "^4.0.0" + istextorbinary "^2.1.0" + lodash "^4.11.1" + mem-fs-editor "^3.0.0" + minimist "^1.2.0" + mkdirp "^0.5.0" + pretty-bytes "^4.0.2" + read-chunk "^2.0.0" + read-pkg-up "^2.0.0" + rimraf "^2.2.0" + run-async "^2.0.0" + shelljs "^0.7.0" + text-table "^0.2.0" + through2 "^2.0.0" + yeoman-environment "^1.1.0"