diff --git a/node_modules/.cache/babel-loader/0d5ba35e1eb4db865d747c15f1bd674293651af9.json.gz b/node_modules/.cache/babel-loader/0d5ba35e1eb4db865d747c15f1bd674293651af9.json.gz new file mode 100644 index 00000000..de9d8cba Binary files /dev/null and b/node_modules/.cache/babel-loader/0d5ba35e1eb4db865d747c15f1bd674293651af9.json.gz differ diff --git a/node_modules/.cache/babel-loader/15ea2d0794e69728981b8f33eea708b53f166d81.json.gz b/node_modules/.cache/babel-loader/15ea2d0794e69728981b8f33eea708b53f166d81.json.gz new file mode 100644 index 00000000..fd2dda19 Binary files /dev/null and b/node_modules/.cache/babel-loader/15ea2d0794e69728981b8f33eea708b53f166d81.json.gz differ diff --git a/node_modules/.cache/babel-loader/1eba78b72821fc5522349135400fc8906d8b8006.json.gz b/node_modules/.cache/babel-loader/1eba78b72821fc5522349135400fc8906d8b8006.json.gz new file mode 100644 index 00000000..17912205 Binary files /dev/null and b/node_modules/.cache/babel-loader/1eba78b72821fc5522349135400fc8906d8b8006.json.gz differ diff --git a/node_modules/.cache/babel-loader/226479aea5abdf8c77384f13b99b1dd6245c5a56.json.gz b/node_modules/.cache/babel-loader/226479aea5abdf8c77384f13b99b1dd6245c5a56.json.gz new file mode 100644 index 00000000..8a4c7329 Binary files /dev/null and b/node_modules/.cache/babel-loader/226479aea5abdf8c77384f13b99b1dd6245c5a56.json.gz differ diff --git a/node_modules/.cache/babel-loader/228b48d0652f5fa9cbd434a2c21ae9149b97c3d9.json.gz b/node_modules/.cache/babel-loader/228b48d0652f5fa9cbd434a2c21ae9149b97c3d9.json.gz new file mode 100644 index 00000000..e342ba91 Binary files /dev/null and b/node_modules/.cache/babel-loader/228b48d0652f5fa9cbd434a2c21ae9149b97c3d9.json.gz differ diff --git a/node_modules/.cache/babel-loader/31ba23bb8c2107448dad0ae92f9aa00a8ea6d612.json.gz b/node_modules/.cache/babel-loader/31ba23bb8c2107448dad0ae92f9aa00a8ea6d612.json.gz new file mode 100644 index 00000000..45490ded Binary files /dev/null and b/node_modules/.cache/babel-loader/31ba23bb8c2107448dad0ae92f9aa00a8ea6d612.json.gz differ diff --git a/node_modules/.cache/babel-loader/522662c9f7da39ea64a346a22df077cac68984b4.json.gz b/node_modules/.cache/babel-loader/522662c9f7da39ea64a346a22df077cac68984b4.json.gz new file mode 100644 index 00000000..464c5d58 Binary files /dev/null and b/node_modules/.cache/babel-loader/522662c9f7da39ea64a346a22df077cac68984b4.json.gz differ diff --git a/node_modules/.cache/babel-loader/6791429a4be605b7c413c9e71a9c4e7cecb1d0c4.json.gz b/node_modules/.cache/babel-loader/6791429a4be605b7c413c9e71a9c4e7cecb1d0c4.json.gz new file mode 100644 index 00000000..4d102302 Binary files /dev/null and b/node_modules/.cache/babel-loader/6791429a4be605b7c413c9e71a9c4e7cecb1d0c4.json.gz differ diff --git a/node_modules/.cache/babel-loader/714c92cfd6af940a12c9b7e6fad58fd4608752d7.json.gz b/node_modules/.cache/babel-loader/714c92cfd6af940a12c9b7e6fad58fd4608752d7.json.gz new file mode 100644 index 00000000..c71419d2 Binary files /dev/null and b/node_modules/.cache/babel-loader/714c92cfd6af940a12c9b7e6fad58fd4608752d7.json.gz differ diff --git a/node_modules/.cache/babel-loader/7c4ed730d7e5057978c07c2efba8cf394bef234b.json.gz b/node_modules/.cache/babel-loader/7c4ed730d7e5057978c07c2efba8cf394bef234b.json.gz new file mode 100644 index 00000000..8d429fb2 Binary files /dev/null and b/node_modules/.cache/babel-loader/7c4ed730d7e5057978c07c2efba8cf394bef234b.json.gz differ diff --git a/node_modules/.cache/babel-loader/7cd81d5e66c9371193dd5ab5952de51da43a9ca3.json.gz b/node_modules/.cache/babel-loader/7cd81d5e66c9371193dd5ab5952de51da43a9ca3.json.gz new file mode 100644 index 00000000..670d92e2 Binary files /dev/null and b/node_modules/.cache/babel-loader/7cd81d5e66c9371193dd5ab5952de51da43a9ca3.json.gz differ diff --git a/node_modules/.cache/babel-loader/a563aec9741153e63cff1f3e8d5df8b1f7a84864.json.gz b/node_modules/.cache/babel-loader/a563aec9741153e63cff1f3e8d5df8b1f7a84864.json.gz new file mode 100644 index 00000000..964120e7 Binary files /dev/null and b/node_modules/.cache/babel-loader/a563aec9741153e63cff1f3e8d5df8b1f7a84864.json.gz differ diff --git a/node_modules/.cache/babel-loader/af32726655df1a6b9528c7fe4090af8bdcf63ed9.json.gz b/node_modules/.cache/babel-loader/af32726655df1a6b9528c7fe4090af8bdcf63ed9.json.gz new file mode 100644 index 00000000..c6f1df28 Binary files /dev/null and b/node_modules/.cache/babel-loader/af32726655df1a6b9528c7fe4090af8bdcf63ed9.json.gz differ diff --git a/node_modules/.cache/babel-loader/b21f932bf679afc9c377a198b0b57eabbc044594.json.gz b/node_modules/.cache/babel-loader/b21f932bf679afc9c377a198b0b57eabbc044594.json.gz new file mode 100644 index 00000000..beb8de36 Binary files /dev/null and b/node_modules/.cache/babel-loader/b21f932bf679afc9c377a198b0b57eabbc044594.json.gz differ diff --git a/node_modules/.cache/babel-loader/bde4cfee8aeefe4616eb36417e29ba7ae2668047.json.gz b/node_modules/.cache/babel-loader/bde4cfee8aeefe4616eb36417e29ba7ae2668047.json.gz new file mode 100644 index 00000000..1861a219 Binary files /dev/null and b/node_modules/.cache/babel-loader/bde4cfee8aeefe4616eb36417e29ba7ae2668047.json.gz differ diff --git a/node_modules/.cache/babel-loader/c485f9aa6ed78b4fb0e724b75487f501238678b0.json.gz b/node_modules/.cache/babel-loader/c485f9aa6ed78b4fb0e724b75487f501238678b0.json.gz new file mode 100644 index 00000000..7211ad2a Binary files /dev/null and b/node_modules/.cache/babel-loader/c485f9aa6ed78b4fb0e724b75487f501238678b0.json.gz differ diff --git a/node_modules/.cache/babel-loader/cbd8a112edbb9b1cf5d33adda0252f9785fe6b2c.json.gz b/node_modules/.cache/babel-loader/cbd8a112edbb9b1cf5d33adda0252f9785fe6b2c.json.gz new file mode 100644 index 00000000..e057e5b2 Binary files /dev/null and b/node_modules/.cache/babel-loader/cbd8a112edbb9b1cf5d33adda0252f9785fe6b2c.json.gz differ diff --git a/node_modules/.cache/babel-loader/e89ac6ab43a3de1b18b1eafa7f83d68c40089f8a.json.gz b/node_modules/.cache/babel-loader/e89ac6ab43a3de1b18b1eafa7f83d68c40089f8a.json.gz new file mode 100644 index 00000000..2ef03dac Binary files /dev/null and b/node_modules/.cache/babel-loader/e89ac6ab43a3de1b18b1eafa7f83d68c40089f8a.json.gz differ diff --git a/node_modules/.cache/babel-loader/ec2585bd95f16d28f9af9fafddef984bc23793d9.json.gz b/node_modules/.cache/babel-loader/ec2585bd95f16d28f9af9fafddef984bc23793d9.json.gz new file mode 100644 index 00000000..2cbe4587 Binary files /dev/null and b/node_modules/.cache/babel-loader/ec2585bd95f16d28f9af9fafddef984bc23793d9.json.gz differ diff --git a/node_modules/.cache/babel-loader/fd9c0a738886b0d75b2148e759c5f43a74da4e54.json.gz b/node_modules/.cache/babel-loader/fd9c0a738886b0d75b2148e759c5f43a74da4e54.json.gz new file mode 100644 index 00000000..6678c8da Binary files /dev/null and b/node_modules/.cache/babel-loader/fd9c0a738886b0d75b2148e759c5f43a74da4e54.json.gz differ diff --git a/node_modules/extend/.eslintrc b/node_modules/extend/.eslintrc index d49f1735..90b31938 100644 --- a/node_modules/extend/.eslintrc +++ b/node_modules/extend/.eslintrc @@ -1,192 +1,17 @@ { - "env": { - "browser": false, - "node": true, - "amd": false, - "mocha": false, - "jasmine": false - }, + "root": true, + + "extends": "@ljharb", "rules": { - "accessor-pairs": [2, { getWithoutSet: false, setWithoutGet: true }], - "array-bracket-spacing": [2, "never", { - "singleValue": false, - "objectsInArrays": false, - "arraysInArrays": false - }], - "block-scoped-var": [0], - "brace-style": [2, "1tbs", { "allowSingleLine": true }], - "camelcase": [2], - "comma-dangle": [2, "never"], - "comma-spacing": [2], - "comma-style": [2, "last"], "complexity": [2, 15], - "computed-property-spacing": [2, "never"], - "consistent-return": [2], - "consistent-this": [0, "that"], - "constructor-super": [2], - "curly": [2, "all"], - "default-case": [2], - "dot-notation": [2, { "allowKeywords": true }], - "eol-last": [2], - "eqeqeq": [2], - "func-names": [0], - "func-style": [2, "expression"], - "generator-star-spacing": [2, { "before": false, "after": true }], - "global-strict": [0, "never"], - "guard-for-in": [0], - "handle-callback-err": [0], - "key-spacing": [2, { "beforeColon": false, "afterColon": true }], - "linebreak-style": [2, "unix"], - "lines-around-comment": [2, { - "beforeBlockComment": false, - "afterBlockComment": false, - "beforeLineComment": false, - "beforeLineComment": false, - "allowBlockStart": true, - "allowBlockEnd": true - }], - "quotes": [2, "single", "avoid-escape"], + "eqeqeq": [2, "allow-null"], + "func-name-matching": [1], "max-depth": [1, 4], - "max-len": [0, 80, 4], - "max-nested-callbacks": [2, 2], - "max-params": [2, 2], - "max-statements": [2, 21], - "new-parens": [2], - "new-cap": [2], - "newline-after-var": [0], - "no-alert": [2], - "no-array-constructor": [2], - "no-bitwise": [0], - "no-caller": [2], - "no-catch-shadow": [2], - "no-cond-assign": [2], - "no-console": [2], - "no-constant-condition": [2], - "no-continue": [2], - "no-control-regex": [2], - "no-debugger": [2], - "no-delete-var": [2], - "no-div-regex": [0], - "no-dupe-args": [2], - "no-dupe-keys": [2], - "no-duplicate-case": [2], - "no-else-return": [0], - "no-empty": [2], - "no-empty-character-class": [2], - "no-empty-label": [2], - "no-eq-null": [0], - "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": [2], - "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": 1}], - "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-param-reassign": [2], - "no-path-concat": [0], - "no-plusplus": [0], - "no-process-env": [0], - "no-process-exit": [2], - "no-proto": [2], - "no-redeclare": [2], - "no-regex-spaces": [2], - "no-reserved-keys": [2], - "no-restricted-modules": [0], - "no-return-assign": [2, "always"], - "no-script-url": [2], - "no-self-compare": [0], - "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-this-before-super": [2], - "no-throw-literal": [2], - "no-trailing-spaces": [2, { "skipBlankLines": false }], - "no-undef": [2], - "no-undef-init": [2], - "no-undefined": [0], - "no-underscore-dangle": [2], - "no-unexpected-multiline": [2], - "no-unneeded-ternary": [2], - "no-unreachable": [2], - "no-unused-expressions": [2], - "no-unused-vars": [2, { "vars": "all", "args": "after-used" }], - "no-use-before-define": [2], - "no-void": [0], - "no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }], - "no-with": [2], - "no-wrap-func": [2], - "object-curly-spacing": [2, "always"], - "object-shorthand": [2, "never"], - "one-var": [0], - "operator-assignment": [0, "always"], - "operator-linebreak": [2, "none"], - "padded-blocks": [0], - "prefer-const": [0], - "quote-props": [0], - "radix": [0], - "semi": [2], - "semi-spacing": [2, { "before": false, "after": true }], - "sort-vars": [0], - "space-after-keywords": [2, "always"], - "space-before-function-paren": [2, { "anonymous": "always", "named": "never" }], - "space-before-blocks": [0, "always"], - "space-in-brackets": [0, "never", { - "singleValue": true, - "arraysInArrays": false, - "arraysInObjects": false, - "objectsInArrays": true, - "objectsInObjects": true, - "propertyName": false - }], - "space-in-parens": [2, "never"], - "space-infix-ops": [2], - "space-return-throw-case": [2], - "space-unary-ops": [2, { "words": true, "nonwords": false }], - "spaced-comment": [2, "always"], - "spaced-line-comment": [0, "always"], - "strict": [2, "global"], - "use-isnan": [2], - "valid-jsdoc": [0], - "valid-typeof": [2], - "vars-on-top": [0], - "wrap-iife": [2], - "wrap-regex": [2], - "yoda": [2, "never", { "exceptRange": true, "onlyEquality": false }] + "max-statements": [2, 26], + "no-extra-parens": [1], + "no-magic-numbers": [0], + "no-restricted-syntax": [2, "BreakStatement", "ContinueStatement", "DebuggerStatement", "LabeledStatement", "WithStatement"], + "sort-keys": [0], } } diff --git a/node_modules/extend/.jscs.json b/node_modules/extend/.jscs.json index 7e84b282..0284c86d 100644 --- a/node_modules/extend/.jscs.json +++ b/node_modules/extend/.jscs.json @@ -1,4 +1,6 @@ { + "es3": true, + "additionalRules": [], "requireSemicolons": true, @@ -7,12 +9,29 @@ "disallowIdentifierNames": [], - "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"], + "requireCurlyBraces": { + "allExcept": [], + "keywords": ["if", "else", "for", "while", "do", "try", "catch"] + }, "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch", "function"], "disallowSpaceAfterKeywords": [], + "disallowSpaceBeforeComma": true, + "disallowSpaceAfterComma": false, + "disallowSpaceBeforeSemicolon": true, + + "disallowNodeTypes": [ + "DebuggerStatement", + "LabeledStatement", + "SwitchCase", + "SwitchStatement", + "WithStatement" + ], + + "requireObjectKeysOnNewLine": { "allExcept": ["sameLine"] }, + "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningRoundBrace": true, "beforeOpeningCurlyBrace": true }, "requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true }, "disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true }, @@ -25,7 +44,7 @@ "disallowSpacesInsideArrayBrackets": true, - "disallowQuotedKeysInObjects": "allButReserved", + "disallowQuotedKeysInObjects": { "allExcept": ["reserved"] }, "disallowSpaceAfterObjectKeys": true, @@ -60,7 +79,7 @@ "disallowMultipleLineStrings": true, - "requireDotNotation": true, + "requireDotNotation": { "allExcept": ["keywords"] }, "requireParenthesesAroundIIFE": true, @@ -99,6 +118,58 @@ "maximum": 6 }, - "requirePaddingNewLinesAfterUseStrict": true + "requirePaddingNewLinesAfterUseStrict": true, + + "disallowArrowFunctions": true, + + "disallowMultiLineTernary": true, + + "validateOrderInObjectKeys": false, + + "disallowIdenticalDestructuringNames": true, + + "disallowNestedTernaries": { "maxLevel": 1 }, + + "requireSpaceAfterComma": { "allExcept": ["trailing"] }, + "requireAlignedMultilineParams": false, + + "requireSpacesInGenerator": { + "afterStar": true + }, + + "disallowSpacesInGenerator": { + "beforeStar": true + }, + + "disallowVar": false, + + "requireArrayDestructuring": false, + + "requireEnhancedObjectLiterals": false, + + "requireObjectDestructuring": false, + + "requireEarlyReturn": false, + + "requireCapitalizedConstructorsNew": { + "allExcept": ["Function", "String", "Object", "Symbol", "Number", "Date", "RegExp", "Error", "Boolean", "Array"] + }, + + "requireImportAlphabetized": false, + + "requireSpaceBeforeObjectValues": true, + "requireSpaceBeforeDestructuredValues": true, + + "disallowSpacesInsideTemplateStringPlaceholders": true, + + "disallowArrayDestructuringReturn": false, + + "requireNewlineBeforeSingleStatementsInIf": false, + + "disallowUnusedVariables": true, + + "requireSpacesInsideImportedObjectBraces": true, + + "requireUseStrict": true } diff --git a/node_modules/extend/.travis.yml b/node_modules/extend/.travis.yml index ebef6449..6bf696c8 100644 --- a/node_modules/extend/.travis.yml +++ b/node_modules/extend/.travis.yml @@ -1,44 +1,179 @@ language: node_js +os: + - linux node_js: - - "iojs-v2.3" - - "iojs-v2.2" - - "iojs-v2.1" - - "iojs-v2.0" + - "7.9" + - "6.10" + - "5.12" + - "4.8" + - "iojs-v3.3" + - "iojs-v2.5" - "iojs-v1.8" - - "iojs-v1.7" - - "iojs-v1.6" - - "iojs-v1.5" - - "iojs-v1.4" - - "iojs-v1.3" - - "iojs-v1.2" - - "iojs-v1.1" - - "iojs-v1.0" - "0.12" - - "0.11" - "0.10" - - "0.9" - "0.8" - - "0.6" - - "0.4" before_install: - - '[ "${TRAVIS_NODE_VERSION}" = "0.6" ] || npm install -g npm@1.4.28 && npm install -g npm' + - 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ]; then npm install -g npm@1.3 ; elif [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then case "$(npm --version)" in 1.*) npm install -g npm@1.4.28 ;; 2.*) npm install -g npm@2 ;; esac ; fi' + - 'if [ "${TRAVIS_NODE_VERSION}" != "0.6" ] && [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then npm install -g npm; fi' +install: + - 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ]; then nvm install 0.8 && npm install -g npm@1.3 && npm install -g npm@1.4.28 && npm install -g npm@2 && npm install && nvm use "${TRAVIS_NODE_VERSION}"; else npm install; fi;' +script: + - 'if [ -n "${PRETEST-}" ]; then npm run pretest ; fi' + - 'if [ -n "${POSTTEST-}" ]; then npm run posttest ; fi' + - 'if [ -n "${COVERAGE-}" ]; then npm run coverage ; fi' + - 'if [ -n "${TEST-}" ]; then npm run tests-only ; fi' sudo: false +env: + - TEST=true matrix: fast_finish: true - allow_failures: + include: + - node_js: "node" + env: PRETEST=true + - node_js: "node" + env: COVERAGE=true + - node_js: "7.8" + env: TEST=true ALLOW_FAILURE=true + - node_js: "7.7" + env: TEST=true ALLOW_FAILURE=true + - node_js: "7.6" + env: TEST=true ALLOW_FAILURE=true + - node_js: "7.5" + env: TEST=true ALLOW_FAILURE=true + - node_js: "7.4" + env: TEST=true ALLOW_FAILURE=true + - node_js: "7.3" + env: TEST=true ALLOW_FAILURE=true + - node_js: "7.2" + env: TEST=true ALLOW_FAILURE=true + - node_js: "7.1" + env: TEST=true ALLOW_FAILURE=true + - node_js: "7.0" + env: TEST=true ALLOW_FAILURE=true + - node_js: "6.9" + env: TEST=true ALLOW_FAILURE=true + - node_js: "6.8" + env: TEST=true ALLOW_FAILURE=true + - node_js: "6.7" + env: TEST=true ALLOW_FAILURE=true + - node_js: "6.6" + env: TEST=true ALLOW_FAILURE=true + - node_js: "6.5" + env: TEST=true ALLOW_FAILURE=true + - node_js: "6.4" + env: TEST=true ALLOW_FAILURE=true + - node_js: "6.3" + env: TEST=true ALLOW_FAILURE=true + - node_js: "6.2" + env: TEST=true ALLOW_FAILURE=true + - node_js: "6.1" + env: TEST=true ALLOW_FAILURE=true + - node_js: "6.0" + env: TEST=true ALLOW_FAILURE=true + - node_js: "5.11" + env: TEST=true ALLOW_FAILURE=true + - node_js: "5.10" + env: TEST=true ALLOW_FAILURE=true + - node_js: "5.9" + env: TEST=true ALLOW_FAILURE=true + - node_js: "5.8" + env: TEST=true ALLOW_FAILURE=true + - node_js: "5.7" + env: TEST=true ALLOW_FAILURE=true + - node_js: "5.6" + env: TEST=true ALLOW_FAILURE=true + - node_js: "5.5" + env: TEST=true ALLOW_FAILURE=true + - node_js: "5.4" + env: TEST=true ALLOW_FAILURE=true + - node_js: "5.3" + env: TEST=true ALLOW_FAILURE=true + - node_js: "5.2" + env: TEST=true ALLOW_FAILURE=true + - node_js: "5.1" + env: TEST=true ALLOW_FAILURE=true + - node_js: "5.0" + env: TEST=true ALLOW_FAILURE=true + - node_js: "4.7" + env: TEST=true ALLOW_FAILURE=true + - node_js: "4.6" + env: TEST=true ALLOW_FAILURE=true + - node_js: "4.5" + env: TEST=true ALLOW_FAILURE=true + - node_js: "4.4" + env: TEST=true ALLOW_FAILURE=true + - node_js: "4.3" + env: TEST=true ALLOW_FAILURE=true + - node_js: "4.2" + env: TEST=true ALLOW_FAILURE=true + - node_js: "4.1" + env: TEST=true ALLOW_FAILURE=true + - node_js: "4.0" + env: TEST=true ALLOW_FAILURE=true + - node_js: "iojs-v3.2" + env: TEST=true ALLOW_FAILURE=true + - node_js: "iojs-v3.1" + env: TEST=true ALLOW_FAILURE=true + - node_js: "iojs-v3.0" + env: TEST=true ALLOW_FAILURE=true + - node_js: "iojs-v2.4" + env: TEST=true ALLOW_FAILURE=true + - node_js: "iojs-v2.3" + env: TEST=true ALLOW_FAILURE=true - node_js: "iojs-v2.2" + env: TEST=true ALLOW_FAILURE=true - node_js: "iojs-v2.1" + env: TEST=true ALLOW_FAILURE=true - node_js: "iojs-v2.0" + env: TEST=true ALLOW_FAILURE=true - node_js: "iojs-v1.7" + env: TEST=true ALLOW_FAILURE=true - node_js: "iojs-v1.6" + env: TEST=true ALLOW_FAILURE=true - node_js: "iojs-v1.5" + env: TEST=true ALLOW_FAILURE=true - node_js: "iojs-v1.4" + env: TEST=true ALLOW_FAILURE=true - node_js: "iojs-v1.3" + env: TEST=true ALLOW_FAILURE=true - node_js: "iojs-v1.2" + env: TEST=true ALLOW_FAILURE=true - node_js: "iojs-v1.1" + env: TEST=true ALLOW_FAILURE=true - node_js: "iojs-v1.0" + env: TEST=true ALLOW_FAILURE=true - node_js: "0.11" + env: TEST=true ALLOW_FAILURE=true - node_js: "0.9" - - node_js: "0.8" + env: TEST=true ALLOW_FAILURE=true - node_js: "0.6" + env: TEST=true ALLOW_FAILURE=true - node_js: "0.4" + env: TEST=true ALLOW_FAILURE=true + ##- node_js: "7" + #env: TEST=true + #os: osx + #- node_js: "6" + #env: TEST=true + #os: osx + #- node_js: "5" + #env: TEST=true + #os: osx + #- node_js: "4" + #env: TEST=true + #os: osx + #- node_js: "iojs" + #env: TEST=true + #os: osx + #- node_js: "0.12" + #env: TEST=true + #os: osx + #- node_js: "0.10" + #env: TEST=true + #os: osx + #- node_js: "0.8" + #env: TEST=true + #os: osx + allow_failures: + - os: osx + - env: TEST=true ALLOW_FAILURE=true diff --git a/node_modules/extend/CHANGELOG.md b/node_modules/extend/CHANGELOG.md index ee0cfd6a..0fe52876 100644 --- a/node_modules/extend/CHANGELOG.md +++ b/node_modules/extend/CHANGELOG.md @@ -1,3 +1,11 @@ +3.0.1 / 2017-04-27 +================== + * [Fix] deep extending should work with a non-object (#46) + * [Dev Deps] update `tape`, `eslint`, `@ljharb/eslint-config` + * [Tests] up to `node` `v7.9`, `v6.10`, `v4.8`; improve matrix + * [Docs] Switch from vb.teelaun.ch to versionbadg.es for the npm version badge SVG. + * [Docs] Add example to readme (#34) + 3.0.0 / 2015-07-01 ================== * [Possible breaking change] Use global "strict" directive (#32) diff --git a/node_modules/extend/README.md b/node_modules/extend/README.md index 632fb0f9..5b8249aa 100644 --- a/node_modules/extend/README.md +++ b/node_modules/extend/README.md @@ -6,6 +6,18 @@ `node-extend` is a port of the classic extend() method from jQuery. It behaves as you expect. It is simple, tried and true. +Notes: + +* Since Node.js >= 4, + [`Object.assign`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign) + now offers the same functionality natively (but without the "deep copy" option). + See [ECMAScript 2015 (ES6) in Node.js](https://nodejs.org/en/docs/es6). +* Some native implementations of `Object.assign` in both Node.js and many + browsers (since NPM modules are for the browser too) may not be fully + spec-compliant. + Check [`object.assign`](https://www.npmjs.com/package/object.assign) module for + a compliant candidate. + ## Installation This package is available on [npm][npm-url] as: `extend` @@ -20,6 +32,13 @@ npm install extend *Extend one object with one or more others, returning the modified object.* +**Example:** + +``` js +var extend = require('extend'); +extend(targetObject, object1, object2); +``` + Keep in mind that the target object will be modified, and will be returned from extend(). If a boolean true is specified as the first argument, extend performs a deep copy, recursively copying any objects it finds. Otherwise, the copy will share structure with the original object(s). @@ -54,7 +73,7 @@ Ported to Node.js by [Stefan Thomas][github-justmoon] with contributions by [Jon [github-justmoon]: https://github.com/justmoon [github-insin]: https://github.com/insin [github-ljharb]: https://github.com/ljharb -[npm-version-png]: http://vb.teelaun.ch/justmoon/node-extend.svg +[npm-version-png]: http://versionbadg.es/justmoon/node-extend.svg [deps-svg]: https://david-dm.org/justmoon/node-extend.svg [deps-url]: https://david-dm.org/justmoon/node-extend [dev-deps-svg]: https://david-dm.org/justmoon/node-extend/dev-status.svg diff --git a/node_modules/extend/index.js b/node_modules/extend/index.js index f5ec75d5..bbe53f66 100644 --- a/node_modules/extend/index.js +++ b/node_modules/extend/index.js @@ -26,17 +26,17 @@ var isPlainObject = function isPlainObject(obj) { // Own properties are enumerated firstly, so to speed up, // if last one is own, then all properties are own. var key; - for (key in obj) {/**/} + for (key in obj) { /**/ } return typeof key === 'undefined' || hasOwn.call(obj, key); }; module.exports = function extend() { - var options, name, src, copy, copyIsArray, clone, - target = arguments[0], - i = 1, - length = arguments.length, - deep = false; + var options, name, src, copy, copyIsArray, clone; + var target = arguments[0]; + var i = 1; + var length = arguments.length; + var deep = false; // Handle a deep copy situation if (typeof target === 'boolean') { @@ -44,7 +44,8 @@ module.exports = function extend() { target = arguments[1] || {}; // skip the boolean and the target i = 2; - } else if ((typeof target !== 'object' && typeof target !== 'function') || target == null) { + } + if (target == null || (typeof target !== 'object' && typeof target !== 'function')) { target = {}; } @@ -83,4 +84,3 @@ module.exports = function extend() { // Return the modified object return target; }; - diff --git a/node_modules/extend/package.json b/node_modules/extend/package.json index 001bbd28..2a56385f 100644 --- a/node_modules/extend/package.json +++ b/node_modules/extend/package.json @@ -14,15 +14,19 @@ ] ], "_from": "extend@>=3.0.0 <3.1.0", - "_id": "extend@3.0.0", + "_id": "extend@3.0.1", "_inCache": true, "_location": "/extend", - "_nodeVersion": "2.3.1", + "_nodeVersion": "7.9.0", + "_npmOperationalInternal": { + "host": "packages-18-east.internal.npmjs.com", + "tmp": "tmp/extend-3.0.1.tgz_1493357803699_0.1708133383654058" + }, "_npmUser": { "name": "ljharb", "email": "ljharb@gmail.com" }, - "_npmVersion": "2.11.3", + "_npmVersion": "4.2.0", "_phantomChildren": {}, "_requested": { "raw": "extend@~3.0.0", @@ -36,8 +40,8 @@ "_requiredBy": [ "/request" ], - "_resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz", - "_shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4", + "_resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "_shasum": "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444", "_shrinkwrap": null, "_spec": "extend@~3.0.0", "_where": "/Users/lc/Documents/LUKI/EDINBURGH/PROGRAMMING/ReactJS/porgor-patch/node_modules/request", @@ -58,17 +62,18 @@ "dependencies": {}, "description": "Port of jQuery.extend for node.js and the browser", "devDependencies": { + "@ljharb/eslint-config": "^11.0.0", "covert": "^1.1.0", - "eslint": "^0.24.0", - "jscs": "^1.13.1", - "tape": "^4.0.0" + "eslint": "^3.19.0", + "jscs": "^3.0.7", + "tape": "^4.6.3" }, "directories": {}, "dist": { - "shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4", - "tarball": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" + "shasum": "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444", + "tarball": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz" }, - "gitHead": "148e7270cab2e9413af2cd0cab147070d755ed6d", + "gitHead": "138b515df4d628bb1742254ede5d2551c0fecae7", "homepage": "https://github.com/justmoon/node-extend#readme", "keywords": [ "extend", @@ -100,7 +105,10 @@ "eslint": "eslint *.js */*.js", "jscs": "jscs *.js */*.js", "lint": "npm run jscs && npm run eslint", - "test": "npm run lint && node test/index.js && npm run coverage-quiet" + "posttest": "npm run coverage-quiet", + "pretest": "npm run lint", + "test": "npm run tests-only", + "tests-only": "node test" }, - "version": "3.0.0" + "version": "3.0.1" } diff --git a/node_modules/request/package.json b/node_modules/request/package.json index a71793e2..0c438777 100644 --- a/node_modules/request/package.json +++ b/node_modules/request/package.json @@ -2,18 +2,18 @@ "_args": [ [ { - "raw": "request@^2.79.0", + "raw": "request", "scope": null, "escapedName": "request", "name": "request", - "rawSpec": "^2.79.0", - "spec": ">=2.79.0 <3.0.0", - "type": "range" + "rawSpec": "", + "spec": "latest", + "type": "tag" }, - "/Users/lc/Documents/LUKI/EDINBURGH/PROGRAMMING/ReactJS/porgor-patch/node_modules/jsdom" + "/Users/lc/Documents/LUKI/EDINBURGH/PROGRAMMING/ReactJS/porgor-patch" ] ], - "_from": "request@>=2.79.0 <3.0.0", + "_from": "request@latest", "_id": "request@2.81.0", "_inCache": true, "_location": "/request", @@ -29,22 +29,24 @@ "_npmVersion": "2.15.11", "_phantomChildren": {}, "_requested": { - "raw": "request@^2.79.0", + "raw": "request", "scope": null, "escapedName": "request", "name": "request", - "rawSpec": "^2.79.0", - "spec": ">=2.79.0 <3.0.0", - "type": "range" + "rawSpec": "", + "spec": "latest", + "type": "tag" }, "_requiredBy": [ + "#USER", + "/", "/jsdom" ], "_resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", "_shasum": "c6928946a0e06c5f8d6f8a9333469ffda46298a0", "_shrinkwrap": null, - "_spec": "request@^2.79.0", - "_where": "/Users/lc/Documents/LUKI/EDINBURGH/PROGRAMMING/ReactJS/porgor-patch/node_modules/jsdom", + "_spec": "request", + "_where": "/Users/lc/Documents/LUKI/EDINBURGH/PROGRAMMING/ReactJS/porgor-patch", "author": { "name": "Mikeal Rogers", "email": "mikeal.rogers@gmail.com" diff --git a/package.json b/package.json index c322575c..4d850a1f 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "countdown": "^2.6.0", "fs": "0.0.1-security", "react": "^15.5.4", - "react-dom": "^15.5.4" + "react-dom": "^15.5.4", + "request": "^2.81.0" }, "devDependencies": { "react-scripts": "0.9.5" diff --git a/src/components/App.js b/src/components/App.js index 6ef792e7..87aee1be 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -8,29 +8,24 @@ export default class App extends Component { constructor() { super(); - this.state = { page: "countdown", loggedIn: "no team" }; + this.state = { page: "countdown", loggedIn: false, teamLoggedIn: "" }; } render() { - const logInFn = (team) => { - this.setState({loggedIn: team}); - } + const logIn = (team) => this.setState({loggedIn: true, teamLoggedIn: team}); + const logOut = () => this.setState({loggedIn: false}); + const linkClick = (arg) => this.setState({page:arg}); const boxRender = () => { if (this.state.page=="countdown") { return (); } else if (this.state.page=="patchtable") { return (); } else if (this.state.page=="login") { - return (); + return (); } else { return (); } } - - const linkClick = (arg) => { - this.setState({page:arg}); - } - return (
diff --git a/src/components/Login.js b/src/components/Login.js index ed5baa75..061aa18c 100644 --- a/src/components/Login.js +++ b/src/components/Login.js @@ -1,22 +1,32 @@ import React from 'react'; import './Login.css'; +import Request from 'request'; export default class Login extends React.Component { constructor(props) { super(props); - this.state = {team:null}; + this.state = { team: null, serverResponse: false }; this.handleChange = this.handleChange.bind(this); } - handleChange(event) { - this.setState({team: event.target.value}); - }; + handleChange = (e) => { + this.setState({ team: e.target.value }); + } render() { + const validateLogInFromServer = (team, pass) => { + Request.post({url: "http://localhost:8080/login", form:{text:"hi"}}, (err, res, body) => { + if (err) { + return (

{err}

); + } else { + return (

{body}

); + } + }); + } return (
-
{this.props.loggedIn} is logged in.
+
{this.props.loggedIn ? this.props.teamLoggedIn : "no team"} is logged in.
- +
) } diff --git a/src/server.js b/src/server.js index e9100211..1d1a369d 100644 --- a/src/server.js +++ b/src/server.js @@ -11,4 +11,8 @@ app.get('/', function (req, res) { res.sendFile(path.join(__dirname, '..', 'build', 'index.html')); }); +app.get('/login', function (req, res) { + console.log(req.text); +}) + app.listen(PORT); \ No newline at end of file