Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/blackflux/robo-config-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
@simlu
simlu committed Sep 25, 2019
2 parents de986c7 + 1333e62 commit 42d6807
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 80 deletions.
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
},
"homepage": "https://github.com/blackflux/robo-config-plugin#readme",
"devDependencies": {
"@babel/cli": "7.6.0",
"@babel/core": "7.6.0",
"@babel/plugin-proposal-object-rest-spread": "7.5.5",
"@babel/register": "7.6.0",
"@babel/cli": "7.6.2",
"@babel/core": "7.6.2",
"@babel/plugin-proposal-object-rest-spread": "7.6.2",
"@babel/register": "7.6.2",
"@blackflux/eslint-plugin-rules": "1.3.12",
"@blackflux/robo-config-plugin": "2.6.8",
"babel-eslint": "10.0.3",
Expand All @@ -50,9 +50,9 @@
"eslint-plugin-json": "1.4.0",
"eslint-plugin-markdown": "1.0.0",
"eslint-plugin-mocha": "6.1.1",
"js-gardener": "2.0.97",
"js-gardener": "2.0.102",
"nyc": "14.1.1",
"robo-config": "3.3.11",
"robo-config": "3.3.13",
"semantic-release": "15.13.24"
},
"nyc": {
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/tasks/struct/snippets/sls-api/test/errors.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('Testing errors.spec.js', () => {
return p;
}, []);
const result = fs.smartWrite(errorsFile, [
'/* eslint-disable max-len */',
...{ true: ['/* eslint-disable max-len */'], false: [] }[errors.some((e) => e.length > 120)],
"const { ApiError } = require('lambda-serverless-api');",
'',
...errors
Expand Down
5 changes: 4 additions & 1 deletion src/plugin/tasks/struct/snippets/sls-api/test/routes.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ describe('Testing routes.spec.js', () => {
methods.forEach((m) => p.push(`module.exports.${toRouteName(`$\{f}/$\{m}`)} = require('./handler/$\{f}').$\{m};`));
return p;
}, []);
const result = fs.smartWrite(routesFile, ['/* eslint-disable max-len */', ...routes], { treatAs: 'txt' });
const result = fs.smartWrite(routesFile, [
...{ true: ['/* eslint-disable max-len */'], false: [] }[routes.some((r) => r.length > 120)],
...routes
], { treatAs: 'txt' });
expect(result, 'Routes file updated').to.equal(false);
});
});
2 changes: 1 addition & 1 deletion test/projects/assorted/@sls-api/test/errors.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('Testing errors.spec.js', () => {
return p;
}, []);
const result = fs.smartWrite(errorsFile, [
'/* eslint-disable max-len */',
...{ true: ['/* eslint-disable max-len */'], false: [] }[errors.some((e) => e.length > 120)],
"const { ApiError } = require('lambda-serverless-api');",
'',
...errors
Expand Down
5 changes: 4 additions & 1 deletion test/projects/assorted/@sls-api/test/routes.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ describe('Testing routes.spec.js', () => {
methods.forEach((m) => p.push(`module.exports.${toRouteName(`${f}/${m}`)} = require('./handler/${f}').${m};`));
return p;
}, []);
const result = fs.smartWrite(routesFile, ['/* eslint-disable max-len */', ...routes], { treatAs: 'txt' });
const result = fs.smartWrite(routesFile, [
...{ true: ['/* eslint-disable max-len */'], false: [] }[routes.some((r) => r.length > 120)],
...routes
], { treatAs: 'txt' });
expect(result, 'Routes file updated').to.equal(false);
});
});
134 changes: 64 additions & 70 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@babel/cli@7.6.0":
version "7.6.0"
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.6.0.tgz#1470a04394eaf37862989ea4912adf440fa6ff8d"
integrity sha512-1CTDyGUjQqW3Mz4gfKZ04KGOckyyaNmKneAMlABPS+ZyuxWv3FrVEVz7Ag08kNIztVx8VaJ8YgvYLSNlMKAT5Q==
"@babel/cli@7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.6.2.tgz#4ce8b5b4b2e4b4c1b7bd841cec62085e2dfc4465"
integrity sha512-JDZ+T/br9pPfT2lmAMJypJDTTTHM9ePD/ED10TRjRzJVdEVy+JB3iRlhzYmTt5YkNgHvxWGlUVnLtdv6ruiDrQ==
dependencies:
commander "^2.8.1"
convert-source-map "^1.1.0"
Expand All @@ -26,17 +26,17 @@
dependencies:
"@babel/highlight" "^7.0.0"

