Skip to content

Commit dcee172

Browse files
authored
Merge pull request #295 from ruipserra/react-18
2 parents e57d2c2 + 32c224c commit dcee172

File tree

13 files changed

+44054
-31130
lines changed

13 files changed

+44054
-31130
lines changed

.eslintrc.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ const prettierOptions = JSON.parse(fs.readFileSync('./.prettierrc', 'utf8'));
55
module.exports = {
66
extends: ['last', 'prettier', 'prettier/react', 'plugin:react/recommended'],
77
plugins: ['react', 'prettier'],
8+
env: {
9+
browser: true,
10+
},
811
globals: {
9-
document: true,
10-
window: true,
1112
describe: true,
1213
it: true,
1314
module: true,

docs/demo/index.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ <h2 class="project-tagline">Infinite scroll component for React in ES6</h2>
2323

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

3234
<section class="main-content">

docs/gulpfile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ var buffer = require('vinyl-buffer')
55
var browserify = require('browserify');
66
var babelify = require('babelify');
77

8-
gulp.task('default', ['js']);
9-
108
gulp.task('js', function() {
119
return browserify('src/index.js').transform(babelify, {presets: ["es2015", "react"]})
1210
.bundle()
1311
.pipe(source('index.js'))
1412
.pipe(buffer())
1513
.pipe(rename('script.js'))
1614
.pipe(gulp.dest('./js'));
17-
});
15+
});
16+
17+
gulp.task('default', gulp.series('js'));

docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<body>
1717
<section class="page-header">
1818
<h1 class="project-name">React Infinite Scroller</h1>
19-
<h2 class="project-tagline">Infinite scroll component for React in ES6</h2>
19+
<h2 class="project-tagline">Infinite scroll component for React</h2>
2020
<a href="demo" class="btn">View Demo</a>
2121
<a href="https://github.com/danbovey/react-infinite-scroller" class="btn">View on GitHub</a>
2222
</section>

0 commit comments

Comments
 (0)