babel-loader 7.1.0 → 7.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -1
- package/lib/index.js +7 -5
- package/lib/resolve-rc.js +1 -1
- package/lib/utils/exists.js +3 -1
- package/package.json +9 -9
package/README.md
CHANGED
|
@@ -15,13 +15,15 @@
|
|
|
15
15
|
|
|
16
16
|
This package allows transpiling JavaScript files using [Babel](https://github.com/babel/babel) and [webpack](https://github.com/webpack/webpack).
|
|
17
17
|
|
|
18
|
-
__Notes:__ Issues with the output should be reported on the babel [issue tracker](https://github.com/babel/babel/issues)
|
|
18
|
+
__Notes:__ Issues with the output should be reported on the babel [issue tracker](https://github.com/babel/babel/issues).
|
|
19
19
|
|
|
20
20
|
<h2 align="center">Install</h2>
|
|
21
21
|
|
|
22
22
|
> webpack 1.x | babel-loader <= 6.x
|
|
23
23
|
>
|
|
24
24
|
> webpack 2.x | babel-loader >= 7.x (recommended) (^6.2.10 will also work, but with deprecation warnings)
|
|
25
|
+
>
|
|
26
|
+
> webpack 3.x | babel-loader >= 7.1
|
|
25
27
|
|
|
26
28
|
```bash
|
|
27
29
|
yarn add babel-loader babel-core babel-preset-env webpack --dev
|
package/lib/index.js
CHANGED
|
@@ -16,12 +16,13 @@ var fs = require("fs");
|
|
|
16
16
|
*/
|
|
17
17
|
function BabelLoaderError(name, message, codeFrame, hideStack, error) {
|
|
18
18
|
Error.call(this);
|
|
19
|
-
Error.captureStackTrace(this, BabelLoaderError);
|
|
20
19
|
|
|
21
20
|
this.name = "BabelLoaderError";
|
|
22
21
|
this.message = formatMessage(name, message, codeFrame);
|
|
23
22
|
this.hideStack = hideStack;
|
|
24
23
|
this.error = error;
|
|
24
|
+
|
|
25
|
+
Error.captureStackTrace(this, BabelLoaderError);
|
|
25
26
|
}
|
|
26
27
|
|
|
27
28
|
BabelLoaderError.prototype = Object.create(Error.prototype);
|
|
@@ -100,14 +101,15 @@ function passMetadata(s, context, metadata) {
|
|
|
100
101
|
module.exports = function (source, inputSourceMap) {
|
|
101
102
|
var _this = this;
|
|
102
103
|
|
|
103
|
-
|
|
104
|
-
var webpackRemainingChain = loaderUtils.getRemainingRequest(this).split("!");
|
|
105
|
-
var filename = webpackRemainingChain[webpackRemainingChain.length - 1];
|
|
104
|
+
var filename = this.resourcePath;
|
|
106
105
|
|
|
107
106
|
// Handle options
|
|
108
107
|
var loaderOptions = loaderUtils.getOptions(this) || {};
|
|
109
108
|
var fileSystem = this.fs ? this.fs : fs;
|
|
110
|
-
var babelrcPath =
|
|
109
|
+
var babelrcPath = null;
|
|
110
|
+
if (loaderOptions.babelrc !== false) {
|
|
111
|
+
babelrcPath = typeof loaderOptions.babelrc === "string" && exists(fileSystem, loaderOptions.babelrc) ? loaderOptions.babelrc : resolveRc(fileSystem, path.dirname(filename));
|
|
112
|
+
}
|
|
111
113
|
|
|
112
114
|
if (babelrcPath) {
|
|
113
115
|
this.addDependency(babelrcPath);
|
package/lib/resolve-rc.js
CHANGED
|
@@ -4,7 +4,7 @@ var path = require("path");
|
|
|
4
4
|
var exists = require("./utils/exists");
|
|
5
5
|
|
|
6
6
|
module.exports = function find(fileSystem, start) {
|
|
7
|
-
var _arr = [".babelrc", "
|
|
7
|
+
var _arr = [".babelrc", "package.json"];
|
|
8
8
|
|
|
9
9
|
for (var _i = 0; _i < _arr.length; _i++) {
|
|
10
10
|
var fileName = _arr[_i];
|
package/lib/utils/exists.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "babel-loader",
|
|
3
|
-
"version": "7.1.
|
|
3
|
+
"version": "7.1.4",
|
|
4
4
|
"description": "babel module loader for webpack",
|
|
5
5
|
"files": [
|
|
6
6
|
"lib"
|
|
@@ -15,32 +15,32 @@
|
|
|
15
15
|
"mkdirp": "^0.5.1"
|
|
16
16
|
},
|
|
17
17
|
"peerDependencies": {
|
|
18
|
-
"babel-core": "6
|
|
19
|
-
"webpack": "2 || 3"
|
|
18
|
+
"babel-core": "6",
|
|
19
|
+
"webpack": "2 || 3 || 4"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
|
-
"ava": "^0.
|
|
22
|
+
"ava": "^0.23.0",
|
|
23
23
|
"babel-cli": "^6.18.0",
|
|
24
24
|
"babel-core": "^6.0.0",
|
|
25
|
-
"babel-eslint": "^
|
|
25
|
+
"babel-eslint": "^8.0.0",
|
|
26
26
|
"babel-plugin-istanbul": "^4.0.0",
|
|
27
27
|
"babel-plugin-react-intl": "^2.1.3",
|
|
28
28
|
"babel-preset-env": "^1.2.0",
|
|
29
29
|
"babel-register": "^6.18.0",
|
|
30
30
|
"cross-env": "^5.0.0",
|
|
31
|
-
"eslint": "^
|
|
31
|
+
"eslint": "^4.1.0",
|
|
32
32
|
"eslint-config-babel": "^7.0.0",
|
|
33
33
|
"eslint-plugin-flowtype": "^2.25.0",
|
|
34
34
|
"eslint-plugin-prettier": "^2.1.2",
|
|
35
|
-
"husky": "^0.
|
|
35
|
+
"husky": "^0.14.0",
|
|
36
36
|
"lint-staged": "^4.0.0",
|
|
37
37
|
"nyc": "^11.0.1",
|
|
38
38
|
"prettier": "^1.2.2",
|
|
39
|
-
"react": "^
|
|
39
|
+
"react": "^16.0.0",
|
|
40
40
|
"react-intl": "^2.1.2",
|
|
41
41
|
"react-intl-webpack-plugin": "^0.0.3",
|
|
42
42
|
"rimraf": "^2.4.3",
|
|
43
|
-
"webpack": "^
|
|
43
|
+
"webpack": "^4.0.0"
|
|
44
44
|
},
|
|
45
45
|
"scripts": {
|
|
46
46
|
"clean": "rimraf lib/",
|