"@babel/core@7.6.0":
version "7.6.0"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.0.tgz#9b00f73554edd67bebc86df8303ef678be3d7b48"
integrity sha512-FuRhDRtsd6IptKpHXAa+4WPZYY2ZzgowkbLBecEDDSje1X/apG7jQM33or3NdOmjXBKWGOg4JmSiRfUfuTtHXw==
"@babel/core@7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.2.tgz#069a776e8d5e9eefff76236bc8845566bd31dd91"
integrity sha512-l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==
dependencies:
"@babel/code-frame" "^7.5.5"
"@babel/generator" "^7.6.0"
"@babel/helpers" "^7.6.0"
"@babel/parser" "^7.6.0"
"@babel/generator" "^7.6.2"
"@babel/helpers" "^7.6.2"
"@babel/parser" "^7.6.2"
"@babel/template" "^7.6.0"
"@babel/traverse" "^7.6.0"
"@babel/traverse" "^7.6.2"
"@babel/types" "^7.6.0"
convert-source-map "^1.1.0"
debug "^4.1.0"
Expand All @@ -46,16 +46,15 @@
semver "^5.4.1"
source-map "^0.5.0"

"@babel/generator@^7.4.0", "@babel/generator@^7.6.0":
version "7.6.0"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.0.tgz#e2c21efbfd3293ad819a2359b448f002bfdfda56"
integrity sha512-Ms8Mo7YBdMMn1BYuNtKuP/z0TgEIhbcyB8HVR6PPNYp4P61lMsABiS4A3VG1qznjXVCf3r+fVHhm4efTYVsySA==
"@babel/generator@^7.4.0", "@babel/generator@^7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.2.tgz#dac8a3c2df118334c2a29ff3446da1636a8f8c03"
integrity sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==
dependencies:
"@babel/types" "^7.6.0"
jsesc "^2.5.1"
lodash "^4.17.13"
source-map "^0.5.0"
trim-right "^1.0.1"

"@babel/helper-function-name@^7.1.0":
version "7.1.0"
Expand Down Expand Up @@ -85,13 +84,13 @@
dependencies:
"@babel/types" "^7.4.4"

"@babel/helpers@^7.6.0":
version "7.6.0"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.0.tgz#21961d16c6a3c3ab597325c34c465c0887d31c6e"
integrity sha512-W9kao7OBleOjfXtFGgArGRX6eCP0UEcA2ZWEWNkJdRZnHhW4eEbeswbG3EwaRsnQUAEGWYgMq1HsIXuNNNy2eQ==
"@babel/helpers@^7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.2.tgz#681ffe489ea4dcc55f23ce469e58e59c1c045153"
integrity sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==
dependencies:
"@babel/template" "^7.6.0"
"@babel/traverse" "^7.6.0"
"@babel/traverse" "^7.6.2"
"@babel/types" "^7.6.0"

"@babel/highlight@^7.0.0":
Expand All @@ -103,15 +102,15 @@
esutils "^2.0.2"
js-tokens "^4.0.0"

"@babel/parser@^7.0.0", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0":
version "7.6.0"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.0.tgz#3e05d0647432a8326cb28d0de03895ae5a57f39b"
integrity sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ==
"@babel/parser@^7.0.0", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.2.tgz#205e9c95e16ba3b8b96090677a67c9d6075b70a1"
integrity sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==

