diff --git a/build-index.js b/build-index.js index e32f96d..056b26d 100755 --- a/build-index.js +++ b/build-index.js @@ -30,7 +30,7 @@ var fs = require("fs-extra"); var deps = { "dependencies": ["babel-runtime", "babel-polyfill", "html-webpack-plugin", "prop-types", "react", "react-dom", "react-redux", "react-router", "react-router-dom", "redux", "redux-saga", "webpack", "node-sass", "history"], - "devDependencies": ["babel-core", "babel-eslint", "babel-jest", "babel-loader", "babel-plugin-transform-async-to-generator", "babel-plugin-transform-class-properties", "babel-plugin-transform-es2015-modules-umd", "babel-plugin-transform-object-rest-spread", "babel-plugin-transform-runtime", "babel-preset-env", "babel-preset-react", "compression-webpack-plugin", "css-loader", "enzyme", "enzyme-adapter-react-16", "eslint-config-mcrowder65", "jest", "fetch-mock", "react-addons-test-utils", "react-test-renderer", "style-loader", "postcss-loader", "postcss-flexbugs-fixes", "sass-loader", "react-hot-loader", "webpack-dev-server", "identity-obj-proxy", "webpack-bundle-analyzer"] + "devDependencies": ["babel-core", "babel-eslint", "babel-jest", "babel-loader", "babel-plugin-transform-async-to-generator", "babel-plugin-transform-class-properties", "babel-plugin-transform-es2015-modules-umd", "babel-plugin-transform-object-rest-spread", "babel-plugin-transform-runtime", "babel-preset-env", "babel-preset-react", "compression-webpack-plugin", "css-loader", "enzyme", "enzyme-adapter-react-16", "eslint-config-mcrowder65", "jest", "fetch-mock", "style-loader", "postcss-loader", "postcss-flexbugs-fixes", "sass-loader", "react-hot-loader", "webpack-dev-server", "identity-obj-proxy", "webpack-bundle-analyzer"] }; var executeFunction = function executeFunction(func, loadingText) { var spinner = void 0; @@ -112,12 +112,12 @@ program.arguments("").option("-y, --yarn", "Use yarn").option("-f, --for "analyze-bundle": "export ANALYZE_BUNDLE=true && npm run webpack" }), jest: (0, _extends4.default)({}, pkgJson.jest, { - setupTestFrameworkScriptFile: "/test/client/config.jsx", + setupTestFrameworkScriptFile: "/test/client/config.js", moduleNameMapper: { "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "/__mocks__/file-mock.js", "\\.(css|scss|less)$": "identity-obj-proxy" }, - collectCoverageFrom: ["src/client/**/*.{js*}", "!src/client/browser-history.jsx", "!src/client/app.jsx", "!src/client/router.jsx", "!src/client/actions/sagas/config.jsx", "!src/client/actions/sagas/index.jsx"], + collectCoverageFrom: ["src/client/**/*.{js*}", "!src/client/browser-history.js", "!src/client/app.js", "!src/client/router.js", "!src/client/actions/sagas/config.js", "!src/client/actions/sagas/index.js"], modulePaths: ["src/client/"], coverageReporters: ["html"] }) @@ -171,7 +171,7 @@ program.arguments("").option("-y, --yarn", "Use yarn").option("-f, --for while (1) { switch (_context2.prev = _context2.next) { case 0: - files = ["webpack.config.js", ".babelrc", "src/client/actions/sagas/config.jsx", "src/client/actions/sagas/index.jsx", "src/client/actions/sagas/ping-server.jsx", "src/client/actions/sagas/types.jsx", "src/client/actions/index.jsx", "src/client/actions/types.jsx", "src/client/components/home.jsx", "src/client/reducers/index.jsx", "src/client/reducers/initial-state.jsx", "src/client/styles/base.scss", "src/client/app.jsx", "src/client/browser-history.jsx", "src/client/index.html", "src/client/router.jsx", "test/client/__mocks__/file-mock.js", "test/client/actions/sagas/ping-server.spec.jsx", "test/client/actions/index.spec.jsx", "test/client/config.jsx", "test/client/reducers/index.spec.jsx"]; + files = ["webpack.config.js", ".babelrc", "src/client/actions/sagas/config.js", "src/client/actions/sagas/index.js", "src/client/actions/sagas/ping-server.js", "src/client/actions/sagas/types.js", "src/client/actions/index.js", "src/client/actions/types.js", "src/client/components/home.js", "src/client/reducers/index.js", "src/client/reducers/initial-state.js", "src/client/styles/base.scss", "src/client/app.js", "src/client/browser-history.js", "src/client/index.html", "src/client/router.js", "test/client/__mocks__/file-mock.js", "test/client/actions/sagas/ping-server.spec.js", "test/client/actions/index.spec.js", "test/client/config.js", "test/client/reducers/index.spec.js"]; _iteratorNormalCompletion = true; _didIteratorError = false; _iteratorError = undefined; diff --git a/index.js b/index.js index 0a35828..91129b5 100644 --- a/index.js +++ b/index.js @@ -41,8 +41,6 @@ const deps = { "eslint-config-mcrowder65", "jest", "fetch-mock", - "react-addons-test-utils", - "react-test-renderer", "style-loader", "postcss-loader", "postcss-flexbugs-fixes", @@ -137,18 +135,18 @@ program }, jest: { ...pkgJson.jest, - setupTestFrameworkScriptFile: "/test/client/config.jsx", + setupTestFrameworkScriptFile: "/test/client/config.js", moduleNameMapper: { "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "/__mocks__/file-mock.js", "\\.(css|scss|less)$": "identity-obj-proxy" }, collectCoverageFrom: [ "src/client/**/*.{js*}", - "!src/client/browser-history.jsx", - "!src/client/app.jsx", - "!src/client/router.jsx", - "!src/client/actions/sagas/config.jsx", - "!src/client/actions/sagas/index.jsx" + "!src/client/browser-history.js", + "!src/client/app.js", + "!src/client/router.js", + "!src/client/actions/sagas/config.js", + "!src/client/actions/sagas/index.js" ], modulePaths: ["src/client/"], coverageReporters: ["html"] @@ -181,25 +179,25 @@ program const files = [ "webpack.config.js", ".babelrc", - "src/client/actions/sagas/config.jsx", - "src/client/actions/sagas/index.jsx", - "src/client/actions/sagas/ping-server.jsx", - "src/client/actions/sagas/types.jsx", - "src/client/actions/index.jsx", - "src/client/actions/types.jsx", - "src/client/components/home.jsx", - "src/client/reducers/index.jsx", - "src/client/reducers/initial-state.jsx", + "src/client/actions/sagas/config.js", + "src/client/actions/sagas/index.js", + "src/client/actions/sagas/ping-server.js", + "src/client/actions/sagas/types.js", + "src/client/actions/index.js", + "src/client/actions/types.js", + "src/client/components/home.js", + "src/client/reducers/index.js", + "src/client/reducers/initial-state.js", "src/client/styles/base.scss", - "src/client/app.jsx", - "src/client/browser-history.jsx", + "src/client/app.js", + "src/client/browser-history.js", "src/client/index.html", - "src/client/router.jsx", + "src/client/router.js", "test/client/__mocks__/file-mock.js", - "test/client/actions/sagas/ping-server.spec.jsx", - "test/client/actions/index.spec.jsx", - "test/client/config.jsx", - "test/client/reducers/index.spec.jsx" + "test/client/actions/sagas/ping-server.spec.js", + "test/client/actions/index.spec.js", + "test/client/config.js", + "test/client/reducers/index.spec.js" ]; for (const f of files) { try { diff --git a/package-lock.json b/package-lock.json index 0f8a140..4e714e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "create-react-matt", - "version": "0.0.75", + "version": "0.0.76", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3751,9 +3751,9 @@ } }, "eslint-config-mcrowder65": { - "version": "0.0.28", - "resolved": "https://registry.npmjs.org/eslint-config-mcrowder65/-/eslint-config-mcrowder65-0.0.28.tgz", - "integrity": "sha512-w06amJ5gaKbUTgS61oEHcEIIVikVUAIr69d3QgxsV/2oGVNAIi9SY/pccIPD5l2hMsdM1BeAgUVwVN8XDelmzQ==", + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/eslint-config-mcrowder65/-/eslint-config-mcrowder65-0.0.29.tgz", + "integrity": "sha512-av+TRCQbGFCZ9NkSrN+jSGsXfKweo/dGW4aYi10kTSt85Vyt0CLuFssIFtR4RbOhe1NfTUWvtVNhca0ZqXc75g==", "dev": true, "requires": { "babel-eslint": "8.2.3", @@ -4689,28 +4689,24 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "bundled": true, "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "bundled": true, "dev": true }, "aproba": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "bundled": true, "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -4720,14 +4716,12 @@ }, "balanced-match": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "bundled": true, "dev": true }, "brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "bundled": true, "dev": true, "requires": { "balanced-match": "1.0.0", @@ -4736,40 +4730,34 @@ }, "chownr": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", + "bundled": true, "dev": true, "optional": true }, "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=", + "bundled": true, "dev": true }, "concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "bundled": true, "dev": true }, "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=", + "bundled": true, "dev": true }, "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=", + "bundled": true, "dev": true, "optional": true }, "debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -4778,29 +4766,25 @@ }, "deep-extend": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", - "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", + "bundled": true, "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "bundled": true, "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", + "bundled": true, "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", - "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -4809,15 +4793,13 @@ }, "fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "bundled": true, "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -4833,8 +4815,7 @@ }, "glob": { "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -4848,15 +4829,13 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "bundled": true, "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.21", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz", - "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -4865,8 +4844,7 @@ }, "ignore-walk": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -4875,8 +4853,7 @@ }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -4886,21 +4863,18 @@ }, "inherits": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "bundled": true, "dev": true }, "ini": { "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "bundled": true, "dev": true, "optional": true }, "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=", + "bundled": true, "dev": true, "requires": { "number-is-nan": "1.0.1" @@ -4908,15 +4882,13 @@ }, "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "bundled": true, "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "bundled": true, "dev": true, "requires": { "brace-expansion": "1.1.11" @@ -4924,14 +4896,12 @@ }, "minimist": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "bundled": true, "dev": true }, "minipass": { "version": "2.2.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz", - "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", + "bundled": true, "dev": true, "requires": { "safe-buffer": "5.1.1", @@ -4940,8 +4910,7 @@ }, "minizlib": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz", - "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -4950,8 +4919,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "bundled": true, "dev": true, "requires": { "minimist": "0.0.8" @@ -4959,15 +4927,13 @@ }, "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "bundled": true, "dev": true, "optional": true }, "needle": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz", - "integrity": "sha512-eFagy6c+TYayorXw/qtAdSvaUpEbBsDwDyxYFgLZ0lTojfH7K+OdBqAF7TAFwDokJaGpubpSGG0wO3iC0XPi8w==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -4978,8 +4944,7 @@ }, "node-pre-gyp": { "version": "0.10.0", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz", - "integrity": "sha512-G7kEonQLRbcA/mOoFoxvlMrw6Q6dPf92+t/l0DFSMuSlDoWaI9JWIyPwK0jyE1bph//CUEL65/Fz1m2vJbmjQQ==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -4997,8 +4962,7 @@ }, "nopt": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -5008,15 +4972,13 @@ }, "npm-bundled": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz", - "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==", + "bundled": true, "dev": true, "optional": true }, "npm-packlist": { "version": "1.1.10", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz", - "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -5026,8 +4988,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -5039,21 +5000,18 @@ }, "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=", + "bundled": true, "dev": true }, "object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "bundled": true, "dev": true, "optional": true }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "bundled": true, "dev": true, "requires": { "wrappy": "1.0.2" @@ -5061,22 +5019,19 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "bundled": true, "dev": true, "optional": true }, "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=", + "bundled": true, "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -5086,22 +5041,19 @@ }, "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=", + "bundled": true, "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", + "bundled": true, "dev": true, "optional": true }, "rc": { "version": "1.2.7", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", - "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -5113,8 +5065,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "bundled": true, "dev": true, "optional": true } @@ -5122,8 +5073,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -5138,8 +5088,7 @@ }, "rimraf": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -5148,49 +5097,42 @@ }, "safe-buffer": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "bundled": true, "dev": true }, "safer-buffer": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "bundled": true, "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "bundled": true, "dev": true, "optional": true }, "semver": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "bundled": true, "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "bundled": true, "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "bundled": true, "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "bundled": true, "dev": true, "requires": { "code-point-at": "1.1.0", @@ -5200,8 +5142,7 @@ }, "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==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -5210,8 +5151,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "bundled": true, "dev": true, "requires": { "ansi-regex": "2.1.1" @@ -5219,15 +5159,13 @@ }, "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=", + "bundled": true, "dev": true, "optional": true }, "tar": { "version": "4.4.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz", - "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -5242,15 +5180,13 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "bundled": true, "dev": true, "optional": true }, "wide-align": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -5259,14 +5195,12 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "bundled": true, "dev": true }, "yallist": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", + "bundled": true, "dev": true } } @@ -10041,12 +9975,6 @@ "prop-types": "15.6.1" } }, - "react-addons-test-utils": { - "version": "15.6.2", - "resolved": "https://registry.npmjs.org/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz", - "integrity": "sha1-wStu/cIkfBDae4dw0YUICnsEcVY=", - "dev": true - }, "react-dom": { "version": "16.4.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.4.0.tgz", diff --git a/package.json b/package.json index 8e4fdc6..a005394 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "create-react-matt", - "version": "0.0.75", + "version": "0.0.76", "description": "React, Redux, Webpack, Babel, Jest, and code coverage all provided for you", "main": "build-index.js", "repository": { @@ -50,13 +50,13 @@ "jest": { "collectCoverageFrom": [ "src/client/**/*.{js*}", - "!src/client/browser-history.jsx", - "!src/client/app.jsx", - "!src/client/router.jsx", - "!src/client/actions/sagas/config.jsx", - "!src/client/actions/sagas/index.jsx" + "!src/client/browser-history.js", + "!src/client/app.js", + "!src/client/router.js", + "!src/client/actions/sagas/config.js", + "!src/client/actions/sagas/index.js" ], - "setupTestFrameworkScriptFile": "/test/client/config.jsx", + "setupTestFrameworkScriptFile": "/test/client/config.js", "moduleNameMapper": { "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "/__mocks__/file-mock.js", "\\.(css|scss|less)$": "identity-obj-proxy" @@ -110,7 +110,7 @@ "css-loader": "0.28.11", "enzyme": "3.3.0", "enzyme-adapter-react-16": "1.1.1", - "eslint-config-mcrowder65": "0.0.28", + "eslint-config-mcrowder65": "0.0.29", "express": "4.16.3", "fetch-mock": "6.4.4", "history": "4.7.2", @@ -124,13 +124,11 @@ "pre-commit": "1.2.2", "prop-types": "15.6.1", "react": "16.4.0", - "react-addons-test-utils": "15.6.2", "react-dom": "16.4.0", "react-hot-loader": "4.2.0", "react-redux": "5.0.7", "react-router": "4.3.1", "react-router-dom": "4.3.1", - "react-test-renderer": "16.4.0", "redux": "4.0.0", "redux-saga": "0.16.0", "sass-loader": "7.0.2", diff --git a/src/client/actions/index.jsx b/src/client/actions/index.js similarity index 100% rename from src/client/actions/index.jsx rename to src/client/actions/index.js diff --git a/src/client/actions/sagas/config.jsx b/src/client/actions/sagas/config.js similarity index 100% rename from src/client/actions/sagas/config.jsx rename to src/client/actions/sagas/config.js diff --git a/src/client/actions/sagas/index.jsx b/src/client/actions/sagas/index.js similarity index 100% rename from src/client/actions/sagas/index.jsx rename to src/client/actions/sagas/index.js diff --git a/src/client/actions/sagas/ping-server.jsx b/src/client/actions/sagas/ping-server.js similarity index 100% rename from src/client/actions/sagas/ping-server.jsx rename to src/client/actions/sagas/ping-server.js diff --git a/src/client/actions/sagas/types.jsx b/src/client/actions/sagas/types.js similarity index 100% rename from src/client/actions/sagas/types.jsx rename to src/client/actions/sagas/types.js diff --git a/src/client/actions/types.jsx b/src/client/actions/types.js similarity index 100% rename from src/client/actions/types.jsx rename to src/client/actions/types.js diff --git a/src/client/app.jsx b/src/client/app.js similarity index 100% rename from src/client/app.jsx rename to src/client/app.js diff --git a/src/client/browser-history.jsx b/src/client/browser-history.js similarity index 100% rename from src/client/browser-history.jsx rename to src/client/browser-history.js diff --git a/src/client/components/home.jsx b/src/client/components/home.js similarity index 100% rename from src/client/components/home.jsx rename to src/client/components/home.js diff --git a/src/client/reducers/index.jsx b/src/client/reducers/index.js similarity index 100% rename from src/client/reducers/index.jsx rename to src/client/reducers/index.js diff --git a/src/client/reducers/initial-state.jsx b/src/client/reducers/initial-state.js similarity index 100% rename from src/client/reducers/initial-state.jsx rename to src/client/reducers/initial-state.js diff --git a/src/client/router.jsx b/src/client/router.js similarity index 100% rename from src/client/router.jsx rename to src/client/router.js index 4d84e47..56d7ec3 100644 --- a/src/client/router.jsx +++ b/src/client/router.js @@ -2,8 +2,8 @@ import React from "react"; import { Router as BrowserRouter } from "react-router-dom"; import { Route } from "react-router"; -import { browserHistory } from "./browser-history"; import Home from "./components/home"; +import { browserHistory } from "./browser-history"; const Router = () => ( diff --git a/test/client/actions/index.spec.jsx b/test/client/actions/index.spec.js similarity index 85% rename from test/client/actions/index.spec.jsx rename to test/client/actions/index.spec.js index 57c2765..6e3de70 100644 --- a/test/client/actions/index.spec.jsx +++ b/test/client/actions/index.spec.js @@ -1,7 +1,7 @@ import { setInput } from "../../../src/client/actions/index"; import { SET_INPUT } from "../../../src/client/actions/types"; -describe("src/client/actions/index.jsx", () => { +describe("src/client/actions/index.js", () => { describe("function setInput()", () => { test("test", () => { expect(setInput("hello")).toEqual({ type: SET_INPUT, input: "hello" }); diff --git a/test/client/actions/sagas/ping-server.spec.jsx b/test/client/actions/sagas/ping-server.spec.js similarity index 100% rename from test/client/actions/sagas/ping-server.spec.jsx rename to test/client/actions/sagas/ping-server.spec.js diff --git a/test/client/components/home.spec.jsx b/test/client/components/home.spec.js similarity index 96% rename from test/client/components/home.spec.jsx rename to test/client/components/home.spec.js index 5f43db4..e606720 100644 --- a/test/client/components/home.spec.jsx +++ b/test/client/components/home.spec.js @@ -11,7 +11,7 @@ import Home from "components/home"; import sagaActions from "actions/sagas"; const generateEvent = value => ({ target: { value } }); -describe("test/client/components/home.spec.jsx", () => { +describe("test/client/components/home.spec.js", () => { let home; let store; beforeAll(() => { diff --git a/test/client/config.jsx b/test/client/config.js similarity index 100% rename from test/client/config.jsx rename to test/client/config.js diff --git a/test/client/reducers/index.spec.jsx b/test/client/reducers/index.spec.js similarity index 100% rename from test/client/reducers/index.spec.jsx rename to test/client/reducers/index.spec.js diff --git a/webpack.config.js b/webpack.config.js index ed66f09..b81e913 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -9,11 +9,11 @@ const sourcePath = path.join(__dirname, "./src/client"); const webpackConfig = { cache: !isProd, devtool: isProd ? "" : "eval-cheap-module-source-map", - entry: isProd ? "./src/client/app.jsx" : [ + entry: isProd ? "./src/client/app.js" : [ "react-hot-loader/patch", "webpack-dev-server/client?http://localhost:8080", "webpack/hot/only-dev-server", - "./src/client/app.jsx" + "./src/client/app.js" ], output: { path: `${__dirname}/build`, @@ -22,7 +22,7 @@ const webpackConfig = { resolve: { extensions: [".js", ".scss", ".jsx", ".css"], modules: [sourcePath, path.resolve(__dirname, "./node_modules")], - symlinks: false + symlinks: true }, module: { loaders: [