Skip to content

Commit

Permalink
Merge pull request #295 from ruipserra/react-18
Browse files Browse the repository at this point in the history
  • Loading branch information
danbovey authored Apr 13, 2022
2 parents e57d2c2 + 32c224c commit dcee172
Show file tree
Hide file tree
Showing 13 changed files with 44,054 additions and 31,130 deletions.
5 changes: 3 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ const prettierOptions = JSON.parse(fs.readFileSync('./.prettierrc', 'utf8'));
module.exports = {
extends: ['last', 'prettier', 'prettier/react', 'plugin:react/recommended'],
plugins: ['react', 'prettier'],
env: {
browser: true,
},
globals: {
document: true,
window: true,
describe: true,
it: true,
module: true,
Expand Down
10 changes: 6 additions & 4 deletions docs/demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ <h2 class="project-tagline">Infinite scroll component for React in ES6</h2>

<section class="main-content">
<h3>Demo</h3>
<p>The source code to this demo can be found in the repo's <a
href="https://github.com/danbovey/react-infinite-scroller/tree/master/docs">docs folder</a>. Below,
the component infinite scrolls my entire history of SoundCloud favourites! N.B. Making GitHub issues about
my taste in music is not cool guys!</p>
<p>
The source code to this demo can be found in the repo's
<a href="https://github.com/danbovey/react-infinite-scroller/tree/master/docs">docs folder</a>.

Below, the component infinite scrolls <a href="https://github.com/facebook/react">React's Github issues</a>.
</p>
</section>

<section class="main-content">
Expand Down
6 changes: 3 additions & 3 deletions docs/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ var buffer = require('vinyl-buffer')
var browserify = require('browserify');
var babelify = require('babelify');

gulp.task('default', ['js']);

gulp.task('js', function() {
return browserify('src/index.js').transform(babelify, {presets: ["es2015", "react"]})
.bundle()
.pipe(source('index.js'))
.pipe(buffer())
.pipe(rename('script.js'))
.pipe(gulp.dest('./js'));
});
});

gulp.task('default', gulp.series('js'));
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<body>
<section class="page-header">
<h1 class="project-name">React Infinite Scroller</h1>
<h2 class="project-tagline">Infinite scroll component for React in ES6</h2>
<h2 class="project-tagline">Infinite scroll component for React</h2>
<a href="demo" class="btn">View Demo</a>
<a href="https://github.com/danbovey/react-infinite-scroller" class="btn">View on GitHub</a>
</section>
Expand Down
Loading

0 comments on commit dcee172

Please sign in to comment.