"@babel/plugin-proposal-object-rest-spread@7.5.5":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz#61939744f71ba76a3ae46b5eea18a54c16d22e58"
integrity sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==
"@babel/plugin-proposal-object-rest-spread@7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz#8ffccc8f3a6545e9f78988b6bf4fe881b88e8096"
integrity sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-object-rest-spread" "^7.2.0"
Expand All @@ -123,10 +122,10 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"

"@babel/register@7.6.0":
version "7.6.0"
resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.6.0.tgz#76b6f466714680f4becafd45beeb2a7b87431abf"
integrity sha512-78BomdN8el+x/nkup9KwtjJXuptW5oXMFmP11WoM2VJBjxrKv4grC3qjpLL8RGGUYUGsm57xnjYFM2uom+jWUQ==
"@babel/register@7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.6.2.tgz#25765a922202cb06f8bdac5a3b1e70cd6bf3dd45"
integrity sha512-xgZk2LRZvt6i2SAUWxc7ellk4+OYRgS3Zpsnr13nMS1Qo25w21Uu8o6vTOAqNaxiqrnv30KTYzh9YWY2k21CeQ==
dependencies:
find-cache-dir "^2.0.0"
lodash "^4.17.13"
Expand All @@ -143,16 +142,16 @@
"@babel/parser" "^7.6.0"
"@babel/types" "^7.6.0"

"@babel/traverse@^7.0.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.6.0":
version "7.6.0"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.0.tgz#389391d510f79be7ce2ddd6717be66d3fed4b516"
integrity sha512-93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ==
"@babel/traverse@^7.0.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.2.tgz#b0e2bfd401d339ce0e6c05690206d1e11502ce2c"
integrity sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==
dependencies:
"@babel/code-frame" "^7.5.5"
"@babel/generator" "^7.6.0"
"@babel/generator" "^7.6.2"
"@babel/helper-function-name" "^7.1.0"
"@babel/helper-split-export-declaration" "^7.4.4"
"@babel/parser" "^7.6.0"
"@babel/parser" "^7.6.2"
"@babel/types" "^7.6.0"
debug "^4.1.0"
globals "^11.1.0"
Expand All @@ -179,10 +178,10 @@
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.6.8.tgz#58bd672fa76bd9221e1d3c1bb13bc51fd73485e9"
integrity sha512-CqXGjFEua9lOYzLYVVEGR0e3PYxxBFnCNWKqRLORg66lA1Sw4sKhSGfD+hUMm/ugdr+bUo9T2GyUI+OPqP19vA==

"@hapi/address@^2.1.1":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.1.tgz#61395b5ed94c4cb19c2dc4c85969cff3d40d583f"
integrity sha512-DYuHzu978pP1XW1GD3HGvLnAFjbQTIgc2+V153FGkbS2pgo9haigCdwBnUDrbhaOkgiJlbZvoEqDrcxSLHpiWA==
"@hapi/address@^2.1.2":
version "2.1.2"
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.2.tgz#1c794cd6dbf2354d1eb1ef10e0303f573e1c7222"
integrity sha512-O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q==

"@hapi/formula@^1.2.0":
version "1.2.0"
Expand All @@ -194,12 +193,12 @@
resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.2.4.tgz#684a14f4ca35d46f44abc87dfc696e5e4fe8a020"
integrity sha512-Ze5SDNt325yZvNO7s5C4fXDscjJ6dcqLFXJQ/M7dZRQCewuDj2iDUuBi6jLQt+APbW9RjjVEvLr35FXuOEqjow==

"@hapi/joi@16.1.1":
version "16.1.1"
resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.1.tgz#67a47cf46b163782ab69802b17ac4a86fb89f83e"
integrity sha512-v/XNMGNz+Nx7578Cx2bMunoQHuY4LFxRltJ6uA1LjS6LWakgPCJC4MTr1ucfCnjjbDtaQizrQx9oWXY3WcFcyw==
"@hapi/joi@16.1.4":
version "16.1.4"
resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.4.tgz#b039fe474a0ab838c1a90620c53a208fcef75d99"
integrity sha512-m7ctezhxjob+dSpXnCNlgAj6rrEpdSsaWu3GWL3g1AybQCU36mlAo9IwGFJwIxD+oHgdO6mYyviYlaejX+qN6g==
dependencies:
"@hapi/address" "^2.1.1"
"@hapi/address" "^2.1.2"
"@hapi/formula" "^1.2.0"
"@hapi/hoek" "^8.2.4"
"@hapi/pinpoint" "^1.0.2"
Expand Down Expand Up @@ -3559,28 +3558,28 @@ java-properties@^1.0.0:
resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-1.0.2.tgz#ccd1fa73907438a5b5c38982269d0e771fe78211"
integrity sha512-qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ==

