diff --git a/.eslintrc.json b/.eslintrc.json index fbf7e23..fe384cf 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,232 +1,13 @@ { - "env": { - "browser": true, - "commonjs": true, - "es6": true - }, - "extends": "eslint:recommended", - "parserOptions": { - "ecmaFeatures": { - "experimentalObjectRestSpread": true, - "jsx": true - }, - "sourceType": "module" - }, - "plugins": [ - "react" - ], - "rules": { - "accessor-pairs": "error", - "array-bracket-newline": "error", - "array-bracket-spacing": "error", - "array-callback-return": "error", - "array-element-newline": "error", - "arrow-body-style": "error", - "arrow-parens": "error", - "arrow-spacing": "error", - "block-scoped-var": "error", - "block-spacing": "error", - "brace-style": "error", - "callback-return": "error", - "camelcase": "error", - "capitalized-comments": "error", - "class-methods-use-this": "error", - "comma-dangle": "error", - "comma-spacing": "error", - "comma-style": "error", - "complexity": "error", - "computed-property-spacing": "error", - "consistent-return": "error", - "consistent-this": "error", - "curly": "error", - "default-case": "error", - "dot-location": "error", - "dot-notation": "error", - "eol-last": "error", - "eqeqeq": "error", - "for-direction": "error", - "func-call-spacing": "error", - "func-name-matching": "error", - "func-names": "error", - "func-style": "error", - "function-paren-newline": "error", - "generator-star-spacing": "error", - "getter-return": "error", - "global-require": "error", - "guard-for-in": "error", - "handle-callback-err": "error", - "id-blacklist": "error", - "id-length": "error", - "id-match": "error", - "implicit-arrow-linebreak": "error", - "indent": "error", - "indent-legacy": "error", - "init-declarations": "error", - "jsx-quotes": "error", - "key-spacing": "error", - "keyword-spacing": "error", - "line-comment-position": "error", - "linebreak-style": "error", - "lines-around-comment": "error", - "lines-around-directive": "error", - "lines-between-class-members": "error", - "max-depth": "error", - "max-len": "error", - "max-lines": "error", - "max-nested-callbacks": "error", - "max-params": "error", - "max-statements": "error", - "max-statements-per-line": "error", - "multiline-comment-style": "error", - "multiline-ternary": "error", - "new-cap": "error", - "new-parens": "error", - "newline-after-var": "error", - "newline-before-return": "error", - "newline-per-chained-call": "error", - "no-alert": "error", - "no-array-constructor": "error", - "no-await-in-loop": "error", - "no-bitwise": "error", - "no-buffer-constructor": "error", - "no-caller": "error", - "no-catch-shadow": "error", - "no-confusing-arrow": "error", - "no-continue": "error", - "no-div-regex": "error", - "no-duplicate-imports": "error", - "no-else-return": "error", - "no-empty-function": "error", - "no-eq-null": "error", - "no-eval": "error", - "no-extend-native": "error", - "no-extra-bind": "error", - "no-extra-label": "error", - "no-extra-parens": "error", - "no-floating-decimal": "error", - "no-implicit-coercion": "error", - "no-implicit-globals": "error", - "no-implied-eval": "error", - "no-inline-comments": "error", - "no-invalid-this": "error", - "no-iterator": "error", - "no-label-var": "error", - "no-labels": "error", - "no-lone-blocks": "error", - "no-lonely-if": "error", - "no-loop-func": "error", - "no-magic-numbers": "error", - "no-mixed-operators": "error", - "no-mixed-requires": "error", - "no-multi-assign": "error", - "no-multi-spaces": "error", - "no-multi-str": "error", - "no-multiple-empty-lines": "error", - "no-native-reassign": "error", - "no-negated-condition": "error", - "no-negated-in-lhs": "error", - "no-nested-ternary": "error", - "no-new": "error", - "no-new-func": "error", - "no-new-object": "error", - "no-new-require": "error", - "no-new-wrappers": "error", - "no-octal-escape": "error", - "no-param-reassign": "error", - "no-path-concat": "error", - "no-plusplus": "error", - "no-process-env": "error", - "no-process-exit": "error", - "no-proto": "error", - "no-prototype-builtins": "error", - "no-restricted-globals": "error", - "no-restricted-imports": "error", - "no-restricted-modules": "error", - "no-restricted-properties": "error", - "no-restricted-syntax": "error", - "no-return-assign": "error", - "no-return-await": "error", - "no-script-url": "error", - "no-self-compare": "error", - "no-sequences": "error", - "no-shadow": "error", - "no-shadow-restricted-names": "error", - "no-spaced-func": "error", - "no-sync": "error", - "no-tabs": "error", - "no-template-curly-in-string": "error", - "no-ternary": "error", - "no-throw-literal": "error", - "no-trailing-spaces": "error", - "no-undef-init": "error", - "no-undefined": "error", - "no-underscore-dangle": "error", - "no-unmodified-loop-condition": "error", - "no-unneeded-ternary": "error", - "no-unused-expressions": "error", - "no-use-before-define": "error", - "no-useless-call": "error", - "no-useless-computed-key": "error", - "no-useless-concat": "error", - "no-useless-constructor": "error", - "no-useless-rename": "error", - "no-useless-return": "error", - "no-var": "error", - "no-void": "error", - "no-warning-comments": "error", - "no-whitespace-before-property": "error", - "no-with": "error", - "nonblock-statement-body-position": "error", - "object-curly-newline": "error", - "object-curly-spacing": "error", - "object-property-newline": "error", - "object-shorthand": "error", - "one-var": "error", - "one-var-declaration-per-line": "error", - "operator-assignment": "error", - "operator-linebreak": "error", - "padded-blocks": "error", - "padding-line-between-statements": "error", - "prefer-arrow-callback": "error", - "prefer-const": "error", - "prefer-destructuring": "error", - "prefer-numeric-literals": "error", - "prefer-promise-reject-errors": "error", - "prefer-reflect": "error", - "prefer-rest-params": "error", - "prefer-spread": "error", - "prefer-template": "error", - "quote-props": "error", - "quotes": "error", - "radix": "error", - "require-await": "error", - "require-jsdoc": "error", - "rest-spread-spacing": "error", - "semi": "error", - "semi-spacing": "error", - "semi-style": "error", - "sort-imports": "error", - "sort-vars": "error", - "space-before-blocks": "error", - "space-before-function-paren": "error", - "space-in-parens": "error", - "space-infix-ops": "error", - "space-unary-ops": "error", - "spaced-comment": "error", - "strict": "error", - "switch-colon-spacing": "error", - "symbol-description": "error", - "template-curly-spacing": "error", - "template-tag-spacing": "error", - "unicode-bom": [ - "error", - "never" - ], - "valid-jsdoc": "error", - "vars-on-top": "error", - "wrap-iife": "error", - "wrap-regex": "error", - "yield-star-spacing": "error", - "yoda": "error" - } + "extends": "airbnb", + "env":{ + "browser":true, + "jest":true + }, + "rules": { + "react/jsx-filename-extension":[1,{ + "extensions":[".js", ".jsx"] + }] + } + } diff --git a/.gitignore b/.gitignore index 550a3f8..17e83c7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ package-lock.json node_modules # REPL History bundle.js +bundle.js.map .env diff --git a/package.json b/package.json index b89bf15..3521af3 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "main": "webpack.config.js", "scripts": { "test": "", - "clean": "rimraf build", - "prod:build": "clean && webpack -p" + "clean": "rimraf public/bundle.js", + "prod:build": "npm run clean && webpack -p" }, "repository": { "type": "git", @@ -23,6 +23,7 @@ "babel-eslint": "^8.2.1", "babel-loader": "^7.1.2", "babel-preset-env": "^1.6.1", + "babel-preset-react": "^6.24.1", "css-loader": "^0.28.9", "eslint": "^4.17.0", "eslint-config-airbnb": "^16.1.0", diff --git a/public/index.html b/public/index.html index 39904d0..ad4000b 100644 --- a/public/index.html +++ b/public/index.html @@ -5,6 +5,7 @@ home - +
+ diff --git a/src/client/index.js b/src/client/index.js index e69de29..fc31b30 100644 --- a/src/client/index.js +++ b/src/client/index.js @@ -0,0 +1,5 @@ +import React from 'react'; +import { render } from 'react-dom'; +import App from './components/App'; + +render(, document.getElementById('container')); diff --git a/webpack.config.js b/webpack.config.js index 5924244..b23211a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,46 +1,46 @@ -const path = require("path"); +const path = require('path'); module.exports = { - "entry": "./src/client/index.js", - "output": { - "filename": "bundle.js", - "path": path.resolve("public/") - }, - "resolve": { - "extensions": [ - ".js", - ".jsx" - ] - }, - "module": { - "rules": [ - { - "test": /\.js$/, - "exclude": /node_modules/, - "use": "babel-loader" + entry: './src/client/index.js', + output: { + filename: 'bundle.js', + path: path.resolve('public/'), + }, + resolve: { + extensions: [ + '.js', + '.jsx', + ], + }, + module: { + rules: [ + { + test: /\.js$/, + exclude: /node_modules/, + use: 'babel-loader', + }, + { + test: /\.css$/, + use: [ + 'style-loader', + 'css-loader', + ], + }, + { + test: /\.(png|jpg|gif)$/, + use: [ + { + loader: 'file-loader', + options: { + name: '[path][name].[ext]', + context: path.resolve('src/client/assets/'), }, - { - "test": /\.css$/, - "use": [ - "style-loader", - "css-loader" - ] - }, - { - "test": /\.(png|jpg|gif)$/, - "use": [ - { - "loader": "file-loader", - "options": { - "name": "[path][name].[ext]", - "context": path.resolve("src/client/assets/") - } - } - ] - } - ] - }, - "devtool": "source-map", - "devServer": {"historyApiFallback": true}, - "watch": true + }, + ], + }, + ], + }, + devtool: 'source-map', + devServer: { historyApiFallback: true }, + watch: true, };