diff --git a/client/.eslintrc b/client/.eslintrc
index 5dcd79f90..f2f6f2521 100644
--- a/client/.eslintrc
+++ b/client/.eslintrc
@@ -1,173 +1,257 @@
-# ESLint documentation can be found at http://eslint.org/docs/
-# find . -path ./node_modules -prune -o -name "*.js" -o -name "*.jsx" -exec eslint {} \;
-parser: "babel-eslint"
-plugins: ["react"]
-ecmaFeatures:
- jsx: true
-env:
- browser: true
- node: true
- amd: false
- mocha: true
- jasmine: false
-rules:
- no-alert: 2
- no-array-constructor: 2
- no-bitwise: 0
- no-caller: 2
- no-catch-shadow: 2
- no-comma-dangle: 2
- no-cond-assign: [2, 'always']
- no-console: 0
- no-constant-condition: 2
- no-control-regex: 2
- no-debugger: 2
- no-delete-var: 2
- no-div-regex: 0
- no-dupe-keys: 2
- no-dupe-args: 2
- no-duplicate-case: 2
- no-else-return: 2
- no-empty: 2
- no-empty-class: 2
- no-empty-label: 2
- no-eq-null: 2
- no-eval: 2
- no-ex-assign: 2
- no-extend-native: 2
- no-extra-bind: 2
- no-extra-boolean-cast: 2
- no-extra-parens: 0
- no-extra-semi: 2
- no-fallthrough: 2
- no-floating-decimal: 0
- no-func-assign: 2
- no-implied-eval: 2
- no-inline-comments: 0
- no-inner-declarations: [2, 'functions']
- no-invalid-regexp: 2
- no-irregular-whitespace: 2
- no-iterator: 2
- no-label-var: 2
- no-labels: 2
- no-lone-blocks: 2
- no-lonely-if: 2
- no-loop-func: 2
- no-mixed-requires: [0, false]
- no-mixed-spaces-and-tabs: [2, false]
- no-multi-spaces: 2
- no-multi-str: 2
- no-multiple-empty-lines: [2, {max: 2}]
- no-native-reassign: 2
- no-negated-in-lhs: 2
- no-nested-ternary: 0
- no-new: 2
- no-new-func: 2
- no-new-object: 2
- no-new-require: 0
- no-new-wrappers: 2
- no-obj-calls: 2
- no-octal: 2
- no-octal-escape: 2
- no-path-concat: 0
- no-plusplus: 0
- no-process-env: 0
- no-process-exit: 0
- no-proto: 2
- no-redeclare: 2
- no-regex-spaces: 2
- no-reserved-keys: 0
- no-restricted-modules: 0
- no-return-assign: 2
- no-script-url: 2
- no-self-compare: 2
- no-sequences: 2
- no-shadow: 2
- no-shadow-restricted-names: 2
- no-space-before-semi: 2
- no-spaced-func: 2
- no-sparse-arrays: 2
- no-sync: 0
- no-ternary: 0
- no-trailing-spaces: 2
- no-undef: 2
- no-undef-init: 2
- no-undefined: 0
- no-underscore-dangle: 0
- no-unreachable: 2
- no-unused-expressions: 2
- no-unused-vars: [2, {vars: 'all', args: 'after-used'}]
- no-use-before-define: 2
- no-void: 2
- no-var: 0
- no-warning-comments: [0, {terms: ['todo', 'fixme', 'xxx'], location: 'start'}]
- no-with: 2
- no-wrap-func: 2
- block-scoped-var: 2
- brace-style: 2
- camelcase: 0
- comma-spacing: 2
- comma-style: 2
- complexity: [0, 11]
- consistent-return: 2
- consistent-this: [2, 'self']
- curly: [2, 'all']
- default-case: 0
- dot-notation: [2, {allowKeywords: true}]
- eol-last: 2
- eqeqeq: 2
- func-names: 0
- func-style: [2, 'declaration']
- generator-star: 0
- guard-for-in: 0
- handle-callback-err: 2
- indent: [2, 2]
- key-spacing: [2, {beforeColon: false, afterColon: true}]
- max-depth: [1, 4]
- # Different from 80 chars of AirBnb Javascript
- max-len: [2, 120]
- max-nested-callbacks: [1, 2]
- max-params: [1, 4]
- max-statements: [0, 10]
- new-cap: 2
- new-parens: 2
- one-var: 0
- operator-assignment: [0, 'always']
- padded-blocks: 0
- quote-props: 0
- quotes: [2, 'single']
- radix: 2
- semi: 2
- sort-vars: 0
- space-after-function-name: [0, 'never']
- space-after-keywords: 2
- space-before-blocks: 2
- space-before-function-parentheses: [2, "never"]
- space-in-brackets: 2
- space-in-parens: 2
- space-infix-ops: 2
- space-return-throw-case: 2
- space-unary-ops: [2, {words: true, nonwords: false}]
- spaced-line-comment: 2
- strict: [2, 'global']
- use-isnan: 2
- valid-jsdoc: 2
- valid-typeof: 2
- vars-on-top: 0
- wrap-iife: 0
- wrap-regex: 0
- yoda: [2, 'never']
- react/display-name: 1
- react/jsx-quotes: 1
- react/jsx-no-undef: 1
- react/jsx-uses-react: 1
- react/jsx-uses-vars: 1
- react/no-did-mount-set-state: 1
- react/no-did-update-set-state: 1
- react/no-multi-comp: 1
- react/prop-types: 1
- react/react-in-jsx-scope: 1
- react/self-closing-comp: 1
- react/wrap-multilines: 1
-globals:
- Promise: true
+{
+
+/**
+ * Slight changes from https://raw.githubusercontent.com/airbnb/javascript/master/linters/.eslintrc
+ */
+
+ "parser": "babel-eslint",
+ "env": {
+ "browser": true,
+ "node": true
+ },
+ "plugins": ["react"],
+
+ "ecmaFeatures": {
+ "arrowFunctions": true,
+ "blockBindings": true,
+ "classes": true,
+ "defaultParams": true,
+ "destructuring": true,
+ "forOf": true,
+ "generators": false,
+ "modules": true,
+ "objectLiteralComputedProperties": true,
+ "objectLiteralDuplicateProperties": false,
+ "objectLiteralShorthandMethods": true,
+ "objectLiteralShorthandProperties": true,
+ "spread": true,
+ "superInFunctions": true,
+ "templateStrings": true,
+ "jsx": true
+ },
+ "rules": {
+/**
+ * Strict mode
+ */
+ // babel inserts "use strict"; for us
+ // http://eslint.org/docs/rules/strict
+ "strict": [2, "never"],
+
+/**
+ * ES6
+ */
+ "no-var": 2, // http://eslint.org/docs/rules/no-var
+
+/**
+ * Variables
+ */
+ "no-shadow": 2, // http://eslint.org/docs/rules/no-shadow
+ "no-shadow-restricted-names": 2, // http://eslint.org/docs/rules/no-shadow-restricted-names
+ "no-unused-vars": [2, { // http://eslint.org/docs/rules/no-unused-vars
+ "vars": "local",
+ "args": "after-used"
+ }],
+ "no-use-before-define": 2, // http://eslint.org/docs/rules/no-use-before-define
+
+/**
+ * Possible errors
+ */
+ "comma-dangle": [2, "never"], // http://eslint.org/docs/rules/comma-dangle
+ "no-cond-assign": [2, "always"], // http://eslint.org/docs/rules/no-cond-assign
+ "no-console": 1, // http://eslint.org/docs/rules/no-console
+
+ // DEVIATION
+ "no-debugger": 2, // http://eslint.org/docs/rules/no-debugger
+
+ "no-alert": 1, // http://eslint.org/docs/rules/no-alert
+ "no-constant-condition": 1, // http://eslint.org/docs/rules/no-constant-condition
+ "no-dupe-keys": 2, // http://eslint.org/docs/rules/no-dupe-keys
+ "no-duplicate-case": 2, // http://eslint.org/docs/rules/no-duplicate-case
+ "no-empty": 2, // http://eslint.org/docs/rules/no-empty
+ "no-ex-assign": 2, // http://eslint.org/docs/rules/no-ex-assign
+ "no-extra-boolean-cast": 0, // http://eslint.org/docs/rules/no-extra-boolean-cast
+ "no-extra-semi": 2, // http://eslint.org/docs/rules/no-extra-semi
+ "no-func-assign": 2, // http://eslint.org/docs/rules/no-func-assign
+ "no-inner-declarations": 2, // http://eslint.org/docs/rules/no-inner-declarations
+ "no-invalid-regexp": 2, // http://eslint.org/docs/rules/no-invalid-regexp
+ "no-irregular-whitespace": 2, // http://eslint.org/docs/rules/no-irregular-whitespace
+ "no-obj-calls": 2, // http://eslint.org/docs/rules/no-obj-calls
+ "no-reserved-keys": 2, // http://eslint.org/docs/rules/no-reserved-keys
+ "no-sparse-arrays": 2, // http://eslint.org/docs/rules/no-sparse-arrays
+ "no-unreachable": 2, // http://eslint.org/docs/rules/no-unreachable
+ "use-isnan": 2, // http://eslint.org/docs/rules/use-isnan
+ "block-scoped-var": 2, // http://eslint.org/docs/rules/block-scoped-var
+
+/**
+ * Best practices
+ */
+ "consistent-return": 2, // http://eslint.org/docs/rules/consistent-return
+ "curly": [2, "multi-line"], // http://eslint.org/docs/rules/curly
+ "default-case": 2, // http://eslint.org/docs/rules/default-case
+ "dot-notation": [2, { // http://eslint.org/docs/rules/dot-notation
+ "allowKeywords": false
+ }],
+ "eqeqeq": 2, // http://eslint.org/docs/rules/eqeqeq
+ "guard-for-in": 2, // http://eslint.org/docs/rules/guard-for-in
+ "no-caller": 2, // http://eslint.org/docs/rules/no-caller
+ "no-else-return": 2, // http://eslint.org/docs/rules/no-else-return
+ "no-eq-null": 2, // http://eslint.org/docs/rules/no-eq-null
+ "no-eval": 2, // http://eslint.org/docs/rules/no-eval
+ "no-extend-native": 2, // http://eslint.org/docs/rules/no-extend-native
+ "no-extra-bind": 2, // http://eslint.org/docs/rules/no-extra-bind
+ "no-fallthrough": 2, // http://eslint.org/docs/rules/no-fallthrough
+ "no-floating-decimal": 2, // http://eslint.org/docs/rules/no-floating-decimal
+ "no-implied-eval": 2, // http://eslint.org/docs/rules/no-implied-eval
+ "no-lone-blocks": 2, // http://eslint.org/docs/rules/no-lone-blocks
+ "no-loop-func": 2, // http://eslint.org/docs/rules/no-loop-func
+ "no-multi-str": 2, // http://eslint.org/docs/rules/no-multi-str
+ "no-native-reassign": 2, // http://eslint.org/docs/rules/no-native-reassign
+ "no-new": 2, // http://eslint.org/docs/rules/no-new
+ "no-new-func": 2, // http://eslint.org/docs/rules/no-new-func
+ "no-new-wrappers": 2, // http://eslint.org/docs/rules/no-new-wrappers
+ "no-octal": 2, // http://eslint.org/docs/rules/no-octal
+ "no-octal-escape": 2, // http://eslint.org/docs/rules/no-octal-escape
+ "no-param-reassign": 2, // http://eslint.org/docs/rules/no-param-reassign
+ "no-proto": 2, // http://eslint.org/docs/rules/no-proto
+ "no-redeclare": 2, // http://eslint.org/docs/rules/no-redeclare
+ "no-return-assign": 2, // http://eslint.org/docs/rules/no-return-assign
+ "no-script-url": 2, // http://eslint.org/docs/rules/no-script-url
+ "no-self-compare": 2, // http://eslint.org/docs/rules/no-self-compare
+ "no-sequences": 2, // http://eslint.org/docs/rules/no-sequences
+ "no-throw-literal": 2, // http://eslint.org/docs/rules/no-throw-literal
+ "no-with": 2, // http://eslint.org/docs/rules/no-with
+ "radix": 2, // http://eslint.org/docs/rules/radix
+ "vars-on-top": 2, // http://eslint.org/docs/rules/vars-on-top
+ "wrap-iife": [2, "any"], // http://eslint.org/docs/rules/wrap-iife
+ "yoda": 2, // http://eslint.org/docs/rules/yoda
+
+/**
+ * Style
+ */
+ "indent": [2, 2], // http://eslint.org/docs/rules/
+ "brace-style": [2, // http://eslint.org/docs/rules/brace-style
+ "1tbs", {
+ "allowSingleLine": true
+ }],
+ "quotes": [
+ 2, "single", "avoid-escape" // http://eslint.org/docs/rules/quotes
+ ],
+ "camelcase": [2, { // http://eslint.org/docs/rules/camelcase
+ "properties": "never"
+ }],
+ "comma-spacing": [2, { // http://eslint.org/docs/rules/comma-spacing
+ "before": false,
+ "after": true
+ }],
+ "comma-style": [2, "last"], // http://eslint.org/docs/rules/comma-style
+ "eol-last": 2, // http://eslint.org/docs/rules/eol-last
+ "func-names": 1, // http://eslint.org/docs/rules/func-names
+ "key-spacing": [2, { // http://eslint.org/docs/rules/key-spacing
+ "beforeColon": false,
+ "afterColon": true
+ }],
+ "new-cap": [2, { // http://eslint.org/docs/rules/new-cap
+ "newIsCap": true
+ }],
+ "no-multiple-empty-lines": [2, { // http://eslint.org/docs/rules/no-multiple-empty-lines
+ "max": 2
+ }],
+ "no-nested-ternary": 2, // http://eslint.org/docs/rules/no-nested-ternary
+ "no-new-object": 2, // http://eslint.org/docs/rules/no-new-object
+ "no-spaced-func": 2, // http://eslint.org/docs/rules/no-spaced-func
+ "no-trailing-spaces": 2, // http://eslint.org/docs/rules/no-trailing-spaces
+ "no-wrap-func": 2, // http://eslint.org/docs/rules/no-wrap-func
+ "no-underscore-dangle": 0, // http://eslint.org/docs/rules/no-underscore-dangle
+ "one-var": [2, "never"], // http://eslint.org/docs/rules/one-var
+ "padded-blocks": [1, "never"], // http://eslint.org/docs/rules/padded-blocks
+ "semi": [2, "always"], // http://eslint.org/docs/rules/semi
+ "semi-spacing": [2, { // http://eslint.org/docs/rules/semi-spacing
+ "before": false,
+ "after": true
+ }],
+ "space-after-keywords": 2, // http://eslint.org/docs/rules/space-after-keywords
+ "space-before-blocks": 2, // http://eslint.org/docs/rules/space-before-blocks
+ "space-before-function-paren": [2, "never"], // http://eslint.org/docs/rules/space-before-function-paren
+ "space-infix-ops": 2, // http://eslint.org/docs/rules/space-infix-ops
+ "space-return-throw-case": 2, // http://eslint.org/docs/rules/space-return-throw-case
+ "spaced-line-comment": 2, // http://eslint.org/docs/rules/spaced-line-comment
+
+ // ONES BELOW HERE are NOT in the Air Bnb standards, so they should be removed if they seem unnecessary
+ "no-array-constructor": 2,
+ "no-bitwise": 0,
+ "no-catch-shadow": 2,
+ "no-comma-dangle": 2,
+ "no-control-regex": 2,
+ "no-delete-var": 2,
+ "no-div-regex": 0,
+ "no-dupe-args": 2,
+ "no-empty-class": 2,
+ "no-empty-label": 2,
+ "no-extra-parens": 0,
+ "no-inline-comments": 0,
+ "no-iterator": 2,
+ "no-label-var": 2,
+ "no-labels": 2,
+ "no-lonely-if": 2,
+ "no-mixed-requires": [0, false],
+ "no-mixed-spaces-and-tabs": [2, false],
+ "no-multi-spaces": 2,
+ "no-negated-in-lhs": 2,
+ "no-new-require": 0,
+ "no-path-concat": 0,
+ "no-plusplus": 0,
+ "no-process-env": 0,
+ "no-process-exit": 0,
+ "no-regex-spaces": 2,
+ "no-space-before-semi": 2,
+ "no-sync": 0,
+ "no-ternary": 0,
+ "no-undef": 2,
+ "no-undef-init": 2,
+ "no-undefined": 0,
+ "no-unused-expressions": 2,
+ "no-warning-comments": [0, {"terms": ['todo', 'fixme', 'xxx'], "location": 'start'}],
+ "complexity": [0, 11],
+ "consistent-this": [2, 'self'],
+ "func-style": [2, 'declaration'],
+ "generator-star": 0,
+ "handle-callback-err": 2,
+ "max-depth": [1, 4],
+ # Different from 80 chars of AirBnb Javascript,
+ "max-len": [2, 120],
+ "max-nested-callbacks": [1, 2],
+ "max-params": [1, 4],
+ "max-statements": [0, 10],
+ "new-parens": 2,
+ "operator-assignment": [0, 'always'],
+ "quote-props": 0,
+ "semi": 2,
+ "sort-vars": 0,
+ "space-after-function-name": [0, 'never'],
+ "space-before-function-parentheses": [2, "never"],
+ "space-in-brackets": 2,
+ "space-in-parens": 2,
+ "space-return-throw-case": 2,
+ "space-unary-ops": [2, {"words": true, "nonwords": false}],
+ "valid-jsdoc": 2,
+ "valid-typeof": 2,
+ "wrap-iife": 0,
+ "wrap-regex": 0,
+
+/**
+ * JSX (not in airbnb guide)
+ */
+ "react/display-name": 1,
+ "react/jsx-quotes": 1,
+ "react/jsx-no-undef": 1,
+ "react/jsx-uses-react": 1,
+ "react/jsx-uses-vars": 1,
+ "react/no-did-mount-set-state": 1,
+ "react/no-did-update-set-state": 1,
+ "react/no-multi-comp": 1,
+ "react/prop-types": 1,
+ "react/react-in-jsx-scope": 1,
+ "react/self-closing-comp": 1,
+ "react/wrap-multilines": 1
+ }
+}
diff --git a/client/assets/javascripts/App.jsx b/client/assets/javascripts/App.jsx
index 442a191e8..6720f5960 100755
--- a/client/assets/javascripts/App.jsx
+++ b/client/assets/javascripts/App.jsx
@@ -1,10 +1,8 @@
-'use strict';
-
import $ from 'jquery';
import React from 'react';
import CommentBox from './components/CommentBox';
-$(function() {
+$(function onLoad() {
function render() {
if ($('#content').length > 0) {
React.render(
diff --git a/client/assets/javascripts/actions/CommentActions.js b/client/assets/javascripts/actions/CommentActions.js
index c1697f431..540cdc412 100644
--- a/client/assets/javascripts/actions/CommentActions.js
+++ b/client/assets/javascripts/actions/CommentActions.js
@@ -1,5 +1,3 @@
-'use strict';
-
import alt from '../FluxAlt';
import CommentsManager from '../utils/CommentsManager';
diff --git a/client/assets/javascripts/actions/FormActions.js b/client/assets/javascripts/actions/FormActions.js
index 655d7341a..966a90c76 100644
--- a/client/assets/javascripts/actions/FormActions.js
+++ b/client/assets/javascripts/actions/FormActions.js
@@ -1,5 +1,3 @@
-'use strict';
-
import alt from '../FluxAlt';
import CommentActions from '../actions/CommentActions';
import CommentsManager from '../utils/CommentsManager';
diff --git a/client/assets/javascripts/components/Comment.jsx b/client/assets/javascripts/components/Comment.jsx
index cbed9e0e2..c93c9ff0e 100644
--- a/client/assets/javascripts/components/Comment.jsx
+++ b/client/assets/javascripts/components/Comment.jsx
@@ -1,9 +1,7 @@
-'use strict';
-
import marked from 'marked';
import React from 'react';
-var Comment = React.createClass({
+const Comment = React.createClass({
displayName: 'Comment',
propTypes: {
@@ -12,7 +10,7 @@ var Comment = React.createClass({
},
render() {
- var rawMarkup = marked(this.props.text);
+ const rawMarkup = marked(this.props.text);
return (
diff --git a/client/assets/javascripts/components/CommentBox.jsx b/client/assets/javascripts/components/CommentBox.jsx
index 080531f46..46b2b46e1 100644
--- a/client/assets/javascripts/components/CommentBox.jsx
+++ b/client/assets/javascripts/components/CommentBox.jsx
@@ -1,5 +1,3 @@
-'use strict';
-
import $ from 'jquery';
import React from 'react';
import CommentForm from './CommentForm';
@@ -9,7 +7,7 @@ import FormStore from '../stores/FormStore';
import CommentActions from '../actions/CommentActions';
import FormActions from '../actions/FormActions';
-var CommentBox = React.createClass({
+const CommentBox = React.createClass({
displayName: 'CommentBox',
propTypes: {
diff --git a/client/assets/javascripts/components/CommentForm.jsx b/client/assets/javascripts/components/CommentForm.jsx
index e857cddfc..2bd0e4dd1 100644
--- a/client/assets/javascripts/components/CommentForm.jsx
+++ b/client/assets/javascripts/components/CommentForm.jsx
@@ -1,5 +1,3 @@
-'use strict';
-
import React from 'react/addons';
import Input from 'react-bootstrap/lib/Input';
import Row from 'react-bootstrap/lib/Row';
@@ -9,7 +7,7 @@ import NavItem from 'react-bootstrap/lib/NavItem';
import FormActions from '../actions/FormActions';
import FormStore from '../stores/FormStore';
-var CommentForm = React.createClass({
+const CommentForm = React.createClass({
displayName: 'CommentForm',
propTypes: {
diff --git a/client/assets/javascripts/components/CommentList.jsx b/client/assets/javascripts/components/CommentList.jsx
index 026819a97..c1a496b7b 100644
--- a/client/assets/javascripts/components/CommentList.jsx
+++ b/client/assets/javascripts/components/CommentList.jsx
@@ -1,9 +1,7 @@
-'use strict';
-
import React from 'react';
import Comment from './Comment';
-var CommentList = React.createClass({
+const CommentList = React.createClass({
displayName: 'CommentList',
propTypes: {
@@ -11,9 +9,8 @@ var CommentList = React.createClass({
},
render() {
- var reversedData = this.props.comments.slice(0).reverse();
- var commentNodes = reversedData.map((comment, index) => {
-
+ const reversedData = this.props.comments.slice(0).reverse();
+ const commentNodes = reversedData.map((comment, index) => {
// `key` is a React-specific concept and is not mandatory for the
// purpose of this tutorial. if you're curious, see more here:
// http://facebook.github.io/react/docs/multiple-components.html#dynamic-children
diff --git a/client/assets/javascripts/stores/CommentStore.js b/client/assets/javascripts/stores/CommentStore.js
index 32d61381f..1368923bd 100644
--- a/client/assets/javascripts/stores/CommentStore.js
+++ b/client/assets/javascripts/stores/CommentStore.js
@@ -1,5 +1,3 @@
-'use strict';
-
import alt from '../FluxAlt';
import React from 'react/addons';
import CommentActions from '../actions/CommentActions';
@@ -15,12 +13,12 @@ class CommentStore {
});
}
- handleFetchComments(displaySpinner) {
+ handleFetchComments() {
return false;
}
handleUpdateComments(comments) {
- this.comments = comments
+ this.comments = comments;
this.errorMessage = null;
}
@@ -30,8 +28,7 @@ class CommentStore {
handleAddComment(comment) {
const oldComments = this.comments;
- var newComments = React.addons.update(oldComments, {$push: [comment]});
- this.comments = newComments;
+ this.comments = React.addons.update(oldComments, {$push: [comment]});
}
}
diff --git a/client/assets/javascripts/stores/FormStore.js b/client/assets/javascripts/stores/FormStore.js
index 81830e509..5089fe842 100644
--- a/client/assets/javascripts/stores/FormStore.js
+++ b/client/assets/javascripts/stores/FormStore.js
@@ -1,5 +1,3 @@
-'use strict';
-
import alt from '../FluxAlt';
import FormActions from '../actions/FormActions';
import CommentActions from '../actions/CommentActions';
@@ -24,7 +22,7 @@ class FormStore {
this.comment = comment;
}
- handleSubmitComment(comment) {
+ handleSubmitComment() {
this.ajaxSending = true;
this.comment = emptyComment;
}
@@ -35,11 +33,11 @@ class FormStore {
}
}
- handleUpdateComments(comments) {
+ handleUpdateComments() {
this.ajaxSending = false;
}
- handleUpdateCommentsError(comments) {
+ handleUpdateCommentsError() {
this.ajaxSending = false;
}
}
diff --git a/client/assets/javascripts/utils/CommentsManager.js b/client/assets/javascripts/utils/CommentsManager.js
index f2998ec16..b4cbb0e10 100644
--- a/client/assets/javascripts/utils/CommentsManager.js
+++ b/client/assets/javascripts/utils/CommentsManager.js
@@ -1,5 +1,3 @@
-'use strict';
-
import $ from 'jquery';
const CommentsManager = {
diff --git a/client/bin/lint b/client/bin/lint
index b7ec28096..f66e8d9ff 100755
--- a/client/bin/lint
+++ b/client/bin/lint
@@ -1,3 +1,12 @@
#!/bin/sh
+echo ================================================================================
+echo Warnings are OPTIONAL
+echo ================================================================================
+
find . -path ./node_modules -prune -o -name "*.js" -o -name "*.jsx" -exec eslint {} \;
npm run jscs .
+
+echo ================================================================================
+echo Warnings are OPTIONAL
+echo ================================================================================
+
diff --git a/client/npm-shrinkwrap.json b/client/npm-shrinkwrap.json
index 7a5032844..a01a87373 100644
--- a/client/npm-shrinkwrap.json
+++ b/client/npm-shrinkwrap.json
@@ -3,9 +3,9 @@
"version": "1.1.0",
"dependencies": {
"alt": {
- "version": "0.14.5",
- "from": "alt@>=0.14.5 <0.15.0",
- "resolved": "https://registry.npmjs.org/alt/-/alt-0.14.5.tgz",
+ "version": "0.15.6",
+ "from": "alt@>=0.15.6 <0.16.0",
+ "resolved": "https://registry.npmjs.org/alt/-/alt-0.15.6.tgz",
"dependencies": {
"es-symbol": {
"version": "1.1.1",
@@ -30,14 +30,14 @@
}
},
"babel-core": {
- "version": "5.0.8",
- "from": "babel-core@>=5.0.8 <6.0.0",
- "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.0.8.tgz",
+ "version": "5.1.13",
+ "from": "babel-core@>=5.1.13 <6.0.0",
+ "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.1.13.tgz",
"dependencies": {
"ast-types": {
- "version": "0.7.2",
+ "version": "0.7.6",
"from": "ast-types@>=0.7.0 <0.8.0",
- "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.7.2.tgz"
+ "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.7.6.tgz"
},
"chalk": {
"version": "1.0.0",
@@ -66,7 +66,7 @@
},
"get-stdin": {
"version": "4.0.1",
- "from": "get-stdin@*",
+ "from": "get-stdin@>=4.0.1 <5.0.0",
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
}
}
@@ -78,7 +78,7 @@
"dependencies": {
"ansi-regex": {
"version": "1.1.1",
- "from": "ansi-regex@>=1.0.0 <2.0.0",
+ "from": "ansi-regex@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
}
}
@@ -91,18 +91,18 @@
}
},
"convert-source-map": {
- "version": "0.5.1",
- "from": "convert-source-map@>=0.5.0 <0.6.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.5.1.tgz"
+ "version": "1.1.0",
+ "from": "convert-source-map@>=1.1.0 <2.0.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.0.tgz"
},
"core-js": {
- "version": "0.8.1",
- "from": "core-js@>=0.8.1 <0.9.0",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-0.8.1.tgz"
+ "version": "0.9.3",
+ "from": "core-js@>=0.9.0 <0.10.0",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-0.9.3.tgz"
},
"debug": {
"version": "2.1.3",
- "from": "debug@>=2.1.3 <2.2.0",
+ "from": "debug@>=2.1.1 <3.0.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
"dependencies": {
"ms": {
@@ -119,7 +119,7 @@
"dependencies": {
"get-stdin": {
"version": "4.0.1",
- "from": "get-stdin@*",
+ "from": "get-stdin@>=4.0.1 <5.0.0",
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
},
"minimist": {
@@ -130,14 +130,14 @@
}
},
"estraverse": {
- "version": "1.9.3",
- "from": "estraverse@>=1.9.1 <2.0.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"
+ "version": "3.1.0",
+ "from": "estraverse@>=3.0.0 <4.0.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz"
},
"esutils": {
- "version": "1.1.6",
- "from": "esutils@>=1.1.6 <2.0.0",
- "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz"
+ "version": "2.0.2",
+ "from": "esutils@>=2.0.0 <3.0.0",
+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
},
"fs-readdir-recursive": {
"version": "0.1.1",
@@ -146,7 +146,7 @@
},
"globals": {
"version": "6.4.1",
- "from": "globals@>=6.1.0 <7.0.0",
+ "from": "globals@>=6.4.0 <7.0.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz"
},
"is-integer": {
@@ -189,9 +189,9 @@
}
},
"lodash": {
- "version": "3.6.0",
- "from": "lodash@>=3.2.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz"
+ "version": "3.7.0",
+ "from": "lodash@>=3.6.0 <4.0.0",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"
},
"minimatch": {
"version": "2.0.4",
@@ -251,10 +251,10 @@
"from": "private@>=0.1.6 <0.2.0",
"resolved": "https://registry.npmjs.org/private/-/private-0.1.6.tgz"
},
- "regenerator-babel": {
- "version": "0.8.13-2",
- "from": "regenerator-babel@0.8.13-2",
- "resolved": "https://registry.npmjs.org/regenerator-babel/-/regenerator-babel-0.8.13-2.tgz",
+ "regenerator": {
+ "version": "0.8.22",
+ "from": "regenerator@>=0.8.20 <0.9.0",
+ "resolved": "https://registry.npmjs.org/regenerator/-/regenerator-0.8.22.tgz",
"dependencies": {
"commoner": {
"version": "0.10.1",
@@ -333,9 +333,9 @@
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
"dependencies": {
"lru-cache": {
- "version": "2.5.0",
+ "version": "2.6.2",
"from": "lru-cache@>=2.0.0 <3.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
},
"sigmund": {
"version": "1.0.0",
@@ -376,16 +376,97 @@
"resolved": "https://registry.npmjs.org/install/-/install-0.1.8.tgz"
},
"iconv-lite": {
- "version": "0.4.7",
+ "version": "0.4.8",
"from": "iconv-lite@>=0.4.5 <0.5.0",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.7.tgz"
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"
+ }
+ }
+ },
+ "esprima-fb": {
+ "version": "13001.1.0-dev-harmony-fb",
+ "from": "esprima-fb@>=13001.1.0-dev-harmony-fb <13001.2.0",
+ "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1.0-dev-harmony-fb.tgz"
+ },
+ "recast": {
+ "version": "0.10.12",
+ "from": "recast@>=0.10.3 <0.11.0",
+ "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.12.tgz",
+ "dependencies": {
+ "esprima-fb": {
+ "version": "14001.1.0-dev-harmony-fb",
+ "from": "esprima-fb@>=14001.1.0-dev-harmony-fb <14001.2.0",
+ "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-14001.1.0-dev-harmony-fb.tgz"
}
}
},
"through": {
- "version": "2.3.6",
+ "version": "2.3.7",
"from": "through@>=2.3.6 <2.4.0",
- "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.7.tgz"
+ },
+ "defs": {
+ "version": "1.1.0",
+ "from": "defs@>=1.1.0 <1.2.0",
+ "resolved": "https://registry.npmjs.org/defs/-/defs-1.1.0.tgz",
+ "dependencies": {
+ "alter": {
+ "version": "0.2.0",
+ "from": "alter@>=0.2.0 <0.3.0",
+ "resolved": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz",
+ "dependencies": {
+ "stable": {
+ "version": "0.1.5",
+ "from": "stable@>=0.1.3 <0.2.0",
+ "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.5.tgz"
+ }
+ }
+ },
+ "ast-traverse": {
+ "version": "0.1.1",
+ "from": "ast-traverse@>=0.1.1 <0.2.0",
+ "resolved": "https://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz"
+ },
+ "breakable": {
+ "version": "1.0.0",
+ "from": "breakable@>=1.0.0 <1.1.0",
+ "resolved": "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz"
+ },
+ "esprima-fb": {
+ "version": "8001.1001.0-dev-harmony-fb",
+ "from": "esprima-fb@>=8001.1001.0-dev-harmony-fb <8001.1002.0",
+ "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-8001.1001.0-dev-harmony-fb.tgz"
+ },
+ "simple-fmt": {
+ "version": "0.1.0",
+ "from": "simple-fmt@>=0.1.0 <0.2.0",
+ "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz"
+ },
+ "simple-is": {
+ "version": "0.2.0",
+ "from": "simple-is@>=0.2.0 <0.3.0",
+ "resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz"
+ },
+ "stringmap": {
+ "version": "0.2.2",
+ "from": "stringmap@>=0.2.2 <0.3.0",
+ "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz"
+ },
+ "stringset": {
+ "version": "0.2.1",
+ "from": "stringset@>=0.2.1 <0.3.0",
+ "resolved": "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz"
+ },
+ "tryor": {
+ "version": "0.1.2",
+ "from": "tryor@>=0.1.2 <0.2.0",
+ "resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz"
+ },
+ "yargs": {
+ "version": "1.3.3",
+ "from": "yargs@>=1.3.2 <1.4.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"
+ }
+ }
}
}
},
@@ -395,14 +476,14 @@
"resolved": "https://registry.npmjs.org/regexpu/-/regexpu-1.1.2.tgz",
"dependencies": {
"recast": {
- "version": "0.10.11",
- "from": "recast@>=0.10.1 <0.11.0",
- "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.11.tgz",
+ "version": "0.10.12",
+ "from": "recast@>=0.10.3 <0.11.0",
+ "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.12.tgz",
"dependencies": {
"esprima-fb": {
- "version": "13001.1001.0-dev-harmony-fb",
- "from": "esprima-fb@>=13001.1001.0-dev-harmony-fb <13001.1002.0",
- "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz"
+ "version": "14001.1.0-dev-harmony-fb",
+ "from": "esprima-fb@>=14001.1.0-dev-harmony-fb <14001.2.0",
+ "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-14001.1.0-dev-harmony-fb.tgz"
}
}
},
@@ -442,7 +523,7 @@
},
"meow": {
"version": "3.1.0",
- "from": "meow@*",
+ "from": "meow@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
"dependencies": {
"camelcase-keys": {
@@ -512,7 +593,7 @@
},
"source-map-support": {
"version": "0.2.10",
- "from": "source-map-support@>=0.2.9 <0.3.0",
+ "from": "source-map-support@>=0.2.10 <0.3.0",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
"dependencies": {
"source-map": {
@@ -529,6 +610,11 @@
}
}
},
+ "strip-json-comments": {
+ "version": "1.0.2",
+ "from": "strip-json-comments@>=1.0.2 <2.0.0",
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz"
+ },
"to-fast-properties": {
"version": "1.0.1",
"from": "to-fast-properties@>=1.0.0 <2.0.0",
@@ -538,6 +624,11 @@
"version": "1.0.0",
"from": "trim-right@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.0.tgz"
+ },
+ "user-home": {
+ "version": "1.1.1",
+ "from": "user-home@>=1.1.1 <2.0.0",
+ "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
}
}
},
@@ -547,9 +638,9 @@
"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-5.0.0.tgz"
},
"body-parser": {
- "version": "1.12.2",
- "from": "body-parser@>=1.12.2 <2.0.0",
- "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.12.2.tgz",
+ "version": "1.12.3",
+ "from": "body-parser@>=1.12.3 <2.0.0",
+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.12.3.tgz",
"dependencies": {
"bytes": {
"version": "1.0.0",
@@ -563,7 +654,7 @@
},
"debug": {
"version": "2.1.3",
- "from": "debug@>=2.1.1 <3.0.0",
+ "from": "debug@>=2.1.3 <2.2.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
"dependencies": {
"ms": {
@@ -574,19 +665,19 @@
}
},
"depd": {
- "version": "1.0.0",
- "from": "depd@>=1.0.0 <1.1.0",
- "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
+ "version": "1.0.1",
+ "from": "depd@>=1.0.1 <1.1.0",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
},
"iconv-lite": {
- "version": "0.4.7",
- "from": "iconv-lite@0.4.7",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.7.tgz"
+ "version": "0.4.8",
+ "from": "iconv-lite@0.4.8",
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"
},
"on-finished": {
- "version": "2.2.0",
+ "version": "2.2.1",
"from": "on-finished@>=2.2.0 <2.3.0",
- "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz",
+ "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz",
"dependencies": {
"ee-first": {
"version": "1.1.0",
@@ -601,9 +692,9 @@
"resolved": "https://registry.npmjs.org/qs/-/qs-2.4.1.tgz"
},
"raw-body": {
- "version": "1.3.3",
- "from": "raw-body@1.3.3",
- "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.3.3.tgz"
+ "version": "1.3.4",
+ "from": "raw-body@1.3.4",
+ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.3.4.tgz"
},
"type-is": {
"version": "1.6.1",
@@ -632,9 +723,9 @@
}
},
"es5-shim": {
- "version": "4.1.0",
- "from": "es5-shim@>=4.1.0 <5.0.0",
- "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.1.0.tgz"
+ "version": "4.1.1",
+ "from": "es5-shim@>=4.1.1 <5.0.0",
+ "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.1.1.tgz"
},
"imports-loader": {
"version": "0.6.3",
@@ -661,9 +752,9 @@
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.1.3.tgz"
},
"loader-utils": {
- "version": "0.2.6",
- "from": "loader-utils@>=0.2.6 <0.3.0",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.6.tgz",
+ "version": "0.2.7",
+ "from": "loader-utils@>=0.2.7 <0.3.0",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.7.tgz",
"dependencies": {
"json5": {
"version": "0.1.0",
@@ -683,9 +774,9 @@
"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.3.tgz"
},
"react": {
- "version": "0.13.1",
- "from": "react@>=0.13.1 <0.14.0",
- "resolved": "https://registry.npmjs.org/react/-/react-0.13.1.tgz",
+ "version": "0.13.2",
+ "from": "react@>=0.13.2 <0.14.0",
+ "resolved": "https://registry.npmjs.org/react/-/react-0.13.2.tgz",
"dependencies": {
"envify": {
"version": "3.4.0",
@@ -693,9 +784,9 @@
"resolved": "https://registry.npmjs.org/envify/-/envify-3.4.0.tgz",
"dependencies": {
"through": {
- "version": "2.3.6",
- "from": "through@>=2.3.6 <2.4.0",
- "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
+ "version": "2.3.7",
+ "from": "through@>=2.3.4 <2.4.0",
+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.7.tgz"
},
"jstransform": {
"version": "10.1.0",
@@ -709,7 +800,7 @@
},
"esprima-fb": {
"version": "13001.1001.0-dev-harmony-fb",
- "from": "esprima-fb@>=13001.1001.0-dev-harmony-fb <13001.1002.0",
+ "from": "esprima-fb@13001.1001.0-dev-harmony-fb",
"resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz"
},
"source-map": {
@@ -731,14 +822,14 @@
}
},
"react-bootstrap": {
- "version": "0.20.1",
- "from": "react-bootstrap@>=0.20.1 <0.21.0",
- "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-0.20.1.tgz",
+ "version": "0.21.0",
+ "from": "react-bootstrap@>=0.21.0 <0.22.0",
+ "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-0.21.0.tgz",
"dependencies": {
"classnames": {
- "version": "1.2.0",
+ "version": "1.2.1",
"from": "classnames@>=1.1.4 <2.0.0",
- "resolved": "https://registry.npmjs.org/classnames/-/classnames-1.2.0.tgz"
+ "resolved": "https://registry.npmjs.org/classnames/-/classnames-1.2.1.tgz"
}
}
},
@@ -755,109 +846,24 @@
}
},
"webpack": {
- "version": "1.7.3",
- "from": "webpack@>=1.7.3 <2.0.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.7.3.tgz",
+ "version": "1.8.9",
+ "from": "webpack@>=1.8.9 <2.0.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.8.9.tgz",
"dependencies": {
- "esprima": {
- "version": "1.2.5",
- "from": "esprima@>=1.2.0 <1.3.0",
- "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"
- },
- "mkdirp": {
- "version": "0.5.0",
- "from": "mkdirp@>=0.5.0 <0.6.0",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
- "dependencies": {
- "minimist": {
- "version": "0.0.8",
- "from": "minimist@0.0.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
- }
- }
- },
- "optimist": {
- "version": "0.6.1",
- "from": "optimist@>=0.6.0 <0.7.0",
- "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
- "dependencies": {
- "wordwrap": {
- "version": "0.0.2",
- "from": "wordwrap@>=0.0.2 <0.1.0",
- "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
- },
- "minimist": {
- "version": "0.0.10",
- "from": "minimist@>=0.0.1 <0.1.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
- }
- }
- },
- "uglify-js": {
- "version": "2.4.19",
- "from": "uglify-js@>=2.4.13 <2.5.0",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.19.tgz",
- "dependencies": {
- "async": {
- "version": "0.2.10",
- "from": "async@>=0.2.6 <0.3.0",
- "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
- },
- "source-map": {
- "version": "0.1.34",
- "from": "source-map@0.1.34",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
- "dependencies": {
- "amdefine": {
- "version": "0.1.0",
- "from": "amdefine@>=0.0.4",
- "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
- }
- }
- },
- "yargs": {
- "version": "3.5.4",
- "from": "yargs@>=3.5.4 <3.6.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
- "dependencies": {
- "camelcase": {
- "version": "1.0.2",
- "from": "camelcase@>=1.0.2 <2.0.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
- },
- "decamelize": {
- "version": "1.0.0",
- "from": "decamelize@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz"
- },
- "window-size": {
- "version": "0.1.0",
- "from": "window-size@0.1.0",
- "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
- },
- "wordwrap": {
- "version": "0.0.2",
- "from": "wordwrap@0.0.2",
- "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
- }
- }
- },
- "uglify-to-browserify": {
- "version": "1.0.2",
- "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
- "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
- }
- }
- },
"async": {
"version": "0.9.0",
"from": "async@>=0.9.0 <0.10.0",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
},
+ "clone": {
+ "version": "0.1.19",
+ "from": "clone@>=0.1.15 <0.2.0",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
+ },
"enhanced-resolve": {
- "version": "0.8.4",
+ "version": "0.8.5",
"from": "enhanced-resolve@>=0.8.2 <0.9.0",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.8.4.tgz",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.8.5.tgz",
"dependencies": {
"graceful-fs": {
"version": "3.0.6",
@@ -866,32 +872,30 @@
}
}
},
+ "esprima": {
+ "version": "1.2.5",
+ "from": "esprima@>=1.2.0 <1.3.0",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"
+ },
+ "interpret": {
+ "version": "0.5.2",
+ "from": "interpret@>=0.5.2 <0.6.0",
+ "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.5.2.tgz"
+ },
"memory-fs": {
"version": "0.2.0",
"from": "memory-fs@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"
},
- "clone": {
- "version": "0.1.19",
- "from": "clone@>=0.1.5 <0.2.0",
- "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
- },
- "webpack-core": {
+ "mkdirp": {
"version": "0.5.0",
- "from": "webpack-core@>=0.5.0 <0.6.0",
- "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.5.0.tgz",
+ "from": "mkdirp@>=0.5.0 <0.6.0",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
"dependencies": {
- "source-map": {
- "version": "0.4.2",
- "from": "source-map@>=0.4.1 <0.5.0",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz",
- "dependencies": {
- "amdefine": {
- "version": "0.1.0",
- "from": "amdefine@>=0.0.4",
- "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
- }
- }
+ "minimist": {
+ "version": "0.0.8",
+ "from": "minimist@0.0.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
}
}
},
@@ -918,9 +922,9 @@
}
},
"buffer": {
- "version": "3.1.2",
+ "version": "3.2.1",
"from": "buffer@>=3.0.3 <4.0.0",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.1.2.tgz",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.2.1.tgz",
"dependencies": {
"base64-js": {
"version": "0.0.8",
@@ -1037,7 +1041,7 @@
},
"readable-stream": {
"version": "1.1.13",
- "from": "readable-stream@>=1.1.13 <2.0.0",
+ "from": "readable-stream@>=1.1.9 <1.2.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
"dependencies": {
"core-util-is": {
@@ -1122,25 +1126,108 @@
}
}
},
+ "optimist": {
+ "version": "0.6.1",
+ "from": "optimist@>=0.6.0 <0.7.0",
+ "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+ "dependencies": {
+ "wordwrap": {
+ "version": "0.0.2",
+ "from": "wordwrap@>=0.0.2 <0.1.0",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+ },
+ "minimist": {
+ "version": "0.0.10",
+ "from": "minimist@>=0.0.1 <0.1.0",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+ }
+ }
+ },
+ "supports-color": {
+ "version": "1.3.1",
+ "from": "supports-color@>=1.3.0 <2.0.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
+ },
+ "tapable": {
+ "version": "0.1.9",
+ "from": "tapable@>=0.1.8 <0.2.0",
+ "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.9.tgz"
+ },
+ "uglify-js": {
+ "version": "2.4.20",
+ "from": "uglify-js@>=2.4.13 <2.5.0",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.20.tgz",
+ "dependencies": {
+ "async": {
+ "version": "0.2.10",
+ "from": "async@>=0.2.6 <0.3.0",
+ "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+ },
+ "source-map": {
+ "version": "0.1.34",
+ "from": "source-map@0.1.34",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+ "dependencies": {
+ "amdefine": {
+ "version": "0.1.0",
+ "from": "amdefine@>=0.0.4",
+ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+ }
+ }
+ },
+ "yargs": {
+ "version": "3.5.4",
+ "from": "yargs@>=3.5.4 <3.6.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+ "dependencies": {
+ "camelcase": {
+ "version": "1.0.2",
+ "from": "camelcase@>=1.0.2 <2.0.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
+ },
+ "decamelize": {
+ "version": "1.0.0",
+ "from": "decamelize@>=1.0.0 <2.0.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz"
+ },
+ "window-size": {
+ "version": "0.1.0",
+ "from": "window-size@0.1.0",
+ "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
+ },
+ "wordwrap": {
+ "version": "0.0.2",
+ "from": "wordwrap@0.0.2",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+ }
+ }
+ },
+ "uglify-to-browserify": {
+ "version": "1.0.2",
+ "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
+ "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+ }
+ }
+ },
"watchpack": {
- "version": "0.2.3",
+ "version": "0.2.4",
"from": "watchpack@>=0.2.1 <0.3.0",
- "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.3.tgz",
+ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.4.tgz",
"dependencies": {
"chokidar": {
- "version": "1.0.0-rc5",
- "from": "chokidar@>=1.0.0-rc2 <2.0.0",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.0.0-rc5.tgz",
+ "version": "1.0.1",
+ "from": "chokidar@>=1.0.0 <2.0.0",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.0.1.tgz",
"dependencies": {
"anymatch": {
- "version": "1.2.1",
+ "version": "1.3.0",
"from": "anymatch@>=1.1.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.2.1.tgz",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
"dependencies": {
"micromatch": {
- "version": "2.1.5",
- "from": "micromatch@>=2.1.0 <3.0.0",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.1.5.tgz",
+ "version": "2.1.6",
+ "from": "micromatch@>=2.1.5 <3.0.0",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.1.6.tgz",
"dependencies": {
"arr-diff": {
"version": "1.0.1",
@@ -1148,9 +1235,9 @@
"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.0.1.tgz",
"dependencies": {
"array-slice": {
- "version": "0.2.2",
+ "version": "0.2.3",
"from": "array-slice@>=0.2.2 <0.3.0",
- "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.2.tgz"
+ "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"
}
}
},
@@ -1165,19 +1252,19 @@
"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.1.tgz",
"dependencies": {
"fill-range": {
- "version": "2.2.0",
+ "version": "2.2.2",
"from": "fill-range@>=2.1.0 <3.0.0",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.0.tgz",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.2.tgz",
"dependencies": {
"is-number": {
"version": "1.1.2",
- "from": "is-number@>=1.1.0 <2.0.0",
+ "from": "is-number@>=1.1.2 <2.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-1.1.2.tgz"
},
"isobject": {
- "version": "0.2.0",
- "from": "isobject@>=0.2.0 <0.3.0",
- "resolved": "https://registry.npmjs.org/isobject/-/isobject-0.2.0.tgz"
+ "version": "1.0.0",
+ "from": "isobject@>=1.0.0 <2.0.0",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-1.0.0.tgz"
},
"randomatic": {
"version": "1.1.0",
@@ -1186,7 +1273,7 @@
},
"repeat-string": {
"version": "1.5.2",
- "from": "repeat-string@>=1.5.0 <2.0.0",
+ "from": "repeat-string@>=1.5.2 <2.0.0",
"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
}
}
@@ -1257,9 +1344,9 @@
}
},
"parse-glob": {
- "version": "3.0.0",
+ "version": "3.0.2",
"from": "parse-glob@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.2.tgz",
"dependencies": {
"glob-base": {
"version": "0.2.0",
@@ -1279,349 +1366,26 @@
}
},
"regex-cache": {
- "version": "0.3.0",
- "from": "regex-cache@>=0.3.0 <0.4.0",
- "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.3.0.tgz",
+ "version": "0.4.2",
+ "from": "regex-cache@>=0.4.0 <0.5.0",
+ "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.2.tgz",
"dependencies": {
- "benchmarked": {
- "version": "0.1.4",
- "from": "benchmarked@>=0.1.3 <0.2.0",
- "resolved": "https://registry.npmjs.org/benchmarked/-/benchmarked-0.1.4.tgz",
+ "is-equal-shallow": {
+ "version": "0.1.2",
+ "from": "is-equal-shallow@>=0.1.1 <0.2.0",
+ "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.2.tgz",
"dependencies": {
- "ansi": {
- "version": "0.3.0",
- "from": "ansi@>=0.3.0 <0.4.0",
- "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
- },
- "benchmark": {
- "version": "1.0.0",
- "from": "benchmark@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz"
- },
- "chalk": {
- "version": "1.0.0",
- "from": "chalk@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
- "dependencies": {
- "ansi-styles": {
- "version": "2.0.1",
- "from": "ansi-styles@>=2.0.1 <3.0.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
- },
- "escape-string-regexp": {
- "version": "1.0.3",
- "from": "escape-string-regexp@>=1.0.2 <2.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
- },
- "has-ansi": {
- "version": "1.0.3",
- "from": "has-ansi@>=1.0.3 <2.0.0",
- "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
- "dependencies": {
- "ansi-regex": {
- "version": "1.1.1",
- "from": "ansi-regex@>=1.1.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
- },
- "get-stdin": {
- "version": "4.0.1",
- "from": "get-stdin@>=4.0.1 <5.0.0",
- "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
- }
- }
- },
- "strip-ansi": {
- "version": "2.0.1",
- "from": "strip-ansi@>=2.0.1 <3.0.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
- "dependencies": {
- "ansi-regex": {
- "version": "1.1.1",
- "from": "ansi-regex@>=1.1.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
- }
- }
- }
- }
- },
- "extend-shallow": {
- "version": "1.1.2",
- "from": "extend-shallow@>=1.1.2 <2.0.0",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.2.tgz"
- },
- "file-reader": {
+ "is-primitive": {
"version": "1.0.0",
- "from": "file-reader@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/file-reader/-/file-reader-1.0.0.tgz",
- "dependencies": {
- "extend-shallow": {
- "version": "0.2.0",
- "from": "extend-shallow@>=0.2.0 <0.3.0",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-0.2.0.tgz",
- "dependencies": {
- "array-slice": {
- "version": "0.2.2",
- "from": "array-slice@>=0.2.2 <0.3.0",
- "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.2.tgz"
- }
- }
- },
- "map-files": {
- "version": "0.3.0",
- "from": "map-files@>=0.3.0 <0.4.0",
- "resolved": "https://registry.npmjs.org/map-files/-/map-files-0.3.0.tgz",
- "dependencies": {
- "globby": {
- "version": "0.1.1",
- "from": "globby@>=0.1.1 <0.2.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-0.1.1.tgz",
- "dependencies": {
- "array-differ": {
- "version": "0.1.0",
- "from": "array-differ@>=0.1.0 <0.2.0",
- "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-0.1.0.tgz"
- },
- "array-union": {
- "version": "0.1.0",
- "from": "array-union@>=0.1.0 <0.2.0",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-0.1.0.tgz",
- "dependencies": {
- "array-uniq": {
- "version": "0.1.1",
- "from": "array-uniq@>=0.1.0 <0.2.0",
- "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-0.1.1.tgz"
- }
- }
- },
- "glob": {
- "version": "4.5.3",
- "from": "glob@>=4.0.2 <5.0.0",
- "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
- "dependencies": {
- "inflight": {
- "version": "1.0.4",
- "from": "inflight@>=1.0.4 <2.0.0",
- "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
- "dependencies": {
- "wrappy": {
- "version": "1.0.1",
- "from": "wrappy@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
- }
- }
- },
- "inherits": {
- "version": "2.0.1",
- "from": "inherits@>=2.0.0 <3.0.0",
- "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
- },
- "minimatch": {
- "version": "2.0.4",
- "from": "minimatch@>=2.0.1 <3.0.0",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
- "dependencies": {
- "brace-expansion": {
- "version": "1.1.0",
- "from": "brace-expansion@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
- "dependencies": {
- "balanced-match": {
- "version": "0.2.0",
- "from": "balanced-match@>=0.2.0 <0.3.0",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
- },
- "concat-map": {
- "version": "0.0.1",
- "from": "concat-map@0.0.1",
- "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
- }
- }
- }
- }
- },
- "once": {
- "version": "1.3.1",
- "from": "once@>=1.3.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
- "dependencies": {
- "wrappy": {
- "version": "1.0.1",
- "from": "wrappy@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
- }
- }
- }
- }
- }
- }
- },
- "relative": {
- "version": "0.1.6",
- "from": "relative@>=0.1.6 <0.2.0",
- "resolved": "https://registry.npmjs.org/relative/-/relative-0.1.6.tgz",
- "dependencies": {
- "normalize-path": {
- "version": "0.1.1",
- "from": "normalize-path@>=0.1.1 <0.2.0",
- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-0.1.1.tgz"
- }
- }
- }
- }
- },
- "read-yaml": {
- "version": "1.0.0",
- "from": "read-yaml@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/read-yaml/-/read-yaml-1.0.0.tgz",
- "dependencies": {
- "js-yaml": {
- "version": "3.2.7",
- "from": "js-yaml@>=3.2.3 <4.0.0",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz",
- "dependencies": {
- "argparse": {
- "version": "1.0.2",
- "from": "argparse@>=1.0.0 <1.1.0",
- "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz",
- "dependencies": {
- "lodash": {
- "version": "3.6.0",
- "from": "lodash@>=3.2.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz"
- },
- "sprintf-js": {
- "version": "1.0.2",
- "from": "sprintf-js@>=1.0.2 <1.1.0",
- "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz"
- }
- }
- },
- "esprima": {
- "version": "2.0.0",
- "from": "esprima@>=2.0.0 <2.1.0",
- "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz"
- }
- }
- },
- "xtend": {
- "version": "4.0.0",
- "from": "xtend@>=4.0.0 <5.0.0",
- "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
- }
- }
- }
- }
- },
- "for-own": {
- "version": "0.1.3",
- "from": "for-own@>=0.1.1 <0.2.0",
- "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.3.tgz",
- "dependencies": {
- "for-in": {
- "version": "0.1.4",
- "from": "for-in@>=0.1.4 <0.2.0",
- "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.4.tgz"
- }
- }
- },
- "has-values": {
- "version": "0.1.3",
- "from": "has-values@>=0.1.2 <0.2.0",
- "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.3.tgz"
- }
- }
- },
- "chalk": {
- "version": "0.5.1",
- "from": "chalk@>=0.5.1 <0.6.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
- "dependencies": {
- "ansi-styles": {
- "version": "1.1.0",
- "from": "ansi-styles@>=1.1.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
- },
- "escape-string-regexp": {
- "version": "1.0.3",
- "from": "escape-string-regexp@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
- },
- "has-ansi": {
- "version": "0.1.0",
- "from": "has-ansi@>=0.1.0 <0.2.0",
- "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
- "dependencies": {
- "ansi-regex": {
- "version": "0.2.1",
- "from": "ansi-regex@>=0.2.1 <0.3.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
- }
- }
- },
- "strip-ansi": {
- "version": "0.3.0",
- "from": "strip-ansi@>=0.3.0 <0.4.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
- "dependencies": {
- "ansi-regex": {
- "version": "0.2.1",
- "from": "ansi-regex@>=0.2.1 <0.3.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
- }
- }
- },
- "supports-color": {
- "version": "0.2.0",
- "from": "supports-color@>=0.2.0 <0.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
- }
- }
- },
- "micromatch": {
- "version": "1.6.2",
- "from": "micromatch@>=1.2.2 <2.0.0",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-1.6.2.tgz",
- "dependencies": {
- "extglob": {
- "version": "0.2.0",
- "from": "extglob@>=0.2.0 <0.3.0",
- "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.2.0.tgz"
- },
- "parse-glob": {
- "version": "2.1.1",
- "from": "parse-glob@>=2.1.1 <3.0.0",
- "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-2.1.1.tgz",
- "dependencies": {
- "glob-base": {
- "version": "0.1.1",
- "from": "glob-base@>=0.1.0 <0.2.0",
- "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.1.1.tgz"
- },
- "glob-path-regex": {
- "version": "1.0.0",
- "from": "glob-path-regex@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/glob-path-regex/-/glob-path-regex-1.0.0.tgz"
- }
- }
+ "from": "is-primitive@>=1.0.0 <2.0.0",
+ "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-1.0.0.tgz"
}
}
},
- "to-key": {
- "version": "1.0.0",
- "from": "to-key@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/to-key/-/to-key-1.0.0.tgz",
- "dependencies": {
- "arr-map": {
- "version": "1.0.0",
- "from": "arr-map@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-1.0.0.tgz"
- },
- "for-in": {
- "version": "0.1.4",
- "from": "for-in@>=0.1.4 <0.2.0",
- "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.4.tgz"
- }
- }
+ "is-primitive": {
+ "version": "2.0.0",
+ "from": "is-primitive@>=2.0.0 <3.0.0",
+ "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
}
}
}
@@ -1677,9 +1441,9 @@
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
"dependencies": {
"lru-cache": {
- "version": "2.5.0",
+ "version": "2.6.2",
"from": "lru-cache@>=2.0.0 <3.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
},
"sigmund": {
"version": "1.0.0",
@@ -1733,20 +1497,34 @@
},
"graceful-fs": {
"version": "3.0.6",
- "from": "graceful-fs@>=3.0.4 <3.1.0",
+ "from": "graceful-fs@>=3.0.2 <4.0.0",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
}
}
},
- "tapable": {
- "version": "0.1.8",
- "from": "tapable@>=0.1.8 <0.2.0",
- "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.8.tgz"
- },
- "supports-color": {
- "version": "1.3.1",
- "from": "supports-color@>=1.2.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
+ "webpack-core": {
+ "version": "0.6.5",
+ "from": "webpack-core@>=0.6.0 <0.7.0",
+ "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.5.tgz",
+ "dependencies": {
+ "source-map": {
+ "version": "0.4.2",
+ "from": "source-map@>=0.4.1 <0.5.0",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz",
+ "dependencies": {
+ "amdefine": {
+ "version": "0.1.0",
+ "from": "amdefine@>=0.0.4",
+ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+ }
+ }
+ },
+ "source-list-map": {
+ "version": "0.1.5",
+ "from": "source-list-map@>=0.1.0 <0.2.0",
+ "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.5.tgz"
+ }
+ }
}
}
}
diff --git a/client/package.json b/client/package.json
index f2cac61e6..72c38ec0b 100644
--- a/client/package.json
+++ b/client/package.json
@@ -23,40 +23,40 @@
},
"homepage": "https://github.com/justin808/react-webpack-rails-tutorial",
"dependencies": {
- "alt": "^0.14.5",
- "babel-core": "^5.0.8",
+ "alt": "^0.15.6",
+ "babel-core": "^5.1.13",
"babel-loader": "^5.0.0",
- "body-parser": "^1.12.2",
- "es5-shim": "^4.1.0",
+ "body-parser": "^1.12.3",
+ "es5-shim": "^4.1.1",
"imports-loader": "^0.6.3",
"jquery": "^2.1.3",
- "loader-utils": "^0.2.6",
+ "loader-utils": "^0.2.7",
"marked": "^0.3.3",
- "react": "^0.13.1",
- "react-bootstrap": "^0.20.1",
+ "react": "^0.13.2",
+ "react-bootstrap": "^0.21.0",
"sleep": "^2.0.0",
- "webpack": "^1.7.3"
+ "webpack": "^1.8.9"
},
"devDependencies": {
- "babel-eslint": "^2.0.2",
+ "babel-eslint": "^3.0.1",
"bootstrap-sass": "^3.3.4",
- "bootstrap-sass-loader": "^1.0.3",
- "css-loader": "^0.9.1",
- "eslint": "^0.18.0",
- "eslint-plugin-react": "^2.0.2",
- "esprima-fb": "^14001.1.0-dev-harmony-fb",
+ "bootstrap-sass-loader": "^1.0.4",
+ "css-loader": "^0.12.0",
+ "eslint": "^0.20.0",
+ "eslint-plugin-react": "^2.2.0",
+ "esprima-fb": "^15001.1.0-dev-harmony-fb",
"expose-loader": "^0.6.0",
"express": "^4.12.3",
"file-loader": "^0.8.1",
"gulp": "^3.8.11",
- "gulp-eslint": "^0.8.0",
+ "gulp-eslint": "^0.9.0",
"jscs": "^1.12.0",
"node-sass": "^2.1.1",
- "react-hot-loader": "^1.2.4",
+ "react-hot-loader": "^1.2.5",
"sass-loader": "^0.6.0",
- "style-loader": "^0.9.0",
+ "style-loader": "^0.12.0",
"url-loader": "^0.5.5",
- "webpack-dev-server": "^1.8.0"
+ "webpack-dev-server": "^1.8.2"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
diff --git a/client/scripts/rails_only.jsx b/client/scripts/rails_only.jsx
index f50724937..5008ada61 100644
--- a/client/scripts/rails_only.jsx
+++ b/client/scripts/rails_only.jsx
@@ -1,5 +1,3 @@
-'use strict';
-
// Only used by rails
// Example of including es5 shims for supporting older browsers
diff --git a/client/scripts/webpack_only.jsx b/client/scripts/webpack_only.jsx
index f5c520cd9..beee31ad6 100755
--- a/client/scripts/webpack_only.jsx
+++ b/client/scripts/webpack_only.jsx
@@ -1,5 +1,3 @@
-'use strict';
-
// These are only loaded by the webpack dev server
require('test-stylesheet.css');