Skip to content

Commit de0814c

Browse files
authored
Merge pull request facebook#9 from StevenTCramer/master
Removed references to eslint and updated README closes facebook#6
2 parents 11f21c1 + 6e03757 commit de0814c

File tree

4 files changed

+11
-34
lines changed

4 files changed

+11
-34
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ template/src/__tests__/__snapshots__/
77
lerna-debug.log
88
npm-debug.log
99
/.changelog
10+
yarn.lock

packages/react-scripts/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
},
1313
"files": [
1414
".babelrc",
15-
".eslintrc",
1615
"config",
1716
"bin",
1817
"scripts",

packages/react-scripts/scripts/start.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,12 @@ function setupCompiler(host, port, protocol) {
127127
console.log(message);
128128
console.log();
129129
});
130-
// Teach some ESLint tricks.
131-
console.log('You may use special comments to disable some warnings.');
132-
console.log('Use ' + chalk.yellow('// eslint-disable-next-line') + ' to ignore the next line.');
133-
console.log('Use ' + chalk.yellow('/* eslint-disable */') + ' to ignore all warnings in a file.');
130+
// Teach some TSLint tricks.
131+
console.log('You may use special comments to disable some warnings.');
132+
console.log('Use ' + chalk.yellow('tslint:disable-line') + ' to disable this line.');
133+
console.log('Use ' + chalk.yellow('tslint:disable-next-line') + ' to ignore the rules on next line.');
134+
console.log('Use ' + chalk.yellow('tslint:disable ') + ' to disable linting for rest of file.');
135+
console.log('Use ' + chalk.yellow('tslint:enable ') + ' to enable linting for rest of file.');
134136
}
135137
});
136138
}

packages/react-scripts/template/README.md

+4-29
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ See the section about [deployment](#deployment) for more information.
158158

159159
If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
160160

161-
Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
161+
Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, TSLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
162162

163163
You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
164164

@@ -170,36 +170,11 @@ To configure the syntax highlighting in your favorite text editor, head to the [
170170

171171
>Note: this feature is available with `react-scripts@0.2.0` and higher.
172172
173-
Some editors, including Sublime Text, Atom, and Visual Studio Code, provide plugins for ESLint.
173+
Some editors, including Sublime Text, Atom, and Visual Studio Code, provide plugins for TSLint.
174174

175175
They are not required for linting. You should see the linter output right in your terminal as well as the browser console. However, if you prefer the lint results to appear right in your editor, there are some extra steps you can do.
176176

177-
You would need to install an ESLint plugin for your editor first.
178-
179-
>**A note for Atom `linter-eslint` users**
180-
181-
>If you are using the Atom `linter-eslint` plugin, make sure that **Use global ESLint installation** option is checked:
182-
183-
><img src="http://i.imgur.com/yVNNHJM.png" width="300">
184-
185-
Then add this block to the `package.json` file of your project:
186-
187-
```js
188-
{
189-
// ...
190-
"eslintConfig": {
191-
"extends": "react-app"
192-
}
193-
}
194-
```
195-
196-
Finally, you will need to install some packages *globally*:
197-
198-
```sh
199-
npm install -g eslint-config-react-app@0.3.0 eslint@3.8.1 babel-eslint@7.0.0 eslint-plugin-react@6.4.1 eslint-plugin-import@2.0.1 eslint-plugin-jsx-a11y@2.2.3 eslint-plugin-flowtype@2.21.0
200-
```
201-
202-
We recognize that this is suboptimal, but it is currently required due to the way we hide the ESLint dependency. The ESLint team is already [working on a solution to this](https://github.com/eslint/eslint/issues/3458) so this may become unnecessary in a couple of months.
177+
You would need to install an TSLint plugin for your editor first.
203178

204179
## Changing the Page `<title>`
205180

@@ -448,7 +423,7 @@ const $ = window.$;
448423

449424
This makes it obvious you are using a global variable intentionally rather than because of a typo.
450425

451-
Alternatively, you can force the linter to ignore any line by adding `// eslint-disable-line` after it.
426+
Alternatively, you can force the linter to ignore any line by adding `// tslint:disable-line` after it.
452427

453428
## Adding Bootstrap
454429

0 commit comments

Comments
 (0)