From 20f4f97cc39c488031100b31acca1f9b2219baa2 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Wed, 25 Apr 2018 13:51:01 -0400 Subject: [PATCH] Ugly progress commit --- Makefile | 14 ++ package.json | 2 +- src/reducers/index.js | 3 +- src/reducers/receiveReducer.js | 13 ++ src/reducers/{wsReducer.js => sendReducer.js} | 2 +- yarn.lock | 120 +++++++++++------- 6 files changed, 104 insertions(+), 50 deletions(-) create mode 100644 Makefile create mode 100644 src/reducers/receiveReducer.js rename src/reducers/{wsReducer.js => sendReducer.js} (78%) diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..593cd97 --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ +all: node_modules + +clean: + rm -rf ./node_modules + rm -rf ./dist + rm -rf ./build + +node_modules: + yarn --ignore-engines + +fix: node_modules + yarn fix + +.PHONY: all clean fix diff --git a/package.json b/package.json index 2a33df2..b0d4c82 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "postcss-flexbugs-fixes": "3.3.0", "postcss-loader": "^2.1.3", "raf": "3.4.0", - "style-loader": "^0.20.3", + "style-loader": "^0.21.0", "sw-precache-webpack-plugin": "^0.11.5", "url-loader": "1.0.1", "webpack": "^3", diff --git a/src/reducers/index.js b/src/reducers/index.js index 3d6b493..573997e 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -1 +1,2 @@ -export * from './wsReducer'; +export * from './receiveReducer'; +export * from './sendReducer'; diff --git a/src/reducers/receiveReducer.js b/src/reducers/receiveReducer.js new file mode 100644 index 0000000..fd0009b --- /dev/null +++ b/src/reducers/receiveReducer.js @@ -0,0 +1,13 @@ +/** + * Reducer for received websocket messages + * + * @param {object} state + * @param {object} action + * @return {object} newState + */ +export const receiveReducer = (state = {}, action) => { + switch (action.type) { + default: + return state; + } +}; diff --git a/src/reducers/wsReducer.js b/src/reducers/sendReducer.js similarity index 78% rename from src/reducers/wsReducer.js rename to src/reducers/sendReducer.js index 6d359d2..d21b5c8 100644 --- a/src/reducers/wsReducer.js +++ b/src/reducers/sendReducer.js @@ -5,7 +5,7 @@ * @param {object} action * @return {object} newState */ -export const wsReducer = (state = {}, action) => { +export const sendReducer = (state = {}, action) => { switch (action.type) { default: return state; diff --git a/yarn.lock b/yarn.lock index 5e0be7f..3cef7e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,12 +22,18 @@ "7zip-bin-mac" "~1.0.1" "7zip-bin-win" "~2.2.0" -"@babel/code-frame@7.0.0-beta.44", "@babel/code-frame@^7.0.0-beta.35": +"@babel/code-frame@7.0.0-beta.44": version "7.0.0-beta.44" resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9" dependencies: "@babel/highlight" "7.0.0-beta.44" +"@babel/code-frame@^7.0.0-beta.35": + version "7.0.0-beta.46" + resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.46.tgz#e0d002100805daab1461c0fcb32a07e304f3a4f4" + dependencies: + "@babel/highlight" "7.0.0-beta.46" + "@babel/generator@7.0.0-beta.44": version "7.0.0-beta.44" resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42" @@ -66,6 +72,14 @@ esutils "^2.0.2" js-tokens "^3.0.0" +"@babel/highlight@7.0.0-beta.46": + version "7.0.0-beta.46" + resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.46.tgz#c553c51e65f572bdedd6eff66fc0bb563016645e" + dependencies: + chalk "^2.0.0" + esutils "^2.0.2" + js-tokens "^3.0.0" + "@babel/template@7.0.0-beta.44": version "7.0.0-beta.44" resolved "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f" @@ -120,8 +134,8 @@ virtual-dom "^2.1.1" "@types/node@^8.0.24": - version "8.10.9" - resolved "https://registry.npmjs.org/@types/node/-/node-8.10.9.tgz#b507a74a7d3eddc74a17dc35fd40d8f45dde0d6c" + version "8.10.10" + resolved "https://registry.npmjs.org/@types/node/-/node-8.10.10.tgz#fec07bc2ad549d9e6d2f7aa0fb0be3491b83163a" abab@^1.0.4: version "1.0.4" @@ -1120,9 +1134,9 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" -batch-cluster@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/batch-cluster/-/batch-cluster-2.0.0.tgz#e73f03a365e55d98416dfecc6d754241c9a49319" +batch-cluster@^2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/batch-cluster/-/batch-cluster-2.1.0.tgz#4d093a98b60cdfbf61b21422b1c55b24a9b1104f" batch@0.6.1: version "0.6.1" @@ -1345,11 +1359,11 @@ browserslist@^2.1.2: electron-to-chromium "^1.3.30" browserslist@^3.2.4: - version "3.2.4" - resolved "https://registry.npmjs.org/browserslist/-/browserslist-3.2.4.tgz#fb9ad70fd09875137ae943a31ab815ed76896031" + version "3.2.5" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-3.2.5.tgz#aa46a5ea33b5330178f3c91cfd85e148fcb57080" dependencies: - caniuse-lite "^1.0.30000821" - electron-to-chromium "^1.3.41" + caniuse-lite "^1.0.30000830" + electron-to-chromium "^1.3.42" bser@^2.0.0: version "2.0.0" @@ -1511,7 +1525,7 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: version "1.0.30000830" resolved "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000830.tgz#6e45255b345649fd15ff59072da1e12bb3de2f13" -caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000821, caniuse-lite@^1.0.30000830: +caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000830: version "1.0.30000830" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000830.tgz#cb96b8a2dd3cbfe04acea2af3c4e894249095328" @@ -1661,8 +1675,8 @@ cliui@^3.2.0: wrap-ansi "^2.0.0" cliui@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc" + version "4.1.0" + resolved "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" dependencies: string-width "^2.1.1" strip-ansi "^4.0.0" @@ -2609,7 +2623,7 @@ electron-publish@20.9.0: lazy-val "^1.0.3" mime "^2.3.1" -electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.41: +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.42: version "1.3.42" resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9" @@ -2886,8 +2900,8 @@ eslint-plugin-promise@^3.7.0: resolved "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.7.0.tgz#f4bde5c2c77cdd69557a8f69a24d1ad3cfc9e67e" eslint-plugin-standard@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2" + version "3.1.0" + resolved "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz#2a9e21259ba4c47c02d53b2d0c9135d4b1022d47" eslint-scope@^3.7.1, eslint-scope@~3.7.1: version "3.7.1" @@ -2944,8 +2958,8 @@ eslint@^4.19.0, eslint@^4.19.1: text-table "~0.2.0" esm@^3.0.20: - version "3.0.20" - resolved "https://registry.npmjs.org/esm/-/esm-3.0.20.tgz#6659d3c3ed0342354e7f1eaf6204a01083781426" + version "3.0.26" + resolved "https://registry.npmjs.org/esm/-/esm-3.0.26.tgz#9c1bea4ea53fa8cebcf023792668be79da883e1d" espree@^3.5.4: version "3.5.4" @@ -3007,6 +3021,10 @@ eventemitter3@1.x.x: version "1.2.0" resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508" +eventemitter3@^3.0.0: + version "3.0.1" + resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.1.tgz#4ce66c3fc5b5a6b9f2245e359e1938f1ab10f960" + events@^1.0.0: version "1.1.1" resolved "https://registry.npmjs.org/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" @@ -3051,10 +3069,10 @@ exiftool-vendored.pl@10.93.0: resolved "https://registry.npmjs.org/exiftool-vendored.pl/-/exiftool-vendored.pl-10.93.0.tgz#0afed2060fc1f69f3b5b137b2d2577e8991f7bee" exiftool-vendored@^4.20.0: - version "4.22.0" - resolved "https://registry.npmjs.org/exiftool-vendored/-/exiftool-vendored-4.22.0.tgz#fc404a7440b73c0888c4ba2d9df0c2be1ee63eee" + version "4.22.1" + resolved "https://registry.npmjs.org/exiftool-vendored/-/exiftool-vendored-4.22.1.tgz#9c03cbd4863b8764609f66652fedb51550454655" dependencies: - batch-cluster "^2.0.0" + batch-cluster "^2.1.0" optionalDependencies: exiftool-vendored.exe "10.93.0" exiftool-vendored.pl "10.93.0" @@ -3373,6 +3391,12 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" +follow-redirects@^1.0.0: + version "1.4.1" + resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz#d8120f4518190f55aac65bb6fc7b85fcd666d6aa" + dependencies: + debug "^3.1.0" + for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -3466,8 +3490,8 @@ fs.realpath@^1.0.0: resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.1.1, fsevents@^1.1.2: - version "1.2.0" - resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.2.0.tgz#e11a5ff285471e4cc43ab9cd09bb7986c565dcdc" + version "1.2.2" + resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.2.2.tgz#4f598f0f69b273188ef4a62ca4e9e08ace314bbf" dependencies: nan "^2.9.2" node-pre-gyp "^0.9.0" @@ -3903,8 +3927,8 @@ http-errors@~1.6.2: statuses ">= 1.4.0 < 2" http-parser-js@>=0.4.0: - version "0.4.11" - resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz#5b720849c650903c27e521633d94696ee95f3529" + version "0.4.12" + resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.12.tgz#b9cfbf4a2cf26f0fc34b10ca1489a27771e3474f" http-proxy-middleware@~0.17.4: version "0.17.4" @@ -3916,11 +3940,12 @@ http-proxy-middleware@~0.17.4: micromatch "^2.3.11" http-proxy@^1.16.2: - version "1.16.2" - resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742" + version "1.17.0" + resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a" dependencies: - eventemitter3 "1.x.x" - requires-port "1.x.x" + eventemitter3 "^3.0.0" + follow-redirects "^1.0.0" + requires-port "^1.0.0" http-proxy@~1.11.1: version "1.11.3" @@ -4892,8 +4917,8 @@ jsbn@~0.1.0: resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" jsdom@^11.5.1: - version "11.8.0" - resolved "https://registry.npmjs.org/jsdom/-/jsdom-11.8.0.tgz#a52e9a7d2b931284f62c80dad5f17d7390499d8b" + version "11.9.0" + resolved "https://registry.npmjs.org/jsdom/-/jsdom-11.9.0.tgz#58ac6dfd248d560d736b0202d74eedad55590cd9" dependencies: abab "^1.0.4" acorn "^5.3.0" @@ -5178,8 +5203,8 @@ lodash.uniq@^4.5.0: resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" "lodash@>=3.5 <5", lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0: - version "4.17.5" - resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" + version "4.17.10" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" loglevel@^1.4.1: version "1.6.1" @@ -6918,7 +6943,7 @@ requires-port@0.x.x: version "0.0.1" resolved "https://registry.npmjs.org/requires-port/-/requires-port-0.0.1.tgz#4b4414411d9df7c855995dd899a8c78a2951c16d" -requires-port@1.0.x, requires-port@1.x.x, requires-port@^1.0.0: +requires-port@1.0.x, requires-port@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -7320,9 +7345,10 @@ source-map-support@^0.4.15: source-map "^0.5.6" source-map-support@^0.5.0, source-map-support@^0.5.4: - version "0.5.4" - resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz#54456efa89caa9270af7cd624cc2f123e51fbae8" + version "0.5.5" + resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.5.tgz#0d4af9e00493e855402e8ec36ebed2d266fceb90" dependencies: + buffer-from "^1.0.0" source-map "^0.6.0" source-map-url@^0.4.0: @@ -7544,9 +7570,9 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -style-loader@^0.20.3: - version "0.20.3" - resolved "https://registry.npmjs.org/style-loader/-/style-loader-0.20.3.tgz#ebef06b89dec491bcb1fdb3452e913a6fd1c10c4" +style-loader@^0.21.0: + version "0.21.0" + resolved "https://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852" dependencies: loader-utils "^1.1.0" schema-utils "^0.4.5" @@ -7811,7 +7837,7 @@ tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.3: dependencies: punycode "^1.4.1" -tr46@^1.0.0: +tr46@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" dependencies: @@ -7874,8 +7900,8 @@ uglify-es@^3.3.9: source-map "~0.6.1" uglify-js@3.3.x: - version "3.3.21" - resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.21.tgz#851a34cbb31840ecb881968ed07dd3a61e7264a0" + version "3.3.22" + resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.22.tgz#e5f0e50ddd386b7e35b728b51600bf7a7ad0b0dc" dependencies: commander "~2.15.0" source-map "~0.6.1" @@ -8178,7 +8204,7 @@ wbuf@^1.1.0, wbuf@^1.7.2: dependencies: minimalistic-assert "^1.0.0" -webidl-conversions@^4.0.1, webidl-conversions@^4.0.2: +webidl-conversions@^4.0.2: version "4.0.2" resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" @@ -8291,12 +8317,12 @@ whatwg-mimetype@^2.0.0, whatwg-mimetype@^2.1.0: resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz#f0f21d76cbba72362eb609dbed2a30cd17fcc7d4" whatwg-url@^6.4.0: - version "6.4.0" - resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.0.tgz#08fdf2b9e872783a7a1f6216260a1d66cc722e08" + version "6.4.1" + resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz#fdb94b440fd4ad836202c16e9737d511f012fd67" dependencies: lodash.sortby "^4.7.0" - tr46 "^1.0.0" - webidl-conversions "^4.0.1" + tr46 "^1.0.1" + webidl-conversions "^4.0.2" whet.extend@~0.9.9: version "0.9.9"