From 919d1c9590c6f508721f17850c3da5ee16b2b4bc Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 30 Jun 2020 18:11:00 -0700 Subject: [PATCH 1/3] Updated all server side errors due to missing packages --- package-lock.json | 754 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 754 insertions(+) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..a17df53 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,754 @@ +{ + "requires": true, + "lockfileVersion": 1, + "dependencies": { + "@babel/runtime": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.4.tgz", + "integrity": "sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" + }, + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "requires": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + } + } + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "bcrypt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.0.tgz", + "integrity": "sha512-jB0yCBl4W/kVHM2whjfyqnxTmOHkCX4kHEa5nYKSoGeYe8YrjTYTc87/6bwt1g8cmV0QrbhKriETg9jWtcREhg==", + "requires": { + "node-addon-api": "^3.0.0", + "node-pre-gyp": "0.15.0" + } + }, + "body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "requires": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + }, + "core-js": { + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + }, + "domready": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/domready/-/domready-1.0.8.tgz", + "integrity": "sha1-kfJS5Ze2Wvd+dFriTdAYXV4m1Yw=" + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "fs-minipass": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "requires": { + "minipass": "^2.6.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "griddle-react": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/griddle-react/-/griddle-react-0.3.1.tgz", + "integrity": "sha1-jP4ze6p432AyIPTnVtEcB7fWvh0=" + }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, + "http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + } + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore-walk": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", + "requires": { + "minimatch": "^3.0.4" + } + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" + }, + "mime-db": { + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==" + }, + "mime-types": { + "version": "2.1.27", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", + "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", + "requires": { + "mime-db": "1.44.0" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "minipass": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", + "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", + "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", + "requires": { + "minipass": "^2.9.0" + } + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "requires": { + "minimist": "^1.2.5" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "needle": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.0.tgz", + "integrity": "sha512-o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA==", + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, + "node-addon-api": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.0.tgz", + "integrity": "sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg==" + }, + "node-pre-gyp": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz", + "integrity": "sha512-7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA==", + "requires": { + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.3", + "needle": "^2.5.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4.4.2" + } + }, + "nopt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", + "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, + "npm-bundled": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", + "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==" + }, + "npm-packlist": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", + "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1", + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "requires": { + "ee-first": "1.1.1" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + }, + "raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "requires": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "requires": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + } + }, + "react": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz", + "integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==", + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2" + } + }, + "react-disqus-thread": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/react-disqus-thread/-/react-disqus-thread-0.3.1.tgz", + "integrity": "sha1-OinGGwrLkkj/EZBmmqJfTQcZTvA=" + }, + "react-dom": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz", + "integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==", + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.19.1" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + }, + "react-mounter": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/react-mounter/-/react-mounter-1.2.0.tgz", + "integrity": "sha1-Yjo6Ad/XePpxPr013YX9MeVcFCQ=", + "requires": { + "babel-runtime": "6.x.x", + "domready": "1.x.x" + } + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "requires": { + "glob": "^7.1.3" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, + "scheduler": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + }, + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + }, + "tar": { + "version": "4.4.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", + "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + } + }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" + }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } + }, + "underscore": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz", + "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==" + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "requires": { + "string-width": "^1.0.2 || 2" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + } + } +} From e7d28a2260da860680afec6d2cac48115a9bc0c5 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 30 Jun 2020 23:49:58 -0700 Subject: [PATCH 2/3] Replaced React.createClass with createReactClass Searched and replaced React.createClass --- .meteor/packages | 2 +- .meteor/versions | 1 - client/lib/react.js | 7 +- .../admin/components/AdminUserPurchases.jsx | 2 +- client/react/admin/components/CreatedAt.jsx | 2 +- client/react/admin/components/Enrolled.jsx | 2 +- client/react/admin/components/PurchaseId.jsx | 2 +- client/react/admin/components/UserId.jsx | 2 +- client/react/admin/components/Username.jsx | 2 +- client/react/admin/layouts/AdminLayout.jsx | 2 +- .../react/admin/pages/AdminPurchasePage.jsx | 2 +- .../react/admin/pages/AdminPurchasesPage.jsx | 2 +- client/react/admin/pages/AdminUsersPage.jsx | 2 +- client/react/app.jsx | 2 +- client/react/chapters/components/Chapter.jsx | 2 +- .../react/chapters/components/ChapterNav.jsx | 2 +- .../react/chapters/components/ChaptersTOC.jsx | 2 +- client/react/chapters/components/Comments.jsx | 2 +- client/react/chapters/components/Photo.jsx | 2 +- .../chapters/components/ShareProgress.jsx | 2 +- client/react/chapters/components/Sidebars.jsx | 2 +- .../react/chapters/components/Vocabulary.jsx | 2 +- client/react/chapters/containers/Upgrade.jsx | 2 +- .../react/chapters/layouts/ChapterLayout.jsx | 2 +- client/react/chapters/pages/ChapterPage.jsx | 2 +- client/react/common/components/FormFooter.jsx | 2 +- .../common/components/PhotoBackground.jsx | 2 +- client/react/common/components/Purchase.jsx | 2 +- client/react/common/layouts/FormLayout.jsx | 2 +- client/react/common/layouts/Layout.jsx | 2 +- client/react/common/pages/ChangelogPage.jsx | 2 +- client/react/common/pages/HomePage.jsx | 2 +- client/react/common/pages/NoRightsPage.jsx | 2 +- client/react/common/pages/StarterPage.jsx | 2 +- client/react/interviews/Interview.jsx | 2 +- client/react/interviews/InterviewPage.jsx | 2 +- .../react/users/components/EmailLoginForm.jsx | 2 +- client/react/users/components/FormWrapper.jsx | 2 +- .../users/components/MeteorLoginForm.jsx | 2 +- client/react/users/components/Profile.jsx | 2 +- client/react/users/containers/Flash.jsx | 2 +- .../react/users/containers/UserPurchases.jsx | 2 +- client/react/users/pages/ChangeEmailPage.jsx | 2 +- client/react/users/pages/FinishSignupPage.jsx | 2 +- .../react/users/pages/ForgotPasswordPage.jsx | 2 +- client/react/users/pages/LoginPage.jsx | 2 +- client/react/users/pages/ProfilePage.jsx | 2 +- .../react/users/pages/ResetPasswordPage.jsx | 2 +- client/react/videos/Video.jsx | 2 +- client/react/videos/VideoPage.jsx | 2 +- package-lock.json | 90 +++++++++++++++++++ package.json | 1 + 52 files changed, 145 insertions(+), 50 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 95642c0..04d27a1 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -71,5 +71,5 @@ react-meteor-data jsx react-template-helper -utilities:meteor-griddle +# utilities:meteor-griddle # static-html \ No newline at end of file diff --git a/.meteor/versions b/.meteor/versions index ec42bde..1a8d01a 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -143,7 +143,6 @@ tracker@1.2.0 ui@1.0.13 underscore@1.0.10 url@1.3.1 -utilities:meteor-griddle@1.2.2 webapp@1.9.1 webapp-hashing@1.0.9 zimme:active-route@2.3.2 diff --git a/client/lib/react.js b/client/lib/react.js index 71d2627..3d5925f 100644 --- a/client/lib/react.js +++ b/client/lib/react.js @@ -1,3 +1,8 @@ // Temporary file until the new react-runtime does this for us import React from 'react'; -window.React = React; +window.React = React; + +//We need this npm package to replace React.createReactClass +import createReactClass from 'create-react-class'; + +console.log("react.js file was loaded 🎉", createReactClass); \ No newline at end of file diff --git a/client/react/admin/components/AdminUserPurchases.jsx b/client/react/admin/components/AdminUserPurchases.jsx index 7643de9..2ad6cdc 100644 --- a/client/react/admin/components/AdminUserPurchases.jsx +++ b/client/react/admin/components/AdminUserPurchases.jsx @@ -1,4 +1,4 @@ -AdminUserPurchases = React.createClass({ +AdminUserPurchases = createReactClass({ render() { return } diff --git a/client/react/admin/components/CreatedAt.jsx b/client/react/admin/components/CreatedAt.jsx index 27dc4ff..e8bce82 100644 --- a/client/react/admin/components/CreatedAt.jsx +++ b/client/react/admin/components/CreatedAt.jsx @@ -1,4 +1,4 @@ -CreatedAt = React.createClass({ +CreatedAt = createReactClass({ render: function(){ return ( {moment(this.props.rowData.createdAt).fromNow()} diff --git a/client/react/admin/components/Enrolled.jsx b/client/react/admin/components/Enrolled.jsx index ea50020..a6f0b31 100644 --- a/client/react/admin/components/Enrolled.jsx +++ b/client/react/admin/components/Enrolled.jsx @@ -1,4 +1,4 @@ -Enrolled = React.createClass({ +Enrolled = createReactClass({ render: function(){ var user = Meteor.users._transform(this.props.rowData); if (user.enrollMethod() === "pending") { diff --git a/client/react/admin/components/PurchaseId.jsx b/client/react/admin/components/PurchaseId.jsx index 35c719d..c469687 100644 --- a/client/react/admin/components/PurchaseId.jsx +++ b/client/react/admin/components/PurchaseId.jsx @@ -1,4 +1,4 @@ -PurchaseId = React.createClass({ +PurchaseId = createReactClass({ render() { return ( {this.props.rowData._id} diff --git a/client/react/admin/components/UserId.jsx b/client/react/admin/components/UserId.jsx index 1e6e392..14ff56e 100644 --- a/client/react/admin/components/UserId.jsx +++ b/client/react/admin/components/UserId.jsx @@ -1,4 +1,4 @@ -UserId = React.createClass({ +UserId = createReactClass({ render() { return ( {this.props.rowData._id} diff --git a/client/react/admin/components/Username.jsx b/client/react/admin/components/Username.jsx index eb2eb8c..b38650b 100644 --- a/client/react/admin/components/Username.jsx +++ b/client/react/admin/components/Username.jsx @@ -1,4 +1,4 @@ -Username = React.createClass({ +Username = createReactClass({ render: function(){ var user = Meteor.users._transform(this.props.rowData); return {user.getUsername()} diff --git a/client/react/admin/layouts/AdminLayout.jsx b/client/react/admin/layouts/AdminLayout.jsx index 53c9114..cc218b8 100644 --- a/client/react/admin/layouts/AdminLayout.jsx +++ b/client/react/admin/layouts/AdminLayout.jsx @@ -1,4 +1,4 @@ -AdminLayout = React.createClass({ +AdminLayout = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/admin/pages/AdminPurchasePage.jsx b/client/react/admin/pages/AdminPurchasePage.jsx index 9d245ae..b67798c 100644 --- a/client/react/admin/pages/AdminPurchasePage.jsx +++ b/client/react/admin/pages/AdminPurchasePage.jsx @@ -1,4 +1,4 @@ -AdminPurchasePage = React.createClass({ +AdminPurchasePage = createReactClass({ propTypes: { purchaseId: React.PropTypes.string.isRequired diff --git a/client/react/admin/pages/AdminPurchasesPage.jsx b/client/react/admin/pages/AdminPurchasesPage.jsx index fd431f1..9b7cc4b 100644 --- a/client/react/admin/pages/AdminPurchasesPage.jsx +++ b/client/react/admin/pages/AdminPurchasesPage.jsx @@ -1,4 +1,4 @@ -AdminPurchasesPage = React.createClass({ +AdminPurchasesPage = createReactClass({ render() { diff --git a/client/react/admin/pages/AdminUsersPage.jsx b/client/react/admin/pages/AdminUsersPage.jsx index 3aaf7d3..dd181e1 100644 --- a/client/react/admin/pages/AdminUsersPage.jsx +++ b/client/react/admin/pages/AdminUsersPage.jsx @@ -1,4 +1,4 @@ -AdminUsersPage = React.createClass({ +AdminUsersPage = createReactClass({ render() { diff --git a/client/react/app.jsx b/client/react/app.jsx index 293c1cc..69e758f 100644 --- a/client/react/app.jsx +++ b/client/react/app.jsx @@ -1,4 +1,4 @@ -App = React.createClass({ +App = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/chapters/components/Chapter.jsx b/client/react/chapters/components/Chapter.jsx index fbc6bb3..242c665 100644 --- a/client/react/chapters/components/Chapter.jsx +++ b/client/react/chapters/components/Chapter.jsx @@ -1,4 +1,4 @@ -Chapter = React.createClass({ +Chapter = createReactClass({ propTypes: { chapter: React.PropTypes.object.isRequired diff --git a/client/react/chapters/components/ChapterNav.jsx b/client/react/chapters/components/ChapterNav.jsx index e23806c..7500f2a 100644 --- a/client/react/chapters/components/ChapterNav.jsx +++ b/client/react/chapters/components/ChapterNav.jsx @@ -1,4 +1,4 @@ -ChapterNav = React.createClass({ +ChapterNav = createReactClass({ propTypes: { chapter: React.PropTypes.object.isRequired diff --git a/client/react/chapters/components/ChaptersTOC.jsx b/client/react/chapters/components/ChaptersTOC.jsx index 1b31641..349a961 100644 --- a/client/react/chapters/components/ChaptersTOC.jsx +++ b/client/react/chapters/components/ChaptersTOC.jsx @@ -1,4 +1,4 @@ -ChaptersTOC = React.createClass({ +ChaptersTOC = createReactClass({ propTypes: { chapter: React.PropTypes.object.isRequired, diff --git a/client/react/chapters/components/Comments.jsx b/client/react/chapters/components/Comments.jsx index fb90d03..9dd8d74 100644 --- a/client/react/chapters/components/Comments.jsx +++ b/client/react/chapters/components/Comments.jsx @@ -2,7 +2,7 @@ var ReactDisqusThread = require('react-disqus-thread'); var disqus_shortname = 'themeteorbook'; // required: replace example with your forum shortname -Comments = React.createClass({ +Comments = createReactClass({ propTypes: { chapter: React.PropTypes.object.isRequired, diff --git a/client/react/chapters/components/Photo.jsx b/client/react/chapters/components/Photo.jsx index 1e25112..18b5aab 100644 --- a/client/react/chapters/components/Photo.jsx +++ b/client/react/chapters/components/Photo.jsx @@ -4,7 +4,7 @@ $.easing.easeOutQuad = function (x, t, b, c, d) { return -c *(t/=d)*(t-2) + b; } -Photo = React.createClass({ +Photo = createReactClass({ propTypes: { chapter: React.PropTypes.object.isRequired, diff --git a/client/react/chapters/components/ShareProgress.jsx b/client/react/chapters/components/ShareProgress.jsx index 0af4d88..6c841e8 100644 --- a/client/react/chapters/components/ShareProgress.jsx +++ b/client/react/chapters/components/ShareProgress.jsx @@ -8,7 +8,7 @@ var getVerb = function (chapterNumber) { return verbs[vindex]; }; -ShareProgress = React.createClass({ +ShareProgress = createReactClass({ propTypes: { chapter: React.PropTypes.object.isRequired diff --git a/client/react/chapters/components/Sidebars.jsx b/client/react/chapters/components/Sidebars.jsx index c8e7cc4..6e99792 100644 --- a/client/react/chapters/components/Sidebars.jsx +++ b/client/react/chapters/components/Sidebars.jsx @@ -1,4 +1,4 @@ -Sidebars = React.createClass({ +Sidebars = createReactClass({ propTypes: { chapter: React.PropTypes.object.isRequired, diff --git a/client/react/chapters/components/Vocabulary.jsx b/client/react/chapters/components/Vocabulary.jsx index 0a5dfa1..264fc80 100644 --- a/client/react/chapters/components/Vocabulary.jsx +++ b/client/react/chapters/components/Vocabulary.jsx @@ -1,4 +1,4 @@ -Vocabulary = React.createClass({ +Vocabulary = createReactClass({ propTypes: { vocabularyChapter: React.PropTypes.object.isRequired diff --git a/client/react/chapters/containers/Upgrade.jsx b/client/react/chapters/containers/Upgrade.jsx index 81b3268..311d72f 100644 --- a/client/react/chapters/containers/Upgrade.jsx +++ b/client/react/chapters/containers/Upgrade.jsx @@ -1,4 +1,4 @@ -Upgrade = React.createClass({ +Upgrade = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/chapters/layouts/ChapterLayout.jsx b/client/react/chapters/layouts/ChapterLayout.jsx index 228ccd1..5fd0336 100644 --- a/client/react/chapters/layouts/ChapterLayout.jsx +++ b/client/react/chapters/layouts/ChapterLayout.jsx @@ -1,4 +1,4 @@ -ChapterLayout = React.createClass({ +ChapterLayout = createReactClass({ propTypes: { chapter: React.PropTypes.object.isRequired, diff --git a/client/react/chapters/pages/ChapterPage.jsx b/client/react/chapters/pages/ChapterPage.jsx index 296cb91..0259b09 100644 --- a/client/react/chapters/pages/ChapterPage.jsx +++ b/client/react/chapters/pages/ChapterPage.jsx @@ -1,4 +1,4 @@ -ChapterPage = React.createClass({ +ChapterPage = createReactClass({ propTypes: { slug: React.PropTypes.string.isRequired diff --git a/client/react/common/components/FormFooter.jsx b/client/react/common/components/FormFooter.jsx index b6efa79..aa83e37 100644 --- a/client/react/common/components/FormFooter.jsx +++ b/client/react/common/components/FormFooter.jsx @@ -1,4 +1,4 @@ -FormFooter = React.createClass({ +FormFooter = createReactClass({ render() { return ( diff --git a/client/react/common/components/PhotoBackground.jsx b/client/react/common/components/PhotoBackground.jsx index a8a1a5f..88a010f 100644 --- a/client/react/common/components/PhotoBackground.jsx +++ b/client/react/common/components/PhotoBackground.jsx @@ -1,4 +1,4 @@ -PhotoBackground = React.createClass({ +PhotoBackground = createReactClass({ propTypes: { chapter: React.PropTypes.object.isRequired diff --git a/client/react/common/components/Purchase.jsx b/client/react/common/components/Purchase.jsx index 79c61ab..6918215 100644 --- a/client/react/common/components/Purchase.jsx +++ b/client/react/common/components/Purchase.jsx @@ -1,4 +1,4 @@ -Purchase = React.createClass({ +Purchase = createReactClass({ propTypes: { product: React.PropTypes.object.isRequired, diff --git a/client/react/common/layouts/FormLayout.jsx b/client/react/common/layouts/FormLayout.jsx index 359757f..0f7e8a6 100644 --- a/client/react/common/layouts/FormLayout.jsx +++ b/client/react/common/layouts/FormLayout.jsx @@ -1,4 +1,4 @@ -FormLayout = React.createClass({ +FormLayout = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/common/layouts/Layout.jsx b/client/react/common/layouts/Layout.jsx index becd281..859281b 100644 --- a/client/react/common/layouts/Layout.jsx +++ b/client/react/common/layouts/Layout.jsx @@ -1,4 +1,4 @@ -Layout = React.createClass({ +Layout = createReactClass({ render() { return ( diff --git a/client/react/common/pages/ChangelogPage.jsx b/client/react/common/pages/ChangelogPage.jsx index 1d8d6a1..924524b 100644 --- a/client/react/common/pages/ChangelogPage.jsx +++ b/client/react/common/pages/ChangelogPage.jsx @@ -1,4 +1,4 @@ -ChangelogPage = React.createClass({ +ChangelogPage = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/common/pages/HomePage.jsx b/client/react/common/pages/HomePage.jsx index 41f9506..ba90baa 100644 --- a/client/react/common/pages/HomePage.jsx +++ b/client/react/common/pages/HomePage.jsx @@ -1,4 +1,4 @@ -HomePage = React.createClass({ +HomePage = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/common/pages/NoRightsPage.jsx b/client/react/common/pages/NoRightsPage.jsx index 000b916..57887c5 100644 --- a/client/react/common/pages/NoRightsPage.jsx +++ b/client/react/common/pages/NoRightsPage.jsx @@ -1,4 +1,4 @@ -NoRightsPage = React.createClass({ +NoRightsPage = createReactClass({ render() { return

