Merge pull request #1 from jakemcdermott/use-pipenv-and-yarn

use pipenv and yarn

Author: jakemcdermott

.gitignore

@@ -0,0 +1 @@
+server/db.sqlite3 

Makefile

@@ -1,25 +1,30 @@
-clean:
-	find . -name \*.pyc -o -name -delete
-	find . -name \*.pyo -o -name -delete
-	find . -name __pycache__ -o -name -delete
-	find . -path "./server/server/api/migrations/*.py" -not -name "__init__.py" -o -name -delete
-	rm -f server/db.sqlite3
+PYTHON_BIN = $(shell cd server && pipenv --venv)/bin/python
+
+python_bin:
+	pushd server; pipenv install --dev; popd;
 
-database:
-	./server/manage.py makemigrations api --noinput
-	./server/manage.py migrate --noinput
+database: python_bin
+	$(PYTHON_BIN) ./server/manage.py makemigrations api --noinput
+	$(PYTHON_BIN) ./server/manage.py migrate --noinput
 
-fixtures:
-	./server/manage.py createsuperuser --username=root --email=root@example.com --noinput
-	./server/manage.py create_fixtures
+fixtures: python_bin
+	$(PYTHON_BIN) ./server/manage.py createsuperuser --username=root --email=root@example.com --noinput
+	$(PYTHON_BIN) ./server/manage.py create_fixtures
+
+server-dev: python_bin
+	$(PYTHON_BIN) ./server/manage.py runserver --settings=server.settings
 
 client/node_modules:
-	npm --prefix=./client install
+	yarn --cwd=./client install
 
 client-dist: client/node_modules
-	npm --prefix=./client run build
+	yarn --cwd=./client run build
 
-server-dev:
-	./server/manage.py runserver --settings=server.settings
+clean:
+	find . -name \*.pyc -o -name -delete
+	find . -name \*.pyo -o -name -delete
+	find . -name __pycache__ -o -name -delete
+	find . -path "./server/server/api/migrations/*.py" -not -name "__init__.py" -o -name -delete
+	rm -f server/db.sqlite3
 
 all: clean database fixtures client-dist server-dev

README.md

@@ -6,7 +6,7 @@ An example [Vue.js](https://github.com/vuejs/vue) project featuring an unstyled
 * [server](server)
 
 #### Dependencies
-- python 3.5+
-- pip
+- python 3.6
+- pipenv 11.10.0
 - node 8.9.0
-- npm 5.6.0
+- yarn 1.6.0+

client/.eslintrc.js

@@ -2,17 +2,18 @@
 
 module.exports = {
   root: true,
-  parser: 'babel-eslint',
   parserOptions: {
-    sourceType: 'module'
+    parser: 'babel-eslint'
   },
   env: {
     browser: true,
   },
-  extends: 'airbnb-base',
+  // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
+  // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
+  extends: ['plugin:vue/essential', 'airbnb-base'],
   // required to lint *.vue files
   plugins: [
-    'html'
+    'vue'
   ],
   // check if imports actually resolve
   settings: {

client/.postcssrc.js

@@ -2,8 +2,9 @@
 
 module.exports = {
   "plugins": {
-    // to edit target browsers: use "browserslist" field in package.json
     "postcss-import": {},
+    "postcss-url": {},
+    // to edit target browsers: use "browserslist" field in package.json
     "autoprefixer": {}
   }
 }

client/README.md

@@ -2,25 +2,25 @@
 
 ``` bash
 # install dependencies
-npm install
+yarn install
 
 # serve with auto-reload at localhost:8080
-npm run dev
+yarn run dev
 
 # build for production with minification
-npm run build
+yarn run build
 
 # build for production and view the bundle analyzer report
-npm run build --report
+yarn run build --report
 
 # run unit tests
-npm run unit
+yarn run unit
 
 # run e2e tests
-npm run e2e
+yarn run e2e
 
 # run all tests
-npm test
+yarn test
 ```
 
 For more details on the build setup see [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).

client/build/build.js

@@ -22,7 +22,7 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
     process.stdout.write(stats.toString({
       colors: true,
       modules: false,
-      children: false, // if you are using ts-loader, setting this to true will make tyescript errors show up during build
+      children: false, // if you are using ts-loader, setting this to true will make TypeScript errors show up during build
       chunks: false,
       chunkModules: false
     }) + '\n\n')

client/build/webpack.base.conf.js

@@ -49,7 +49,7 @@ module.exports = {
       {
         test: /\.js$/,
         loader: 'babel-loader',
-        include: [resolve('src'), resolve('test')]
+        include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
       },
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,

client/build/webpack.dev.conf.js

@@ -3,7 +3,9 @@ const utils = require('./utils')
 const webpack = require('webpack')
 const config = require('../config')
 const merge = require('webpack-merge')
+const path = require('path')
 const baseWebpackConfig = require('./webpack.base.conf')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 const portfinder = require('portfinder')
@@ -24,8 +26,13 @@ const devWebpackConfig = merge(baseWebpackConfig, {
   // these devServer options should be customized in /config/index.js
   devServer: {
     clientLogLevel: 'warning',
-    historyApiFallback: true,
+    historyApiFallback: {
+      rewrites: [
+        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
+      ],
+    },
     hot: true,
+    contentBase: false, // since we use CopyWebpackPlugin.
     compress: true,
     host: HOST || config.dev.host,
     port: PORT || config.dev.port,
@@ -53,6 +60,14 @@ const devWebpackConfig = merge(baseWebpackConfig, {
       template: 'index.html',
       inject: true
     }),
+    // copy custom static assets
+    new CopyWebpackPlugin([
+      {
+        from: path.resolve(__dirname, '../static'),
+        to: config.dev.assetsSubDirectory,
+        ignore: ['.*']
+      }
+    ])
   ]
 })
 

client/build/webpack.prod.conf.js

@@ -78,7 +78,7 @@ const webpackConfig = merge(baseWebpackConfig, {
       // necessary to consistently work with multiple chunks via CommonsChunkPlugin
       chunksSortMode: 'dependency'
     }),
-    // keep module.id stable when vender modules does not change
+    // keep module.id stable when vendor modules does not change
     new webpack.HashedModuleIdsPlugin(),
     // enable scope hoisting
     new webpack.optimize.ModuleConcatenationPlugin(),