Merge pull request #10 from DerekCL/develop

1.0.0 Release

Author: DerekCL

.gitignore

@@ -1,58 +1,222 @@
-### OSX ###
-.DS_Store
-.AppleDouble
-.LSOverride
 
-### SublimeText ###
-# cache files for sublime text
-*.tmlanguage.cache
-*.tmPreferences.cache
-*.stTheme.cache
+# Created by https://www.gitignore.io/api/node,python,sublimetext,visualstudiocode
 
-# workspace files are user-specific
-*.sublime-workspace
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 
-# project files should be checked into the repository, unless a significant
-# proportion of contributors will probably not be using SublimeText
-# *.sublime-project
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
 
-# sftp configuration file
-sftp-config.json
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
 
-# Basics
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
 *.py[cod]
-__pycache__
+*$py.class
 
-# Logs
-*.log
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
 pip-log.txt
+pip-delete-this-directory.txt
 
 # Unit test / coverage reports
+htmlcov/
+.tox/
 .coverage
-.tox
+.coverage.*
 nosetests.xml
-htmlcov
-.cache/
-build_test/
-
-# egg
-*.egg-info
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
 
 # Translations
 *.mo
 *.pot
 
-# Pycharm
-.idea
+# Django stuff:
+local_settings.py
+db.sqlite3
 
-# Vim
+# Flask stuff:
+instance/
+.webassets-cache
 
-*~
-*.swp
-*.swo
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+### SublimeText ###
+# Cache files for Sublime Text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+
+# Workspace files are user-specific
+*.sublime-workspace
+
+# Project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using Sublime Text
+# *.sublime-project
+
+# SFTP configuration file
+sftp-config.json
+
+# Package control specific files
+Package Control.last-run
+Package Control.ca-list
+Package Control.ca-bundle
+Package Control.system-ca-bundle
+Package Control.cache/
+Package Control.ca-certs/
+Package Control.merged-ca-bundle
+Package Control.user-ca-bundle
+oscrypto-ca-bundle.crt
+bh_unicode_properties.cache
+
+# Sublime-github package stores a github token in this file
+# https://packagecontrol.io/packages/sublime-github
+GitHub.sublime-settings
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
 
-# npm
-node_modules/
 
-# Compass
-.sass-cache
+# End of https://www.gitignore.io/api/node,python,sublimetext,visualstudiocode

CHANGELOG.md

@@ -1,3 +1,13 @@
+### [2018-07-04]
+* Added typescript support
+* Added new linting for typescript
+* Upgraded dependencies
+* Updated readmes
+* Update gitignore files
+* Changed structure for redux to a Duck modularization
+* Fixed Less, Sass, and Css modularization
+* Removed large portions of the older codebase
+
 ### [2018-07-01]
 * Removed ejs support
 * Removed existing project support

README.md

