Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
sibiraj-s authored Sep 1, 2018
2 parents e1c190d + 053c9f6 commit 2344855
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ __Notes:__ Issues with the output should be reported on the babel [issue tracker

<h2 align="center">Install</h2>

> webpack 3.x | babel-loader 8.x | babel 7.x
> webpack 4.x | babel-loader 8.x | babel 7.x
```bash
npm install -D "babel-loader@^8.0.0-beta" @babel/core @babel/preset-env webpack
npm install -D babel-loader @babel/core @babel/preset-env webpack
```

> webpack 3.x babel-loader 7.x | babel 6.x
> webpack 4.x | babel-loader 7.x | babel 6.x
```bash
npm install -D babel-loader babel-core babel-preset-env webpack
npm install -D babel-loader@7 babel-core babel-preset-env webpack
```

<h2 align="center">Usage</h2>
Expand Down Expand Up @@ -88,9 +88,6 @@ This loader also supports the following loader-specific option:

* `cacheIdentifier`: Default is a string composed by the babel-core's version, the babel-loader's version, the contents of .babelrc file if it exists and the value of the environment variable `BABEL_ENV` with a fallback to the `NODE_ENV` environment variable. This can be set to a custom value to force cache busting if the identifier changes.

* `babelrc`: Default `true`. When `false`, no options from `.babelrc` files will be used; only the options passed to
`babel-loader` will be used.

__Note:__ The `sourceMap` option is ignored, instead sourceMaps are automatically enabled when webpack is configured to use them (via the `devtool` config option).

## Troubleshooting
Expand Down
7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "babel-loader",
"version": "8.0.0-beta.6",
"version": "8.0.0",
"description": "babel module loader for webpack",
"files": [
"lib"
Expand All @@ -16,7 +16,7 @@
"util.promisify": "^1.0.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0 || ^7.0.0-rc || ^7.0.0-beta.41",
"@babel/core": "^7.0.0",
"webpack": ">=2"
},
"devDependencies": {
Expand Down Expand Up @@ -53,9 +53,6 @@
"test": "yarn run lint && cross-env BABEL_ENV=test yarn run build && yarn run test-only",
"test-only": "nyc ava"
},
"publishConfig": {
"tag": "next"
},
"repository": {
"type": "git",
"url": "https://github.com/babel/babel-loader.git"
Expand Down

0 comments on commit 2344855

Please sign in to comment.