From 344244f9cd5b65c27d905fbd719fc14d5ecd887e Mon Sep 17 00:00:00 2001 From: Carl Eiserman Date: Fri, 19 Oct 2018 20:32:59 +0200 Subject: [PATCH 1/2] feat: move to modern js (part 1) --- index.js | 43 ++++++++++++++++++++++--------------------- package.json | 5 ++++- yarn.lock | 17 ++++++++++++++--- 3 files changed, 40 insertions(+), 25 deletions(-) diff --git a/index.js b/index.js index c3f01b8..9a85d2f 100644 --- a/index.js +++ b/index.js @@ -1,28 +1,29 @@ -let lolcatjs = require('lolcatjs'); -let quotes = require('./quotes'); -let moment = require('moment'); +const lolcatjs = require('lolcatjs'); +const moment = require('moment'); +const quotes = require('./quotes'); + lolcatjs.options.seed = Math.round(Math.random() * 1000); lolcatjs.options.colors = true; -generateQuote(); - -function generateQuote() { - lolcatjs.fromString('Welcome to the Ryan quote generator...\n'); +const generateQuote = () => { + lolcatjs.fromString('Welcome to the Ryan quote generator...\n'); + setTimeout(() => { + lolcatjs.fromString('Picking out an extra special quote just for you.\n\n'); setTimeout(() => { - lolcatjs.fromString('Picking out an extra special quote just for you.\n\n'); - setTimeout(() => { - let index = randomIntFromInterval(0, quotes.best_quotes.length -1); - let quote = quotes.best_quotes[index]; - let date = moment(quote.date).format("MMM Do YYYY - hh:mm"); - lolcatjs.fromString('==========================================\n'); - lolcatjs.fromString('" ' + quote.text + ' "'); - lolcatjs.fromString('\n\n-- Ryan Sloane, ' + date); - lolcatjs.fromString('\n=========================================='); - process.exit(0) - }, 1500); + let index = randomIntFromInterval(0, quotes.best_quotes.length - 1); + let quote = quotes.best_quotes[index]; + let date = moment(quote.date).format("MMM Do YYYY - hh:mm"); + lolcatjs.fromString('==========================================\n'); + lolcatjs.fromString('" ' + quote.text + ' "'); + lolcatjs.fromString('\n\n-- Ryan Sloane, ' + date); + lolcatjs.fromString('\n=========================================='); + process.exit(0) }, 1500); + }, 1500); +} + +const randomIntFromInterval = (min, max) => { + return Math.floor(Math.random() * (max - min + 1) + min); } -function randomIntFromInterval(min,max) { - return Math.floor(Math.random()*(max-min+1)+min); -} \ No newline at end of file +generateQuote(); \ No newline at end of file diff --git a/package.json b/package.json index 6d7d1d7..816ca7a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,9 @@ { + "scripts" : { + "start": "node index" + }, "dependencies": { - "lolcatjs": "^2.3.0", + "lolcatjs": "^2.3.2", "moment": "^2.19.1" } } diff --git a/yarn.lock b/yarn.lock index 4c6d287..473d790 100644 --- a/yarn.lock +++ b/yarn.lock @@ -42,19 +42,24 @@ has-flag@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + line-by-line@^0.1.3: version "0.1.5" resolved "https://registry.yarnpkg.com/line-by-line/-/line-by-line-0.1.5.tgz#19c45b59f0a80632c30b5c43a647fe15aab905c2" -lolcatjs@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/lolcatjs/-/lolcatjs-2.3.0.tgz#65331ebc0173e3aadf441512f5797e2ec59e475a" +lolcatjs@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/lolcatjs/-/lolcatjs-2.3.2.tgz#2d278f6ad36a344ede98cf25cd8a329751abc83c" dependencies: ansi "^0.3.0" chalk "^2.1.0" line-by-line "^0.1.3" minimist "^1.1.1" multiline "^1.0.2" + supports-color "^5.0.0" optionalDependencies: sleep "^5.0.0" @@ -93,3 +98,9 @@ supports-color@^4.0.0: resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" dependencies: has-flag "^2.0.0" + +supports-color@^5.0.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + dependencies: + has-flag "^3.0.0" From 65dc5e423a00cbbfbd9b1475d8956a33775a163f Mon Sep 17 00:00:00 2001 From: Carl Eiserman Date: Fri, 19 Oct 2018 20:40:04 +0200 Subject: [PATCH 2/2] chore: new yarn lockfile --- yarn.lock | 54 ++++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/yarn.lock b/yarn.lock index 473d790..615854b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,9 +2,9 @@ # yarn lockfile v1 -ansi-styles@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88" +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" dependencies: color-convert "^1.9.0" @@ -13,20 +13,20 @@ ansi@^0.3.0: resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" chalk@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.2.0.tgz#477b3bf2f9b8fd5ca9e429747e37f724ee7af240" + version "2.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" dependencies: - ansi-styles "^3.1.0" + ansi-styles "^3.2.1" escape-string-regexp "^1.0.5" - supports-color "^4.0.0" + supports-color "^5.3.0" color-convert@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" dependencies: - color-name "^1.1.1" + color-name "1.1.3" -color-name@^1.1.1: +color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" @@ -38,17 +38,13 @@ get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" -has-flag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" line-by-line@^0.1.3: - version "0.1.5" - resolved "https://registry.yarnpkg.com/line-by-line/-/line-by-line-0.1.5.tgz#19c45b59f0a80632c30b5c43a647fe15aab905c2" + version "0.1.6" + resolved "https://registry.yarnpkg.com/line-by-line/-/line-by-line-0.1.6.tgz#6236edd1db2d1695addf11f0268e74a181561c30" lolcatjs@^2.3.2: version "2.3.2" @@ -65,25 +61,25 @@ lolcatjs@^2.3.2: minimist@^1.1.1: version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" moment@^2.19.1: - version "2.19.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.1.tgz#56da1a2d1cbf01d38b7e1afc31c10bcfa1929167" + version "2.22.2" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66" multiline@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/multiline/-/multiline-1.0.2.tgz#69b1f25ff074d2828904f244ddd06b7d96ef6c93" + resolved "http://registry.npmjs.org/multiline/-/multiline-1.0.2.tgz#69b1f25ff074d2828904f244ddd06b7d96ef6c93" dependencies: strip-indent "^1.0.0" nan@>=2.5.1: - version "2.7.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" + version "2.11.1" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766" sleep@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/sleep/-/sleep-5.1.1.tgz#878fa1d44d08eeb0f26fb2018ef8629eb1a3ab94" + version "5.2.3" + resolved "https://registry.yarnpkg.com/sleep/-/sleep-5.2.3.tgz#be8852dd8cf91c8f206d21d681c64754cbceb33c" dependencies: nan ">=2.5.1" @@ -93,13 +89,7 @@ strip-indent@^1.0.0: dependencies: get-stdin "^4.0.1" -supports-color@^4.0.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" - dependencies: - has-flag "^2.0.0" - -supports-color@^5.0.0: +supports-color@^5.0.0, supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" dependencies: