Skip to content

Commit

Permalink
Upgrade: some deps (fixes #11372) (#11373)
Browse files Browse the repository at this point in the history
  • Loading branch information
aladdin-add committed Feb 13, 2019
1 parent 3e0c417 commit f1d3a7e
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 21 deletions.
6 changes: 3 additions & 3 deletions Makefile.js
Expand Up @@ -821,13 +821,13 @@ target.browserify = function() {
}

// 2. browserify the temp directory
exec(`${getBinFile("browserify")} -x espree lib/linter.js -o ${BUILD_DIR}eslint.js -s eslint --global-transform [ babelify --presets [ es2015 ] ]`);
exec(`${getBinFile("browserify")} -x espree lib/linter.js -o ${BUILD_DIR}eslint.js -s eslint --global-transform [ babelify --presets [ @babel/preset-env ] ]`);

// 3. Browserify espree
exec(`${getBinFile("browserify")} -r espree -o ${TEMP_DIR}espree.js --global-transform [ babelify --presets [ es2015 ] ]`);
exec(`${getBinFile("browserify")} -r espree -o ${TEMP_DIR}espree.js --global-transform [ babelify --presets [ @babel/preset-env ] ]`);

// 4. Concatenate Babel polyfill, Espree, and ESLint files together
cat("./node_modules/babel-polyfill/dist/polyfill.js", `${TEMP_DIR}espree.js`, `${BUILD_DIR}eslint.js`).to(`${BUILD_DIR}eslint.js`);
cat("./node_modules/@babel/polyfill/dist/polyfill.js", `${TEMP_DIR}espree.js`, `${BUILD_DIR}eslint.js`).to(`${BUILD_DIR}eslint.js`);

// 5. remove temp directory
rm("-rf", TEMP_DIR);
Expand Down
4 changes: 4 additions & 0 deletions docs/developer-guide/working-with-rules.md
Expand Up @@ -333,6 +333,7 @@ Best practices for fixes:

({ "foo": 1 })
```

* This fixer can just select a quote type arbitrarily. If it guesses wrong, the resulting code will be automatically reported and fixed by the [`quotes`](/docs/rules/quotes.md) rule.

### context.options
Expand Down Expand Up @@ -405,16 +406,19 @@ Once you have an instance of `SourceCode`, you can use the methods on it to work
* `commentsExistBetween(nodeOrToken1, nodeOrToken2)` - returns `true` if comments exist between two nodes.

> `skipOptions` is an object which has 3 properties; `skip`, `includeComments`, and `filter`. Default is `{skip: 0, includeComments: false, filter: null}`.
>
> * `skip` is a positive integer, the number of skipping tokens. If `filter` option is given at the same time, it doesn't count filtered tokens as skipped.
> * `includeComments` is a boolean value, the flag to include comment tokens into the result.
> * `filter` is a function which gets a token as the first argument, if the function returns `false` then the result excludes the token.
>
> `countOptions` is an object which has 3 properties; `count`, `includeComments`, and `filter`. Default is `{count: 0, includeComments: false, filter: null}`.
>
> * `count` is a positive integer, the maximum number of returning tokens.
> * `includeComments` is a boolean value, the flag to include comment tokens into the result.
> * `filter` is a function which gets a token as the first argument, if the function returns `false` then the result excludes the token.
>
> `rangeOptions` is an object which has 1 property: `includeComments`.
>
> * `includeComments` is a boolean value, the flag to include comment tokens into the result.
There are also some properties you can access:
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Expand Up @@ -36,7 +36,7 @@ module.exports = function(config) {
},
babelPreprocessor: {
options: {
presets: ["es2015"]
presets: ["@babel/preset-env"]
}
},

Expand Down
32 changes: 16 additions & 16 deletions package.json
Expand Up @@ -36,11 +36,11 @@
"bugs": "https://github.com/eslint/eslint/issues/",
"dependencies": {
"@babel/code-frame": "^7.0.0",
"ajv": "^6.5.3",
"ajv": "^6.9.1",
"chalk": "^2.1.0",
"cross-spawn": "^6.0.5",
"debug": "^4.0.1",
"doctrine": "^2.1.0",
"doctrine": "^3.0.0",
"eslint-scope": "^4.0.0",
"eslint-utils": "^1.3.1",
"eslint-visitor-keys": "^1.0.0",
Expand All @@ -54,11 +54,11 @@
"ignore": "^4.0.6",
"import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4",
"inquirer": "^6.1.0",
"inquirer": "^6.2.2",
"js-yaml": "^3.12.0",
"json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.3.0",
"lodash": "^4.17.5",
"lodash": "^4.17.11",
"minimatch": "^3.0.4",
"mkdirp": "^0.5.1",
"natural-compare": "^1.4.0",
Expand All @@ -69,14 +69,14 @@
"semver": "^5.5.1",
"strip-ansi": "^4.0.0",
"strip-json-comments": "^2.0.1",
"table": "^5.0.2",
"table": "^5.2.3",
"text-table": "^0.2.0"
},
"devDependencies": {
"babel-core": "^6.26.3",
"babel-polyfill": "^6.26.0",
"babel-preset-es2015": "^6.24.1",
"babelify": "^8.0.0",
"@babel/core": "^7.2.2",
"@babel/polyfill": "^7.2.5",
"@babel/preset-env": "^7.3.1",
"babelify": "^10.0.0",
"beefy": "^2.1.8",
"brfs": "^2.0.0",
"browserify": "^16.2.2",
Expand All @@ -91,26 +91,26 @@
"eslint-plugin-rulesdir": "^0.1.0",
"eslint-release": "^1.2.0",
"eslint-rule-composer": "^0.3.0",
"eslump": "^1.6.2",
"eslump": "^2.0.0",
"esprima": "^4.0.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.5.5",
"karma": "^3.0.0",
"karma-babel-preprocessor": "^7.0.0",
"karma": "^3.1.4",
"karma-babel-preprocessor": "^8.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-mocha": "^1.3.0",
"karma-mocha-reporter": "^2.2.3",
"leche": "^2.2.3",
"load-perf": "^0.2.0",
"markdownlint": "^0.11.0",
"markdownlint": "^0.12.0",
"mocha": "^5.0.5",
"mock-fs": "^4.6.0",
"mock-fs": "^4.8.0",
"npm-license": "^0.3.3",
"proxyquire": "^2.0.1",
"puppeteer": "^1.9.0",
"puppeteer": "^1.12.2",
"shelljs": "^0.8.2",
"sinon": "^3.3.0",
"temp": "^0.8.3",
"temp": "^0.9.0",
"through": "^2.3.8"
},
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-eslint/package.json
Expand Up @@ -20,7 +20,7 @@
"homepage": "https://eslint.org",
"bugs": "https://github.com/eslint/eslint/issues/",
"dependencies": {
"js-yaml": "^3.5.1"
"js-yaml": "^3.12.1"
},
"peerDependencies": {
"eslint-plugin-node": "^6.0.1 || ^7.0.1 || ^8.0.0"
Expand Down

0 comments on commit f1d3a7e

Please sign in to comment.