Merge pull request #2 from DerekCL/feature/ExistingProjectRemoval

Removed Existing Project support

Author: DerekCL

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### [2018-07-01]
 * Removed ejs support
+* Removed existing project support
 
 ### [Sat Jun 18 2016]
 * Refactor configs

README.md

@@ -66,46 +66,9 @@ Options
 * `author_name`: Your Name
 * `description`: A short description of the project for the `README.md` file
 * `version`: Project version number
-* `existing_project`: `n` if this is a new project and `y` if you're integrating into an existing project. See the notes below about integrating into an existing project.
 * `css_extension`: [`none`, `less`, `sass`] - use `less` or `sass` to preprocess styles.
 
 
-Integrating into existing projects
-----------------------------------
-
-You can chain this into an existing cookiecutter project by installing via the projects `./hooks/post_gen_project.py` file or just installing it via the command line.
-
-### Using post hooks
-Here is a django project post hook example that chains this through a django cookiecutter project.
-
-```python
-from cookiecutter.main import cookiecutter
-
-  cookiecutter(
-      '[email protected]:goldhand/cookiecutter-webpack.git',
-      replay=False, overwrite_if_exists=True, output_dir='../',
-      checkout=None, no_input=True, extra_context={
-          'project_name': '{{ cookiecutter.project_name }}',
-          'repo_name': '{{ cookiecutter.repo_name }}',
-          'repo_owner': 'goldhand',
-          'static_root': '{{ cookiecutter.project_dir }}/static/{{ cookiecutter.project_dir }}',
-          'production_output_path': '{{ cookiecutter.project_dir }}/static/{{ cookiecutter.project_dir }}/dist/',
-          'author_name': '{{ cookiecutter.author_name }}',
-          'description': '{{ cookiecutter.description }}',
-          'version': '{{ cookiecutter.version }}',
-          'existing_project': 'y',
-          'css_extension': 'sass',
-      })
-```
-
-The flag `existing_project` will move/remove some files and dependencies and also add supporting configurations for a django project.
-
-### Using command line
-Just make sure you use the `--overwrite-if-exists` [ or `-f`] flag so cookiecutter can work within your existing project structure. You will also probably want to point to your existing projects parent directory and make sure you use the same `repo_name` as the project directory so your `package.json` files are installed at the project root.
-
-	cookiecutter -f -output-dir ../ [email protected]:goldhand/cookiecutter-webpack.git
-
-
 Contributing
 ------------
 

build_test_config.yml

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

cookiecutter.json

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

hooks/post_gen_project.py

@@ -3,7 +3,6 @@
 
 # Get the root project directory
 PROJECT_DIRECTORY = os.path.realpath(os.path.curdir)
-is_existing = '{{ cookiecutter.existing_project }}' == 'y'
 
 
 def add_tilda(project_directory, file_name):
@@ -18,8 +17,3 @@ def add_tilda(project_directory, file_name):
     )
     if os.path.isfile(current_location):
         shutil.move(current_location, new_location)
-
-
-if is_existing:
-    add_tilda(PROJECT_DIRECTORY, '.gitignore')
-    add_tilda(PROJECT_DIRECTORY, 'README.md')

hooks/pre_gen_project.py

@@ -22,7 +22,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/goldhand/cookiecutter-webpack.git"
+    "url": "git+https://github.com/DerekCL/cookiecutter-typescript-webpack.git"
   },
   "keywords": [
     "webpack",
@@ -32,10 +32,10 @@
     "cookiecutter",
     "boilerplate"
   ],
-  "author": "Will Farley <a.will.farley@gmail.com>",
+  "author": "Derek Lewandowski <derekclewandowski@gmail.com>",
   "license": "ISC",
   "bugs": {
-    "url": "https://github.com/goldhand/cookiecutter-webpack/issues"
+    "url": "https://github.com/DerekCL/cookiecutter-typescript-webpack/issues"
   },
-  "homepage": "https://github.com/goldhand/cookiecutter-webpack#readme"
+  "homepage": "https://github.com/DerekCL/cookiecutter-typescript-webpack#readme"
 }

package.json

@@ -24,7 +24,6 @@ def context():
         "email": "Your email",
         "description": "A short description of the project.",
         "version": "0.1.0",
-        "existing_project": "n",
         "css_extension": "none",
     }
 

tests/test_cookiecutter_generation.py

@@ -1,8 +1,5 @@
 import webpack from 'webpack';
 import ForceCaseSensitivityPlugin from 'force-case-sensitivity-webpack-plugin';
-{% if cookiecutter.existing_project == 'y' -%}
-import BundleTracker from 'webpack-bundle-tracker';
-{% endif -%}
 
 import baseConfig from './webpack.base.config.js';
 
@@ -13,18 +10,8 @@ module.exports = (opts) => {
 
   return {
     ...config,
-    {% if cookiecutter.existing_project == 'y' -%}
-    output: {
-      ...config.output,
-      publicPath: 'http://localhost:8080/bundles/',
-    },
-    {% endif -%}
     plugins: [
       ...config.plugins,
-      {% if cookiecutter.existing_project == 'y' -%}
-      // local bundle stats file
-      new BundleTracker({filename: './webpack-stats.json'}),
-      {% endif -%}
       new ForceCaseSensitivityPlugin(),  // OSX wont check but other unix os will
       new webpack.NoErrorsPlugin(),
     ],

{{cookiecutter.repo_name}}/config/webpack.local.config.js

@@ -1,8 +1,5 @@
 import path from 'path';
 import webpack from 'webpack';
-{% if cookiecutter.existing_project == 'y' -%}
-import BundleTracker from 'webpack-bundle-tracker';
-{% endif -%}
 
 import baseConfig from './webpack.base.config.js';
 
@@ -23,10 +20,6 @@ module.exports = (opts) => {
     },
     plugins: [
       ...config.plugins,
-      {% if cookiecutter.existing_project == 'y' -%}
-      // production bundle stats file
-      new BundleTracker({filename: './webpack-stats-production.json'}),
-      {% endif -%}
       // pass options to uglify
       new webpack.LoaderOptionsPlugin({
         minimize: true,