Update from upstream repo 1egoman/funnies #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Remove node_modules path from npm run scripts * Add entry file for browserify task
* code: add uglify to the build, and rebuild * code: rebuild one more time * Create .npmingore * Delete .npmingore
* new funny added * Update funnies.js removed merge conflict
Add more phrases
* updated with some phrases * updated with deleted phrases * Conflict resolved * another conflict resolved * conflict
* Added few funny quotes.. * missing comma
* add babel presets * add simple gulpfile Includes babel transpiling, uglifying, and bundling of JS. * add separate gulp task for production * Add envify Add envify to remove the development code from React * change prod bundle name * make gulpfile more DRY * change build script to run gulp production task * add missing semicolon * change output name to funnies * add babel task * change default task Running the default gulp task now does the following: - Transpiles the source code using Babel and drops it into the dist directory so that require works (gulp babel) - Creates an unmified dev version of the bundle (gulp dev) - Creates a minified, production version of the bundle (gulp prod) Development version of bundle is called funnies.dev.js so that it does not conflict with the funnies data. * update gulp-babel; add vinyl-source-stream * delete release script Update build script and delete release script since everything can now be done with the default Gulp task. * remove fs Remove fs since it's no longer used.
* another funny line ✨ * Comma
- Adding some random quotes from IT Crowd
* add funny phrase * Added funny - line 214
* Update funnies.js * Update funnies.js
* added more funnies * Update funnies.js
Added a new entry to improve product. :)
* Add some "jokes" * Made joke funnier! * Reverse accidental change of double- to singel-quotes
At some point along the line, funnies ended up unintentionally requiring a dependency on react. Break out the react-only code into it's own module.
Because you can't have enough of Chuck Norris
* fix: add node v12 to ci tests, update version of react * dist: update built docs bundle * fix: update gulp to v4 so that it works on node v12
* Added more phrases added four. * Added more phrases Added more phrases.
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.11...4.17.13) Signed-off-by: dependabot[bot] <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hello!
The remote
1egoman/funnieshas some new changes that aren't in this fork.So, here they are, ready to be merged! 🎉
If this pull request can be merged without conflict, you can publish your software
with these new changes. Otherwise, if you have merge conflicts, this
is the place to fix them.
Have fun! 👋
From,
🏊 Your Neighborly Backstroke Bot
PS. Hey, there's a new version of Backstroke available. If you'd like to configure repo-to-repo syncing or sync to all forks, check it out here.