Review: Approve code
Diff comments: > > === modified file 'utilities/lint' > --- utilities/lint 2017-01-17 22:23:39 +0000 > +++ utilities/lint 2017-07-23 03:47:01 +0000 > @@ -31,10 +31,21 @@ > fi > > # Sample data contains auto generated files with long lines. > -pocketlint_files=`echo "$files" | env -i grep -v ".sql$"` > +pocketlint_files=`echo "$files" | env -i grep -v '\.sql$'` Probably worth renaming the variable now. > if [ -z "$pocketlint_files" ]; then > exit 0 > fi > - > -echo "" > -pocketlint $pocketlint_files 2>&1 > +pocketlint_files=`echo "$pocketlint_files" | tr " " "\n"` > + > +non_js_files=`echo "$pocketlint_files" | env -i grep -v '\.js$'` > +js_files=`echo "$pocketlint_files" | env -i grep '\.js$'` > + > +ret=0 > +if [ "$non_js_files" ]; then > + echo "" > + pocketlint $non_js_files 2>&1 || ret=$? > +fi > +if [ "$js_files" ]; then > + nodejs node_modules/.bin/eslint $js_files 2>&1 || ret=$? Do we want a blank line here as well? > +fi > +exit $ret > > === modified file 'yarn.lock' > --- yarn.lock 2017-07-23 03:47:01 +0000 > +++ yarn.lock 2017-07-23 03:47:01 +0000 > @@ -24,10 +339,283 @@ > combined-stream "~0.0.4" > mime "~1.2.2" > > +fs.realpath@^1.0.0: > + version "1.0.0" > + resolved > "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"; > + > +glob@^7.0.3, glob@^7.0.5, glob@^7.1.2: > + version "7.1.2" > + resolved > "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"; > + dependencies: > + fs.realpath "^1.0.0" > + inflight "^1.0.4" > + inherits "2" > + minimatch "^3.0.4" > + once "^1.3.0" > + path-is-absolute "^1.0.0" > + > +globals@^9.17.0: > + version "9.18.0" > + resolved > "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; > + > +globby@^5.0.0: > + version "5.0.0" > + resolved > "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"; > + dependencies: > + array-union "^1.0.1" > + arrify "^1.0.0" > + glob "^7.0.3" > + object-assign "^4.0.1" > + pify "^2.0.0" > + pinkie-promise "^2.0.0" > + > +graceful-fs@^4.1.2: > + version "4.1.11" > + resolved > "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; > + > +has-ansi@^2.0.0: > + version "2.0.0" > + resolved > "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; > + dependencies: > + ansi-regex "^2.0.0" > + > +has-flag@^2.0.0: > + version "2.0.0" > + resolved > "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"; > + > +iconv-lite@^0.4.17: > + version "0.4.18" > + resolved > "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"; > + > +ignore@^3.3.3: > + version "3.3.3" > + resolved > "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"; > + > +imurmurhash@^0.1.4: > + version "0.1.4" > + resolved > "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"; > + > +inflight@^1.0.4: > + version "1.0.6" > + resolved > "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"; > + dependencies: > + once "^1.3.0" > + wrappy "1" > + > +inherits@2, inherits@^2.0.3, inherits@~2.0.3: > + version "2.0.3" > + resolved > "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"; > + > +inquirer@^3.0.6: > + version "3.2.0" > + resolved > "https://registry.yarnpkg.com/inquirer/-/inquirer-3.2.0.tgz#45b44c2160c729d7578c54060b3eed94487bb42b"; > + dependencies: > + ansi-escapes "^2.0.0" > + chalk "^2.0.0" > + cli-cursor "^2.1.0" > + cli-width "^2.0.0" > + external-editor "^2.0.4" > + figures "^2.0.0" > + lodash "^4.3.0" > + mute-stream "0.0.7" > + run-async "^2.2.0" > + rx-lite "^4.0.8" > + rx-lite-aggregates "^4.0.8" > + string-width "^2.1.0" > + strip-ansi "^4.0.0" > + through "^2.3.6" > + > +is-fullwidth-code-point@^2.0.0: > + version "2.0.0" > + resolved > "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"; > + > +is-path-cwd@^1.0.0: > + version "1.0.0" > + resolved > "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"; > + > +is-path-in-cwd@^1.0.0: > + version "1.0.0" > + resolved > "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"; > + dependencies: > + is-path-inside "^1.0.0" > + > +is-path-inside@^1.0.0: > + version "1.0.0" > + resolved > "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"; > + dependencies: > + path-is-inside "^1.0.1" > + > +is-promise@^2.1.0: > + version "2.1.0" > + resolved > "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; > + > +is-resolvable@^1.0.0: > + version "1.0.0" > + resolved > "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; > + dependencies: > + tryit "^1.0.1" > + > +isarray@^1.0.0, isarray@~1.0.0: > + version "1.0.0" > + resolved > "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"; > + > +js-tokens@^3.0.0: > + version "3.0.2" > + resolved > "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"; > + > +js-yaml@^3.8.4: > + version "3.9.0" > + resolved > "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.0.tgz#4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"; > + dependencies: > + argparse "^1.0.7" > + esprima "^4.0.0" > + > +jschardet@^1.4.2: > + version "1.5.0" > + resolved > "https://registry.yarnpkg.com/jschardet/-/jschardet-1.5.0.tgz#a61f310306a5a71188e1b1acd08add3cfbb08b1e"; > + > +json-schema-traverse@^0.3.0: > + version "0.3.1" > + resolved > "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"; > + > +json-stable-stringify@^1.0.1: > + version "1.0.1" > + resolved > "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"; > + dependencies: > + jsonify "~0.0.0" > + > +jsonify@~0.0.0: > + version "0.0.0" > + resolved > "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; > + I feel there's something vital missing here. > +levn@^0.3.0, levn@~0.3.0: > + version "0.3.0" > + resolved > "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"; > + dependencies: > + prelude-ls "~1.1.2" > + type-check "~0.3.2" > + > +lodash@^4.0.0, lodash@^4.17.4, lodash@^4.3.0: > + version "4.17.4" > + resolved > "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"; > + > mime@~1.2.2, mime@~1.2.7: > version "1.2.11" > resolved > "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; > > +mimic-fn@^1.0.0: > + version "1.1.0" > + resolved > "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"; > + > +minimatch@^3.0.2, minimatch@^3.0.4: > + version "3.0.4" > + resolved > "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"; > + dependencies: > + brace-expansion "^1.1.7" > + > +minimist@0.0.8: > + version "0.0.8" > + resolved > "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"; > + > +mkdirp@^0.5.1: > + version "0.5.1" > + resolved > "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"; > + dependencies: > + minimist "0.0.8" > + > +ms@2.0.0: > + version "2.0.0" > + resolved > "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"; > + > +mute-stream@0.0.7: > + version "0.0.7" > + resolved > "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; > + > +natural-compare@^1.4.0: > + version "1.4.0" > + resolved > "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; > + > +object-assign@^4.0.1: > + version "4.1.1" > + resolved > "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"; > + > +once@^1.3.0: > + version "1.4.0" > + resolved > "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"; > + dependencies: > + wrappy "1" > + > +onetime@^2.0.0: > + version "2.0.1" > + resolved > "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"; > + dependencies: > + mimic-fn "^1.0.0" > + > +optionator@^0.8.2: > + version "0.8.2" > + resolved > "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; > + dependencies: > + deep-is "~0.1.3" > + fast-levenshtein "~2.0.4" > + levn "~0.3.0" > + prelude-ls "~1.1.2" > + type-check "~0.3.2" > + wordwrap "~1.0.0" > + > +os-tmpdir@~1.0.1: > + version "1.0.2" > + resolved > "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"; > + > +path-is-absolute@^1.0.0: > + version "1.0.1" > + resolved > "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; > + > +path-is-inside@^1.0.1, path-is-inside@^1.0.2: > + version "1.0.2" > + resolved > "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"; > + > +pify@^2.0.0: > + version "2.3.0" > + resolved > "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"; > + > +pinkie-promise@^2.0.0: > + version "2.0.1" > + resolved > "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"; > + dependencies: > + pinkie "^2.0.0" > + > +pinkie@^2.0.0: > + version "2.0.4" > + resolved > "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"; > + > +pluralize@^4.0.0: > + version "4.0.0" > + resolved > "https://registry.yarnpkg.com/pluralize/-/pluralize-4.0.0.tgz#59b708c1c0190a2f692f1c7618c446b052fd1762"; > + > +prelude-ls@~1.1.2: > + version "1.1.2" > + resolved > "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"; > + > +process-nextick-args@~1.0.6: > + version "1.0.7" > + resolved > "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"; > + > +progress@^2.0.0: > + version "2.0.0" > + resolved > "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"; > + > +readable-stream@^2.2.2: > + version "2.3.3" > + resolved > "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"; > + dependencies: > + core-util-is "~1.0.0" > + inherits "~2.0.3" > + isarray "~1.0.0" > + process-nextick-args "~1.0.6" > + safe-buffer "~5.1.1" > + string_decoder "~1.0.3" > + util-deprecate "~1.0.1" > + > request@~2.14.0: > version "2.14.0" > resolved > "https://registry.yarnpkg.com/request/-/request-2.14.0.tgz#0d8acbb0b14c1ab82e000b7d381fa8c80d1a7d88"; -- https://code.launchpad.net/~cjwatson/launchpad/eslint/+merge/327884 Your team Launchpad code reviewers is subscribed to branch lp:launchpad. _______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