@@ -2,16 +2,19 @@ Cookiecutter-webpack
 ====================
 [![CircleCI](https://circleci.com/gh/goldhand/cookiecutter-webpack.svg?style=svg)](https://circleci.com/gh/goldhand/cookiecutter-webpack)
 
-Boilerplate for setting up [webpack 2][webpack2] configuration with [hot reloading][hmr], [babel][babel] for es6 modules, [react][react] + [redux][redux] for views and state, and [karma][karma] + [mocha][mocha] + [expect][expect] for testing.
+[![Cookiecutter-webpack](https://img.shields.io/badge/built%20with-Cookiecutter%20Webpack-f38230.svg)][cookiecutter-webpack]
 
-[webpack2]: https://github.com/webpack/webpack/tree/v2.1.0-beta.13
-[hmr]: https://github.com/gaearon/react-transform-hmr
-[babel]: https://babeljs.io/
+Boilerplate for setting up [webpack 4][webpack4] configuration with [awesome-typescript-loader][awesome-typescript-loader] for es6 modules, [react][react] + [redux][redux] for views and state, [Istanbul][Istanbul] for code coverage and [mocha][mocha] + [chai][chai] + [enzyme][enzyme] for testing.
+
+[webpack4]: https://github.com/webpack/webpack/tree/v4.14.0
+[awesome-typescript-loader]: https://github.com/s-panferov/awesome-typescript-loader/tree/v5.2.0
 [react]: https://facebook.github.io/react/
 [redux]: http://redux.js.org/index.html
-[karma]: https://github.com/karma-runner/karma
+[Istanbul]: https://istanbul.js.org/
 [mocha]: https://github.com/mochajs/mocha
-[expect]: https://github.com/mjackson/expect
+[chai]: https://github.com/chaijs/chai/tree/4.1.2
+[enzyme]: https://github.com/airbnb/enzyme/tree/v2.9.1
+[cookiecutter-webpack]: https://github.com/goldhand/cookiecutter-webpack
 
 Getting Started
 ---------------
@@ -22,7 +25,7 @@ Download `cookiecutter` to a global python path
 
 In your project directory run
 
-    $ cookiecutter https://github.com/goldhand/cookiecutter-webpack.git
+    $ cookiecutter https://github.com/DerekCL/cookiecutter-typescript-webpack.git
 
 Answer the prompts then `cd` into your newly created project directory.
 
@@ -50,7 +53,7 @@ You should also create a new git repo and push it to github
 $ git init
 $ git add .
 $ git commit -m "Init"
-$ git remote add origin [email protected]:goldhand/project_name.git
+$ git remote add origin [email protected]:DerekCL/project_name.git
 $ git push -u origin master
 ```
 
@@ -66,7 +69,7 @@ Options
 * `author_name`: Your Name
 * `description`: A short description of the project for the `README.md` file
 * `version`: Project version number
-* `css_extension`: [`none`, `less`, `sass`] - use `less` or `sass` to preprocess styles.
+* `css_extension`: [`sass`, `less`, `none` ] - use `less` or `sass` to preprocess styles.
 
 
 Contributing
@@ -76,7 +79,7 @@ Accepting pull requests!
 
 Clone the project:
 ```sh
-$ git clone [email protected]:goldhand/cookiecutter-webpack.git
+$ git clone [email protected]:DerekCL/cookiecutter-typescript-webpack.git
 ```
 Install python and npm dependencies:
 ```sh

build_test_config.yml

@@ -7,5 +7,5 @@ default_context:
   "author_name": "Your Name"
   "description": "A short description of the project."
   "version": "0.1.0"
-  "css_extension": "none"
+  "css_extension": "sass"
   "open_source_license": "ISC"

circle.yml

@@ -1,8 +1,10 @@
 machine:
   python:
-    version: 2.7.9
+    version: 2.7.14
   node:
-    version: 5.10.1
+    version: 6.10.3
+  npm:
+    version: 6.1.0
 
 test:
   override:

cookiecutter.json

@@ -7,6 +7,6 @@
     "author_name": "Your Name",
     "description": "A short description of the project.",
     "version": "0.1.0",
-    "css_extension": ["none", "less", "sass"],
+    "css_extension": ["sass", "less", "none"],
     "open_source_license": "ISC"
 }

hooks/post_gen_project.py

@@ -0,0 +1,28 @@
+import os
+import shutil
+
+# Get the root project directory
+PROJECT_DIRECTORY = os.path.realpath(os.path.curdir)
+
+repo_name = '{{ cookiecutter.repo_name }}'
+css_extension = '{{ cookiecutter.css_extension }}'
+
+
+def remove_dir(project_directory, dir_name):
+    """Remove a dir."""
+    dir_location = os.path.join(project_directory, dir_name)
+    if os.path.isdir(dir_location):
+        shutil.rmtree(dir_location)
+
+
+if css_extension != 'less':
+    """Remove less files"""
+    remove_dir(PROJECT_DIRECTORY, 'less')
+
+if css_extension != 'sass':
+    """Remove scss files"""
+    remove_dir(PROJECT_DIRECTORY, 'sass')
+
+if css_extension != 'none':
+    """Remove css files"""
+    remove_dir(PROJECT_DIRECTORY, 'css')