Sorry, you don't have the rights to view this page.

 diff --git a/client/react/common/pages/StarterPage.jsx b/client/react/common/pages/StarterPage.jsx index 28b616c..6055943 100644 --- a/client/react/common/pages/StarterPage.jsx +++ b/client/react/common/pages/StarterPage.jsx @@ -1,4 +1,4 @@ -StarterPage = React.createClass({ +StarterPage = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/interviews/Interview.jsx b/client/react/interviews/Interview.jsx index 8c9cfca..07e0b8a 100644 --- a/client/react/interviews/Interview.jsx +++ b/client/react/interviews/Interview.jsx @@ -1,4 +1,4 @@ -Interview = React.createClass({ +Interview = createReactClass({ propTypes: { interview: React.PropTypes.object.isRequired diff --git a/client/react/interviews/InterviewPage.jsx b/client/react/interviews/InterviewPage.jsx index b1fabe1..df5dd78 100644 --- a/client/react/interviews/InterviewPage.jsx +++ b/client/react/interviews/InterviewPage.jsx @@ -1,4 +1,4 @@ -InterviewPage = React.createClass({ +InterviewPage = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/users/components/EmailLoginForm.jsx b/client/react/users/components/EmailLoginForm.jsx index 5b67c24..e8f113d 100644 --- a/client/react/users/components/EmailLoginForm.jsx +++ b/client/react/users/components/EmailLoginForm.jsx @@ -1,4 +1,4 @@ -EmailLoginForm = React.createClass({ +EmailLoginForm = createReactClass({ handleSubmit(event) { event.preventDefault(); diff --git a/client/react/users/components/FormWrapper.jsx b/client/react/users/components/FormWrapper.jsx index c568b47..172725d 100644 --- a/client/react/users/components/FormWrapper.jsx +++ b/client/react/users/components/FormWrapper.jsx @@ -1,4 +1,4 @@ -FormWrapper = React.createClass({ +FormWrapper = createReactClass({ render() { return ( diff --git a/client/react/users/components/MeteorLoginForm.jsx b/client/react/users/components/MeteorLoginForm.jsx index 152168a..96385b7 100644 --- a/client/react/users/components/MeteorLoginForm.jsx +++ b/client/react/users/components/MeteorLoginForm.jsx @@ -1,4 +1,4 @@ -MeteorLoginForm = React.createClass({ +MeteorLoginForm = createReactClass({ handleSubmit(event) { event.preventDefault(); diff --git a/client/react/users/components/Profile.jsx b/client/react/users/components/Profile.jsx index dfba1c0..31a3327 100644 --- a/client/react/users/components/Profile.jsx +++ b/client/react/users/components/Profile.jsx @@ -1,4 +1,4 @@ -Profile = React.createClass({ +Profile = createReactClass({ propTypes: { user: React.PropTypes.object.isRequired, diff --git a/client/react/users/containers/Flash.jsx b/client/react/users/containers/Flash.jsx index d74c86a..01e8e2c 100644 --- a/client/react/users/containers/Flash.jsx +++ b/client/react/users/containers/Flash.jsx @@ -1,4 +1,4 @@ -Flash = React.createClass({ +Flash = createReactClass({ propTypes: { message: React.PropTypes.string, diff --git a/client/react/users/containers/UserPurchases.jsx b/client/react/users/containers/UserPurchases.jsx index 2dbb3ef..d422540 100644 --- a/client/react/users/containers/UserPurchases.jsx +++ b/client/react/users/containers/UserPurchases.jsx @@ -1,6 +1,6 @@ import Griddle from "griddle-react"; -UserPurchases = React.createClass({ +UserPurchases = createReactClass({ propTypes: { userId: React.PropTypes.string.isRequired, diff --git a/client/react/users/pages/ChangeEmailPage.jsx b/client/react/users/pages/ChangeEmailPage.jsx index 30ff040..d7cf271 100644 --- a/client/react/users/pages/ChangeEmailPage.jsx +++ b/client/react/users/pages/ChangeEmailPage.jsx @@ -1,4 +1,4 @@ -ChangeEmailPage = React.createClass({ +ChangeEmailPage = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/users/pages/FinishSignupPage.jsx b/client/react/users/pages/FinishSignupPage.jsx index d3fb969..0b4908e 100644 --- a/client/react/users/pages/FinishSignupPage.jsx +++ b/client/react/users/pages/FinishSignupPage.jsx @@ -1,4 +1,4 @@ -FinishSignupPage = React.createClass({ +FinishSignupPage = createReactClass({ getInitialState() { return { diff --git a/client/react/users/pages/ForgotPasswordPage.jsx b/client/react/users/pages/ForgotPasswordPage.jsx index 40558ab..03f2afc 100644 --- a/client/react/users/pages/ForgotPasswordPage.jsx +++ b/client/react/users/pages/ForgotPasswordPage.jsx @@ -1,4 +1,4 @@ -ForgotPasswordPage = React.createClass({ +ForgotPasswordPage = createReactClass({ handleSubmit(event) { event.preventDefault(); diff --git a/client/react/users/pages/LoginPage.jsx b/client/react/users/pages/LoginPage.jsx index e2158cc..19d208c 100644 --- a/client/react/users/pages/LoginPage.jsx +++ b/client/react/users/pages/LoginPage.jsx @@ -1,4 +1,4 @@ -LoginPage = React.createClass({ +LoginPage = createReactClass({ render() { return ( diff --git a/client/react/users/pages/ProfilePage.jsx b/client/react/users/pages/ProfilePage.jsx index 7f749b9..aed9c5a 100644 --- a/client/react/users/pages/ProfilePage.jsx +++ b/client/react/users/pages/ProfilePage.jsx @@ -1,4 +1,4 @@ -ProfilePage = React.createClass({ +ProfilePage = createReactClass({ propTypes: { _id: React.PropTypes.string // user ID diff --git a/client/react/users/pages/ResetPasswordPage.jsx b/client/react/users/pages/ResetPasswordPage.jsx index 8213664..1c0f6d8 100644 --- a/client/react/users/pages/ResetPasswordPage.jsx +++ b/client/react/users/pages/ResetPasswordPage.jsx @@ -1,4 +1,4 @@ -ResetPasswordPage = React.createClass({ +ResetPasswordPage = createReactClass({ resetPassword(event) { event.preventDefault(); diff --git a/client/react/videos/Video.jsx b/client/react/videos/Video.jsx index 82e8bcd..6789e0c 100644 --- a/client/react/videos/Video.jsx +++ b/client/react/videos/Video.jsx @@ -1,4 +1,4 @@ -Video = React.createClass({ +Video = createReactClass({ propTypes: { video: React.PropTypes.object.isRequired diff --git a/client/react/videos/VideoPage.jsx b/client/react/videos/VideoPage.jsx index c6a86aa..bdd3732 100644 --- a/client/react/videos/VideoPage.jsx +++ b/client/react/videos/VideoPage.jsx @@ -1,4 +1,4 @@ -VideoPage = React.createClass({ +VideoPage = createReactClass({ mixins: [ReactMeteorData], diff --git a/package-lock.json b/package-lock.json index a17df53..8b0bef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,6 +34,11 @@ "readable-stream": "^2.0.6" } }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, "babel-runtime": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", @@ -145,6 +150,16 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "create-react-class": { + "version": "15.6.3", + "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz", + "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==", + "requires": { + "fbjs": "^0.8.9", + "loose-envify": "^1.3.1", + "object-assign": "^4.1.1" + } + }, "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", @@ -183,6 +198,35 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, + "encoding": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "requires": { + "iconv-lite": "~0.4.13" + } + }, + "fbjs": { + "version": "0.8.17", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", + "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", + "requires": { + "core-js": "^1.0.0", + "isomorphic-fetch": "^2.1.1", + "loose-envify": "^1.0.0", + "object-assign": "^4.1.0", + "promise": "^7.1.1", + "setimmediate": "^1.0.5", + "ua-parser-js": "^0.7.18" + }, + "dependencies": { + "core-js": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" + } + } + }, "fs-minipass": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", @@ -296,11 +340,25 @@ "number-is-nan": "^1.0.0" } }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, + "isomorphic-fetch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", + "requires": { + "node-fetch": "^1.0.1", + "whatwg-fetch": ">=0.10.0" + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -390,6 +448,15 @@ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.0.tgz", "integrity": "sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg==" }, + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { + "encoding": "^0.1.11", + "is-stream": "^1.0.1" + } + }, "node-pre-gyp": { "version": "0.15.0", "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz", @@ -505,6 +572,14 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "requires": { + "asap": "~2.0.3" + } + }, "prop-types": { "version": "15.7.2", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", @@ -643,6 +718,11 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + }, "setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", @@ -717,6 +797,11 @@ "mime-types": "~2.1.24" } }, + "ua-parser-js": { + "version": "0.7.21", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz", + "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==" + }, "underscore": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz", @@ -732,6 +817,11 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, + "whatwg-fetch": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.1.0.tgz", + "integrity": "sha512-pgmbsVWKpH9GxLXZmtdowDIqtb/rvPyjjQv3z9wLcmgWKFHilKnZD3ldgrOlwJoPGOUluQsRPWd52yVkPfmI1A==" + }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", diff --git a/package.json b/package.json index 4bb94fb..6278b37 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "@babel/runtime": "^7.10.4", "bcrypt": "^5.0.0", "body-parser": "^1.19.0", + "create-react-class": "^15.6.3", "griddle-react": "^0.3.1", "meteor-node-stubs": "^1.0.0", "react": "^16.13.1", From 508747e3f549c28d04096b010864e635eda016a0 Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 1 Jul 2020 01:37:16 -0700 Subject: [PATCH 3/3] added imports for createReactClass and PropTypes Added all needed import statements import createReactClass from 'create-react-class'; import PropTypes from 'prop-types'; --- client/lib/react.js | 4 +- .../admin/components/AdminUserPurchases.jsx | 2 + client/react/admin/components/CreatedAt.jsx | 2 + client/react/admin/components/Enrolled.jsx | 2 + client/react/admin/components/PurchaseId.jsx | 2 + client/react/admin/components/UserId.jsx | 2 + client/react/admin/components/Username.jsx | 2 + client/react/admin/layouts/AdminLayout.jsx | 2 + .../react/admin/pages/AdminPurchasePage.jsx | 5 +- .../react/admin/pages/AdminPurchasesPage.jsx | 4 + client/react/admin/pages/AdminUsersPage.jsx | 4 + client/react/app.jsx | 2 + client/react/chapters/components/Chapter.jsx | 5 +- .../react/chapters/components/ChapterNav.jsx | 5 +- .../react/chapters/components/ChaptersTOC.jsx | 7 +- client/react/chapters/components/Comments.jsx | 12 +- client/react/chapters/components/Photo.jsx | 7 +- .../chapters/components/ShareProgress.jsx | 5 +- client/react/chapters/components/Sidebars.jsx | 9 +- .../react/chapters/components/Vocabulary.jsx | 5 +- client/react/chapters/containers/Upgrade.jsx | 2 + .../react/chapters/layouts/ChapterLayout.jsx | 9 +- client/react/chapters/pages/ChapterPage.jsx | 5 +- client/react/common/components/FormFooter.jsx | 2 + .../common/components/PhotoBackground.jsx | 5 +- client/react/common/components/Purchase.jsx | 13 +- client/react/common/layouts/FormLayout.jsx | 2 + client/react/common/layouts/Layout.jsx | 2 + client/react/common/pages/ChangelogPage.jsx | 2 + client/react/common/pages/HomePage.jsx | 2 + client/react/common/pages/NoRightsPage.jsx | 2 + client/react/common/pages/StarterPage.jsx | 2 + client/react/interviews/Interview.jsx | 5 +- client/react/interviews/InterviewPage.jsx | 2 + .../react/users/components/EmailLoginForm.jsx | 2 + client/react/users/components/FormWrapper.jsx | 2 + .../users/components/MeteorLoginForm.jsx | 2 + client/react/users/components/Profile.jsx | 11 +- client/react/users/containers/Flash.jsx | 7 +- .../react/users/containers/UserPurchases.jsx | 10 +- client/react/users/pages/ChangeEmailPage.jsx | 2 + client/react/users/pages/FinishSignupPage.jsx | 2 + .../react/users/pages/ForgotPasswordPage.jsx | 2 + client/react/users/pages/LoginPage.jsx | 2 + client/react/users/pages/ProfilePage.jsx | 5 +- .../react/users/pages/ResetPasswordPage.jsx | 2 + client/react/videos/Video.jsx | 5 +- client/react/videos/VideoPage.jsx | 2 + package-lock.json | 566 +++++++++++++++++- package.json | 2 +- 50 files changed, 721 insertions(+), 46 deletions(-) diff --git a/client/lib/react.js b/client/lib/react.js index 3d5925f..30c8cbd 100644 --- a/client/lib/react.js +++ b/client/lib/react.js @@ -3,6 +3,6 @@ import React from 'react'; window.React = React; //We need this npm package to replace React.createReactClass -import createReactClass from 'create-react-class'; +//import createReactClass from 'create-react-class'; -console.log("react.js file was loaded 🎉", createReactClass); \ No newline at end of file +//console.log("react.js file was loaded 🎉", createReactClass); \ No newline at end of file diff --git a/client/react/admin/components/AdminUserPurchases.jsx b/client/react/admin/components/AdminUserPurchases.jsx index 2ad6cdc..3920ca2 100644 --- a/client/react/admin/components/AdminUserPurchases.jsx +++ b/client/react/admin/components/AdminUserPurchases.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + AdminUserPurchases = createReactClass({ render() { return diff --git a/client/react/admin/components/CreatedAt.jsx b/client/react/admin/components/CreatedAt.jsx index e8bce82..f0dcc45 100644 --- a/client/react/admin/components/CreatedAt.jsx +++ b/client/react/admin/components/CreatedAt.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + CreatedAt = createReactClass({ render: function(){ return ( diff --git a/client/react/admin/components/Enrolled.jsx b/client/react/admin/components/Enrolled.jsx index a6f0b31..a5eca8c 100644 --- a/client/react/admin/components/Enrolled.jsx +++ b/client/react/admin/components/Enrolled.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + Enrolled = createReactClass({ render: function(){ var user = Meteor.users._transform(this.props.rowData); diff --git a/client/react/admin/components/PurchaseId.jsx b/client/react/admin/components/PurchaseId.jsx index c469687..b116736 100644 --- a/client/react/admin/components/PurchaseId.jsx +++ b/client/react/admin/components/PurchaseId.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + PurchaseId = createReactClass({ render() { return ( diff --git a/client/react/admin/components/UserId.jsx b/client/react/admin/components/UserId.jsx index 14ff56e..fec7ca4 100644 --- a/client/react/admin/components/UserId.jsx +++ b/client/react/admin/components/UserId.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + UserId = createReactClass({ render() { return ( diff --git a/client/react/admin/components/Username.jsx b/client/react/admin/components/Username.jsx index b38650b..ebf9319 100644 --- a/client/react/admin/components/Username.jsx +++ b/client/react/admin/components/Username.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + Username = createReactClass({ render: function(){ var user = Meteor.users._transform(this.props.rowData); diff --git a/client/react/admin/layouts/AdminLayout.jsx b/client/react/admin/layouts/AdminLayout.jsx index cc218b8..ce0bda1 100644 --- a/client/react/admin/layouts/AdminLayout.jsx +++ b/client/react/admin/layouts/AdminLayout.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + AdminLayout = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/admin/pages/AdminPurchasePage.jsx b/client/react/admin/pages/AdminPurchasePage.jsx index b67798c..8784c0b 100644 --- a/client/react/admin/pages/AdminPurchasePage.jsx +++ b/client/react/admin/pages/AdminPurchasePage.jsx @@ -1,7 +1,10 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + AdminPurchasePage = createReactClass({ propTypes: { - purchaseId: React.PropTypes.string.isRequired + purchaseId: PropTypes.string.isRequired }, mixins: [ReactMeteorData], diff --git a/client/react/admin/pages/AdminPurchasesPage.jsx b/client/react/admin/pages/AdminPurchasesPage.jsx index 9b7cc4b..cf4849d 100644 --- a/client/react/admin/pages/AdminPurchasesPage.jsx +++ b/client/react/admin/pages/AdminPurchasesPage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + AdminPurchasesPage = createReactClass({ render() { @@ -35,6 +37,7 @@ AdminPurchasesPage = createReactClass({ return ( + {/* + */} ) diff --git a/client/react/admin/pages/AdminUsersPage.jsx b/client/react/admin/pages/AdminUsersPage.jsx index dd181e1..2f5331a 100644 --- a/client/react/admin/pages/AdminUsersPage.jsx +++ b/client/react/admin/pages/AdminUsersPage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + AdminUsersPage = createReactClass({ render() { @@ -38,6 +40,7 @@ AdminUsersPage = createReactClass({ return ( + {/* + */} ) diff --git a/client/react/app.jsx b/client/react/app.jsx index 69e758f..a757e3a 100644 --- a/client/react/app.jsx +++ b/client/react/app.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + App = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/chapters/components/Chapter.jsx b/client/react/chapters/components/Chapter.jsx index 242c665..0e5b54d 100644 --- a/client/react/chapters/components/Chapter.jsx +++ b/client/react/chapters/components/Chapter.jsx @@ -1,7 +1,10 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + Chapter = createReactClass({ propTypes: { - chapter: React.PropTypes.object.isRequired + chapter: PropTypes.object.isRequired }, getChapterContent() { diff --git a/client/react/chapters/components/ChapterNav.jsx b/client/react/chapters/components/ChapterNav.jsx index 7500f2a..52b8802 100644 --- a/client/react/chapters/components/ChapterNav.jsx +++ b/client/react/chapters/components/ChapterNav.jsx @@ -1,7 +1,10 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + ChapterNav = createReactClass({ propTypes: { - chapter: React.PropTypes.object.isRequired + chapter: PropTypes.object.isRequired }, render() { diff --git a/client/react/chapters/components/ChaptersTOC.jsx b/client/react/chapters/components/ChaptersTOC.jsx index 349a961..c571ba4 100644 --- a/client/react/chapters/components/ChaptersTOC.jsx +++ b/client/react/chapters/components/ChaptersTOC.jsx @@ -1,8 +1,11 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + ChaptersTOC = createReactClass({ propTypes: { - chapter: React.PropTypes.object.isRequired, - chapters: React.PropTypes.array.isRequired + chapter: PropTypes.object.isRequired, + chapters: PropTypes.array.isRequired }, renderChapter(chapter, index) { diff --git a/client/react/chapters/components/Comments.jsx b/client/react/chapters/components/Comments.jsx index 9dd8d74..02368fc 100644 --- a/client/react/chapters/components/Comments.jsx +++ b/client/react/chapters/components/Comments.jsx @@ -1,13 +1,15 @@ -var ReactDisqusThread = require('react-disqus-thread'); +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; +//var ReactDisqusThread = require('react-disqus-thread'); var disqus_shortname = 'themeteorbook'; // required: replace example with your forum shortname Comments = createReactClass({ propTypes: { - chapter: React.PropTypes.object.isRequired, - chapters: React.PropTypes.array.isRequired, - vocabularyChapter: React.PropTypes.object + chapter: PropTypes.object.isRequired, + chapters: PropTypes.array.isRequired, + vocabularyChapter: PropTypes.object }, handleToggleClick(event) { @@ -27,12 +29,14 @@ Comments = createReactClass({

Additionally, you can use this area for more general discussion and questions:

+ {/* + */} ); diff --git a/client/react/chapters/components/Photo.jsx b/client/react/chapters/components/Photo.jsx index 18b5aab..c0e1f2b 100644 --- a/client/react/chapters/components/Photo.jsx +++ b/client/react/chapters/components/Photo.jsx @@ -1,3 +1,6 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + var timeout; $.easing.easeOutQuad = function (x, t, b, c, d) { @@ -7,8 +10,8 @@ $.easing.easeOutQuad = function (x, t, b, c, d) { Photo = createReactClass({ propTypes: { - chapter: React.PropTypes.object.isRequired, - chapters: React.PropTypes.array.isRequired + chapter: PropTypes.object.isRequired, + chapters: PropTypes.array.isRequired }, prevChapter() { diff --git a/client/react/chapters/components/ShareProgress.jsx b/client/react/chapters/components/ShareProgress.jsx index 6c841e8..12e2533 100644 --- a/client/react/chapters/components/ShareProgress.jsx +++ b/client/react/chapters/components/ShareProgress.jsx @@ -1,3 +1,6 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + var getVerb = function (chapterNumber) { // pick a verb to introduce a bit of diversity in the prompt. // early chapters have more normal verbs, and it gets more crazy at the end. @@ -11,7 +14,7 @@ var getVerb = function (chapterNumber) { ShareProgress = createReactClass({ propTypes: { - chapter: React.PropTypes.object.isRequired + chapter: PropTypes.object.isRequired }, verb() { diff --git a/client/react/chapters/components/Sidebars.jsx b/client/react/chapters/components/Sidebars.jsx index 6e99792..db22826 100644 --- a/client/react/chapters/components/Sidebars.jsx +++ b/client/react/chapters/components/Sidebars.jsx @@ -1,9 +1,12 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + Sidebars = createReactClass({ propTypes: { - chapter: React.PropTypes.object.isRequired, - chapters: React.PropTypes.array.isRequired, - vocabularyChapter: React.PropTypes.object + chapter: PropTypes.object.isRequired, + chapters: PropTypes.array.isRequired, + vocabularyChapter: PropTypes.object }, render() { diff --git a/client/react/chapters/components/Vocabulary.jsx b/client/react/chapters/components/Vocabulary.jsx index 264fc80..05d8d89 100644 --- a/client/react/chapters/components/Vocabulary.jsx +++ b/client/react/chapters/components/Vocabulary.jsx @@ -1,7 +1,10 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + Vocabulary = createReactClass({ propTypes: { - vocabularyChapter: React.PropTypes.object.isRequired + vocabularyChapter: PropTypes.object.isRequired }, getVocabulary() { diff --git a/client/react/chapters/containers/Upgrade.jsx b/client/react/chapters/containers/Upgrade.jsx index 311d72f..c9d3aac 100644 --- a/client/react/chapters/containers/Upgrade.jsx +++ b/client/react/chapters/containers/Upgrade.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + Upgrade = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/chapters/layouts/ChapterLayout.jsx b/client/react/chapters/layouts/ChapterLayout.jsx index 5fd0336..35e67c8 100644 --- a/client/react/chapters/layouts/ChapterLayout.jsx +++ b/client/react/chapters/layouts/ChapterLayout.jsx @@ -1,9 +1,12 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + ChapterLayout = createReactClass({ propTypes: { - chapter: React.PropTypes.object.isRequired, - chapters: React.PropTypes.array.isRequired, - vocabularyChapter: React.PropTypes.object + chapter: PropTypes.object.isRequired, + chapters: PropTypes.array.isRequired, + vocabularyChapter: PropTypes.object }, render() { diff --git a/client/react/chapters/pages/ChapterPage.jsx b/client/react/chapters/pages/ChapterPage.jsx index 0259b09..edbe9f9 100644 --- a/client/react/chapters/pages/ChapterPage.jsx +++ b/client/react/chapters/pages/ChapterPage.jsx @@ -1,7 +1,10 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + ChapterPage = createReactClass({ propTypes: { - slug: React.PropTypes.string.isRequired + slug: PropTypes.string.isRequired }, mixins: [ReactMeteorData], diff --git a/client/react/common/components/FormFooter.jsx b/client/react/common/components/FormFooter.jsx index aa83e37..c5af0e2 100644 --- a/client/react/common/components/FormFooter.jsx +++ b/client/react/common/components/FormFooter.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + FormFooter = createReactClass({ render() { diff --git a/client/react/common/components/PhotoBackground.jsx b/client/react/common/components/PhotoBackground.jsx index 88a010f..f4a0cf1 100644 --- a/client/react/common/components/PhotoBackground.jsx +++ b/client/react/common/components/PhotoBackground.jsx @@ -1,7 +1,10 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + PhotoBackground = createReactClass({ propTypes: { - chapter: React.PropTypes.object.isRequired + chapter: PropTypes.object.isRequired }, componentDidMount() { diff --git a/client/react/common/components/Purchase.jsx b/client/react/common/components/Purchase.jsx index 6918215..c86642d 100644 --- a/client/react/common/components/Purchase.jsx +++ b/client/react/common/components/Purchase.jsx @@ -1,11 +1,14 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + Purchase = createReactClass({ propTypes: { - product: React.PropTypes.object.isRequired, - level: React.PropTypes.object.isRequired, - user: React.PropTypes.object, // if a user is provided, then we know this is an upgrade - key: React.PropTypes.number, - code: React.PropTypes.string, + product: PropTypes.object.isRequired, + level: PropTypes.object.isRequired, + user: PropTypes.object, // if a user is provided, then we know this is an upgrade + key: PropTypes.number, + code: PropTypes.string, }, renderPrice(levelKey, index) { diff --git a/client/react/common/layouts/FormLayout.jsx b/client/react/common/layouts/FormLayout.jsx index 0f7e8a6..cf9254f 100644 --- a/client/react/common/layouts/FormLayout.jsx +++ b/client/react/common/layouts/FormLayout.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + FormLayout = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/common/layouts/Layout.jsx b/client/react/common/layouts/Layout.jsx index 859281b..e1c8236 100644 --- a/client/react/common/layouts/Layout.jsx +++ b/client/react/common/layouts/Layout.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + Layout = createReactClass({ render() { diff --git a/client/react/common/pages/ChangelogPage.jsx b/client/react/common/pages/ChangelogPage.jsx index 924524b..255a814 100644 --- a/client/react/common/pages/ChangelogPage.jsx +++ b/client/react/common/pages/ChangelogPage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + ChangelogPage = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/common/pages/HomePage.jsx b/client/react/common/pages/HomePage.jsx index ba90baa..4300619 100644 --- a/client/react/common/pages/HomePage.jsx +++ b/client/react/common/pages/HomePage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + HomePage = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/common/pages/NoRightsPage.jsx b/client/react/common/pages/NoRightsPage.jsx index 57887c5..d0ec6b2 100644 --- a/client/react/common/pages/NoRightsPage.jsx +++ b/client/react/common/pages/NoRightsPage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + NoRightsPage = createReactClass({ render() { diff --git a/client/react/common/pages/StarterPage.jsx b/client/react/common/pages/StarterPage.jsx index 6055943..2f5c2ce 100644 --- a/client/react/common/pages/StarterPage.jsx +++ b/client/react/common/pages/StarterPage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + StarterPage = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/interviews/Interview.jsx b/client/react/interviews/Interview.jsx index 07e0b8a..dc2c978 100644 --- a/client/react/interviews/Interview.jsx +++ b/client/react/interviews/Interview.jsx @@ -1,7 +1,10 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + Interview = createReactClass({ propTypes: { - interview: React.PropTypes.object.isRequired + interview: PropTypes.object.isRequired }, render() { diff --git a/client/react/interviews/InterviewPage.jsx b/client/react/interviews/InterviewPage.jsx index df5dd78..b0689d1 100644 --- a/client/react/interviews/InterviewPage.jsx +++ b/client/react/interviews/InterviewPage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + InterviewPage = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/users/components/EmailLoginForm.jsx b/client/react/users/components/EmailLoginForm.jsx index e8f113d..dc54af3 100644 --- a/client/react/users/components/EmailLoginForm.jsx +++ b/client/react/users/components/EmailLoginForm.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + EmailLoginForm = createReactClass({ handleSubmit(event) { diff --git a/client/react/users/components/FormWrapper.jsx b/client/react/users/components/FormWrapper.jsx index 172725d..4caf093 100644 --- a/client/react/users/components/FormWrapper.jsx +++ b/client/react/users/components/FormWrapper.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + FormWrapper = createReactClass({ render() { diff --git a/client/react/users/components/MeteorLoginForm.jsx b/client/react/users/components/MeteorLoginForm.jsx index 96385b7..722f9cc 100644 --- a/client/react/users/components/MeteorLoginForm.jsx +++ b/client/react/users/components/MeteorLoginForm.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + MeteorLoginForm = createReactClass({ handleSubmit(event) { diff --git a/client/react/users/components/Profile.jsx b/client/react/users/components/Profile.jsx index 31a3327..0f0df92 100644 --- a/client/react/users/components/Profile.jsx +++ b/client/react/users/components/Profile.jsx @@ -1,10 +1,13 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + Profile = createReactClass({ propTypes: { - user: React.PropTypes.object.isRequired, - currentUser: React.PropTypes.object.isRequired, - product: React.PropTypes.object, - purchases: React.PropTypes.array + user: PropTypes.object.isRequired, + currentUser: PropTypes.object.isRequired, + product: PropTypes.object, + purchases: PropTypes.array }, isCurrentUserProfile() { diff --git a/client/react/users/containers/Flash.jsx b/client/react/users/containers/Flash.jsx index 01e8e2c..82e7239 100644 --- a/client/react/users/containers/Flash.jsx +++ b/client/react/users/containers/Flash.jsx @@ -1,8 +1,11 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + Flash = createReactClass({ propTypes: { - message: React.PropTypes.string, - type: React.PropTypes.string + message: PropTypes.string, + type: PropTypes.string }, mixins: [ReactMeteorData], diff --git a/client/react/users/containers/UserPurchases.jsx b/client/react/users/containers/UserPurchases.jsx index d422540..f5c20f0 100644 --- a/client/react/users/containers/UserPurchases.jsx +++ b/client/react/users/containers/UserPurchases.jsx @@ -1,10 +1,12 @@ -import Griddle from "griddle-react"; +//import Griddle from "griddle-react"; +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; UserPurchases = createReactClass({ propTypes: { - userId: React.PropTypes.string.isRequired, - showTableHeading: React.PropTypes.bool + userId: PropTypes.string.isRequired, + showTableHeading: PropTypes.bool }, mixins: [ReactMeteorData], @@ -40,6 +42,7 @@ UserPurchases = createReactClass({ ]; return ( + {/* + */} ) } diff --git a/client/react/users/pages/ChangeEmailPage.jsx b/client/react/users/pages/ChangeEmailPage.jsx index d7cf271..7da0bba 100644 --- a/client/react/users/pages/ChangeEmailPage.jsx +++ b/client/react/users/pages/ChangeEmailPage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + ChangeEmailPage = createReactClass({ mixins: [ReactMeteorData], diff --git a/client/react/users/pages/FinishSignupPage.jsx b/client/react/users/pages/FinishSignupPage.jsx index 0b4908e..ac0a425 100644 --- a/client/react/users/pages/FinishSignupPage.jsx +++ b/client/react/users/pages/FinishSignupPage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + FinishSignupPage = createReactClass({ getInitialState() { diff --git a/client/react/users/pages/ForgotPasswordPage.jsx b/client/react/users/pages/ForgotPasswordPage.jsx index 03f2afc..efab0c1 100644 --- a/client/react/users/pages/ForgotPasswordPage.jsx +++ b/client/react/users/pages/ForgotPasswordPage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + ForgotPasswordPage = createReactClass({ handleSubmit(event) { diff --git a/client/react/users/pages/LoginPage.jsx b/client/react/users/pages/LoginPage.jsx index 19d208c..1261032 100644 --- a/client/react/users/pages/LoginPage.jsx +++ b/client/react/users/pages/LoginPage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + LoginPage = createReactClass({ render() { diff --git a/client/react/users/pages/ProfilePage.jsx b/client/react/users/pages/ProfilePage.jsx index aed9c5a..1f9e4fa 100644 --- a/client/react/users/pages/ProfilePage.jsx +++ b/client/react/users/pages/ProfilePage.jsx @@ -1,7 +1,10 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + ProfilePage = createReactClass({ propTypes: { - _id: React.PropTypes.string // user ID + _id: PropTypes.string // user ID }, mixins: [ReactMeteorData], diff --git a/client/react/users/pages/ResetPasswordPage.jsx b/client/react/users/pages/ResetPasswordPage.jsx index 1c0f6d8..beec9bb 100644 --- a/client/react/users/pages/ResetPasswordPage.jsx +++ b/client/react/users/pages/ResetPasswordPage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + ResetPasswordPage = createReactClass({ resetPassword(event) { diff --git a/client/react/videos/Video.jsx b/client/react/videos/Video.jsx index 6789e0c..42db98b 100644 --- a/client/react/videos/Video.jsx +++ b/client/react/videos/Video.jsx @@ -1,7 +1,10 @@ +import createReactClass from 'create-react-class'; +import PropTypes from 'prop-types'; + Video = createReactClass({ propTypes: { - video: React.PropTypes.object.isRequired + video: PropTypes.object.isRequired }, getDescription() { diff --git a/client/react/videos/VideoPage.jsx b/client/react/videos/VideoPage.jsx index bdd3732..d55ea4d 100644 --- a/client/react/videos/VideoPage.jsx +++ b/client/react/videos/VideoPage.jsx @@ -1,3 +1,5 @@ +import createReactClass from 'create-react-class'; + VideoPage = createReactClass({ mixins: [ReactMeteorData], diff --git a/package-lock.json b/package-lock.json index 8b0bef1..83cc906 100644 --- a/package-lock.json +++ b/package-lock.json @@ -268,11 +268,6 @@ "path-is-absolute": "^1.0.0" } }, - "griddle-react": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/griddle-react/-/griddle-react-0.3.1.tgz", - "integrity": "sha1-jP4ze6p432AyIPTnVtEcB7fWvh0=" - }, "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", @@ -377,6 +372,567 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, + "meteor-node-stubs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.0.0.tgz", + "integrity": "sha512-QJwyv23wyXD3uEMzk5Xr/y5ezoVlCbHvBbrgdkVadn84dmifLRbs0PtD6EeNw5NLIk+SQSfxld7IMdEsneGz5w==", + "requires": { + "assert": "^1.4.1", + "browserify-zlib": "^0.2.0", + "buffer": "^5.2.1", + "console-browserify": "^1.1.0", + "constants-browserify": "^1.0.0", + "crypto-browserify": "^3.12.0", + "domain-browser": "^1.2.0", + "events": "^3.0.0", + "https-browserify": "^1.0.0", + "os-browserify": "^0.3.0", + "path-browserify": "^1.0.0", + "process": "^0.11.10", + "punycode": "^2.1.1", + "querystring-es3": "^0.2.1", + "readable-stream": "^3.3.0", + "stream-browserify": "^2.0.2", + "stream-http": "^3.0.0", + "string_decoder": "^1.2.0", + "timers-browserify": "^2.0.10", + "tty-browserify": "0.0.1", + "url": "^0.11.0", + "util": "^0.11.1", + "vm-browserify": "^1.1.0" + }, + "dependencies": { + "asn1.js": { + "version": "4.10.1", + "bundled": true, + "requires": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } + }, + "assert": { + "version": "1.4.1", + "bundled": true, + "requires": { + "util": "0.10.3" + }, + "dependencies": { + "util": { + "version": "0.10.3", + "bundled": true, + "requires": { + "inherits": "2.0.1" + } + } + } + }, + "base64-js": { + "version": "1.3.0", + "bundled": true + }, + "bn.js": { + "version": "4.11.8", + "bundled": true + }, + "brorand": { + "version": "1.1.0", + "bundled": true + }, + "browserify-aes": { + "version": "1.2.0", + "bundled": true, + "requires": { + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "browserify-cipher": { + "version": "1.0.1", + "bundled": true, + "requires": { + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" + } + }, + "browserify-des": { + "version": "1.0.2", + "bundled": true, + "requires": { + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "browserify-rsa": { + "version": "4.0.1", + "bundled": true, + "requires": { + "bn.js": "^4.1.0", + "randombytes": "^2.0.1" + } + }, + "browserify-sign": { + "version": "4.0.4", + "bundled": true, + "requires": { + "bn.js": "^4.1.1", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.2", + "elliptic": "^6.0.0", + "inherits": "^2.0.1", + "parse-asn1": "^5.0.0" + } + }, + "browserify-zlib": { + "version": "0.2.0", + "bundled": true, + "requires": { + "pako": "~1.0.5" + } + }, + "buffer": { + "version": "5.2.1", + "bundled": true, + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + }, + "buffer-xor": { + "version": "1.0.3", + "bundled": true + }, + "builtin-status-codes": { + "version": "3.0.0", + "bundled": true + }, + "cipher-base": { + "version": "1.0.4", + "bundled": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "console-browserify": { + "version": "1.1.0", + "bundled": true, + "requires": { + "date-now": "^0.1.4" + } + }, + "constants-browserify": { + "version": "1.0.0", + "bundled": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true + }, + "create-ecdh": { + "version": "4.0.3", + "bundled": true, + "requires": { + "bn.js": "^4.1.0", + "elliptic": "^6.0.0" + } + }, + "create-hash": { + "version": "1.2.0", + "bundled": true, + "requires": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" + } + }, + "create-hmac": { + "version": "1.1.7", + "bundled": true, + "requires": { + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "crypto-browserify": { + "version": "3.12.0", + "bundled": true, + "requires": { + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" + } + }, + "date-now": { + "version": "0.1.4", + "bundled": true + }, + "des.js": { + "version": "1.0.0", + "bundled": true, + "requires": { + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } + }, + "diffie-hellman": { + "version": "5.0.3", + "bundled": true, + "requires": { + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" + } + }, + "domain-browser": { + "version": "1.2.0", + "bundled": true + }, + "elliptic": { + "version": "6.4.1", + "bundled": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + } + }, + "events": { + "version": "3.0.0", + "bundled": true + }, + "evp_bytestokey": { + "version": "1.0.3", + "bundled": true, + "requires": { + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" + } + }, + "hash-base": { + "version": "3.0.4", + "bundled": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "hash.js": { + "version": "1.1.7", + "bundled": true, + "requires": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "bundled": true + } + } + }, + "hmac-drbg": { + "version": "1.0.1", + "bundled": true, + "requires": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "https-browserify": { + "version": "1.0.0", + "bundled": true + }, + "ieee754": { + "version": "1.1.13", + "bundled": true + }, + "inherits": { + "version": "2.0.1", + "bundled": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true + }, + "md5.js": { + "version": "1.3.5", + "bundled": true, + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "miller-rabin": { + "version": "4.0.1", + "bundled": true, + "requires": { + "bn.js": "^4.0.0", + "brorand": "^1.0.1" + } + }, + "minimalistic-assert": { + "version": "1.0.1", + "bundled": true + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "bundled": true + }, + "os-browserify": { + "version": "0.3.0", + "bundled": true + }, + "pako": { + "version": "1.0.10", + "bundled": true + }, + "parse-asn1": { + "version": "5.1.4", + "bundled": true, + "requires": { + "asn1.js": "^4.0.0", + "browserify-aes": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" + } + }, + "path-browserify": { + "version": "1.0.0", + "bundled": true + }, + "pbkdf2": { + "version": "3.0.17", + "bundled": true, + "requires": { + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "process": { + "version": "0.11.10", + "bundled": true + }, + "process-nextick-args": { + "version": "2.0.0", + "bundled": true + }, + "public-encrypt": { + "version": "4.0.3", + "bundled": true, + "requires": { + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "punycode": { + "version": "2.1.1", + "bundled": true + }, + "querystring": { + "version": "0.2.0", + "bundled": true + }, + "querystring-es3": { + "version": "0.2.1", + "bundled": true + }, + "randombytes": { + "version": "2.1.0", + "bundled": true, + "requires": { + "safe-buffer": "^5.1.0" + } + }, + "randomfill": { + "version": "1.0.4", + "bundled": true, + "requires": { + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" + } + }, + "readable-stream": { + "version": "3.3.0", + "bundled": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "bundled": true + } + } + }, + "ripemd160": { + "version": "2.0.2", + "bundled": true, + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1" + } + }, + "safe-buffer": { + "version": "5.1.2", + "bundled": true + }, + "setimmediate": { + "version": "1.0.5", + "bundled": true + }, + "sha.js": { + "version": "2.4.11", + "bundled": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "stream-browserify": { + "version": "2.0.2", + "bundled": true, + "requires": { + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "bundled": true + } + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, + "stream-http": { + "version": "3.0.0", + "bundled": true, + "requires": { + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.1", + "readable-stream": "^3.0.6", + "xtend": "^4.0.0" + } + }, + "string_decoder": { + "version": "1.2.0", + "bundled": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "timers-browserify": { + "version": "2.0.10", + "bundled": true, + "requires": { + "setimmediate": "^1.0.4" + } + }, + "tty-browserify": { + "version": "0.0.1", + "bundled": true + }, + "url": { + "version": "0.11.0", + "bundled": true, + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + }, + "dependencies": { + "punycode": { + "version": "1.3.2", + "bundled": true + } + } + }, + "util": { + "version": "0.11.1", + "bundled": true, + "requires": { + "inherits": "2.0.3" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "bundled": true + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true + }, + "vm-browserify": { + "version": "1.1.0", + "bundled": true + }, + "xtend": { + "version": "4.0.1", + "bundled": true + } + } + }, "mime-db": { "version": "1.44.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", diff --git a/package.json b/package.json index 6278b37..a809faa 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "bcrypt": "^5.0.0", "body-parser": "^1.19.0", "create-react-class": "^15.6.3", - "griddle-react": "^0.3.1", "meteor-node-stubs": "^1.0.0", + "prop-types": "^15.7.2", "react": "^16.13.1", "react-disqus-thread": "^0.3.1", "react-dom": "^16.13.1",