Skip to content

Commit 33d75fa

Browse files
committed
[deps] Updated the dependencies
1 parent ec922f5 commit 33d75fa

16 files changed

Lines changed: 51 additions & 50 deletions

‎.babelrc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"optional": [
3+
"runtime",
4+
"es7.objectRestSpread",
5+
],
6+
}

‎.eslintrc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"extends": ["defaults"],
23
"env": {
34
"browser": true,
45
"node": true
@@ -11,7 +12,7 @@
1112
"react"
1213
],
1314
"rules": {
14-
"comma-dangle": "always",
15+
"comma-dangle": [2, "always-multiline"],
1516
"comma-spacing": 1,
1617
"key-spacing": 0,
1718
"no-mixed-spaces-and-tabs": 2,
@@ -31,6 +32,6 @@
3132
"react/react-in-jsx-scope": 1,
3233
"react/self-closing-comp": 1,
3334
"react/wrap-multilines": 1,
34-
"strict": [1, "global"]
35+
"strict": [1, "never"]
3536
}
3637
}

‎HISTORY.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# History
22

3+
## 0.3.3
4+
5+
- Bump all deps
6+
37
## 0.3.2
48
- Bump deps
59

‎karma.conf.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/* eslint no-var: 0 */
1+
/* eslint no-var: 0, strict: [2, "global"] */
22
"use strict";
3-
require("./register-babel");
3+
require("babel/register");
44

55
var webpackConfig = require("./webpack/test.config.js");
66
var isCI = process.env.CONTINUOUS_INTEGRATION === "true";
@@ -16,7 +16,7 @@ module.exports = function (config) {
1616
],
1717

1818
files: [
19-
"test/index.js"
19+
"test/index.js",
2020
],
2121

2222
preprocessors: {

‎package.json‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,34 @@
2525
},
2626
"homepage": "https://github.com/dozoisch/react-async-script",
2727
"devDependencies": {
28-
"babel": "~5.4.7",
29-
"babel-core": "~5.4.7",
30-
"babel-eslint": "~3.1.9",
31-
"babel-loader": "~5.1.3",
32-
"chai": "~2.2.0",
28+
"babel": "~5.8.21",
29+
"babel-core": "~5.8.22",
30+
"babel-eslint": "~4.0.8",
31+
"babel-loader": "~5.3.2",
32+
"chai": "~3.2.0",
3333
"child-process-promise": "~1.1.0",
3434
"colors": "~1.1.0",
3535
"es5-shim": "~4.1.3",
36-
"eslint": "~0.21.2",
37-
"eslint-plugin-react": "~2.3.0",
36+
"eslint": "~1.1.0",
37+
"eslint-config-defaults": "~4.0.1",
38+
"eslint-plugin-react": "~3.2.3",
3839
"fs-promise": "~0.3.1",
39-
"karma": "~0.12.33",
40+
"karma": "~0.13.9",
4041
"karma-chai": "~0.1.0",
41-
"karma-chrome-launcher": "~0.1.8",
42-
"karma-cli": "~0.0.4",
43-
"karma-mocha": "~0.1.10",
44-
"karma-mocha-reporter": "~1.0.2",
45-
"karma-phantomjs-launcher": "~0.1.4",
46-
"karma-sourcemap-loader": "~0.3.4",
47-
"karma-webpack": "~1.5.1",
48-
"lodash": "~3.9.3",
42+
"karma-chrome-launcher": "~0.2.0",
43+
"karma-cli": "~0.1.0",
44+
"karma-mocha": "~0.2.0",
45+
"karma-mocha-reporter": "~1.1.1",
46+
"karma-phantomjs-launcher": "~0.2.1",
47+
"karma-sourcemap-loader": "~0.3.5",
48+
"karma-webpack": "~1.7.0",
49+
"lodash": "~3.10.1",
4950
"mocha": "~2.2.5",
5051
"react": "~0.13.3",
51-
"webpack": "~1.9.10",
52-
"yargs": "~3.9.1"
52+
"webpack": "~1.11.0",
53+
"yargs": "~3.19.0"
5354
},
5455
"dependencies": {
55-
"babel-runtime": "~5.4.7"
56+
"babel-runtime": "^5.8.0"
5657
}
5758
}

‎register-babel.js‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎run-babel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env node
22
/* eslint no-var: 0 */
33
var path = require("path");
4-
require("./register-babel");
4+
require("babel/register");
55
var mod = require(path.join(__dirname, process.argv[2]));
66

77
if (typeof mod === "function") {

‎src/async-script-loader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default function makeAsyncScript(Component, scriptURL, options) {
4444

4545
componentDidMount() {
4646
const key = this.asyncScriptLoaderGetScriptLoaderID();
47-
const { globalName, callbackName, } = options;
47+
const { globalName, callbackName } = options;
4848
if (globalName && typeof window[globalName] !== "undefined") {
4949
SCRIPT_MAP.set(scriptURL, { loaded: true, observers: new Map() });
5050
}

‎test/async-script-loader-spec.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
"use strict";
21
import React from "react";
32
import ReactTestUtils from "react/lib/ReactTestUtils";
43
import makeAsyncScriptLoader from "../src/async-script-loader";
@@ -13,7 +12,7 @@ const MockedComponent = React.createClass({
1312

1413
render() {
1514
return <span/>;
16-
}
15+
},
1716
});
1817

1918
describe("AsyncScriptLoader", () => {
@@ -44,7 +43,7 @@ describe("AsyncScriptLoader", () => {
4443

4544
it("should expose functions with scope correctly", (done) => {
4645
let ComponentWrapper = makeAsyncScriptLoader(MockedComponent, "http://example.com", {
47-
exposeFuncs: ["callsACallback"]
46+
exposeFuncs: ["callsACallback"],
4847
});
4948
let instance = ReactTestUtils.renderIntoDocument(
5049
<ComponentWrapper />

‎test/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
"use strict";
21
import "es5-shim";
32
const testsContext = require.context(".", true, /-spec$/);
43
testsContext.keys().forEach(testsContext);

0 commit comments

Comments
 (0)