joi-strict@1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.1.4.tgz#282935d3b33891e4067b32de2c1149b661aa9121"
integrity sha512-2p/p3r36aEiOEOS73oFbLq2bkVOeUs3LIitKS2rQpV2W1fg7Co3uhC6THs0j9JWOhKuKUC9RdMm9i7TNxhfvTw==
joi-strict@1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.1.6.tgz#3aa7608dc7776cfb8d3e9ea677b64c9879871c60"
integrity sha512-691Ut0N7toXMeqDMfY7f7A0NrWOhdC8kPec1n4ydgAKv8WxXK7vdSHwA754PlIkR4TFE3bnkO9ijrziw7rIJfg==
dependencies:
"@hapi/joi" "16.1.1"
"@hapi/joi" "16.1.4"

js-gardener@2.0.97:
version "2.0.97"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.97.tgz#6725d63b1d6a81879230943132d1cc6820d26269"
integrity sha512-/cqZEG56fAtANbQvRtqZf+Oyx1zuxSrJf9zuam8XZJi6LMAkR6Z60bvMk7rh6mW8OS1KJc6CeMMjWS0gbq2nsg==
js-gardener@2.0.102:
version "2.0.102"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.102.tgz#66ab1a87398139079f69750ddba99ef0f1d95230"
integrity sha512-DxDbF7L2pLH8/G0skyoPgagTasrL2eLyP/Zay/qWcTD41Jo23Bs12vSpX8nRQPQAfnHgpBw3QqMSztDvSK3Q1w==
dependencies:
chalk "2.4.2"
fancy-log "1.3.3"
glob "7.1.4"
joi-strict "1.1.4"
joi-strict "1.1.6"
js-yaml "3.13.1"
lodash.difference "4.5.0"
lodash.get "4.4.2"
mocha "6.2.0"
npm-check "5.9.0"
robo-config "3.3.11"
robo-config "3.3.13"

js-tokens@^3.0.0, js-tokens@^3.0.2:
version "3.0.2"
Expand Down Expand Up @@ -6153,14 +6152,14 @@ rimraf@2.6.3:
dependencies:
glob "^7.1.3"

robo-config@3.3.11:
version "3.3.11"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.3.11.tgz#78920be4234f081d69ddc8a14eb10d67e7f68873"
integrity sha512-4nADVmqHaGuAAC8j76+3z2bJY0Hf8Lie0Ywlueyir9eW7PSkcoGLuXq+xtBsLif3HHZECmjMkmxfHeFay5S5fg==
robo-config@3.3.13:
version "3.3.13"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.3.13.tgz#146171dd04a650544b1ab4ebc2f4a07283958d2b"
integrity sha512-Gg4WpPHly2NtlxfAzLo86to4oioA8CRqc78P/B79ZiVU97+6uuDjbliLDivWnB0x67iSDyemk0y6dwVtXez08g==
dependencies:
app-root-path "2.2.1"
deepmerge "4.0.0"
joi-strict "1.1.4"
joi-strict "1.1.6"
lodash.clonedeep "4.5.0"
lodash.difference "4.5.0"
lodash.get "4.4.2"
Expand Down Expand Up @@ -6968,11 +6967,6 @@ trim-off-newlines@^1.0.0:
resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=

trim-right@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=

trim-trailing-lines@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz#d2f1e153161152e9f02fabc670fb40bec2ea2e3a"
Expand Down

0 comments on commit 42d6807

Please sign in to comment.