diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5ee5d0a04..5e8e7ce9f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,3 +8,12 @@ updates: directory: "/" schedule: interval: "daily" + labels: + - "update" + # Update NPM dependencies in packages.json + - package-ecosystem: "npm" + directory: "/{{cookiecutter.project_slug}}/packages-json/" + schedule: + interval: "daily" + labels: + - "update" diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index ede14c324..b11aac1aa 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -88,10 +88,15 @@ def remove_gulp_files(): os.remove(file_name) -def remove_packagejson_file(): - file_names = ["package.json"] - for file_name in file_names: - os.remove(file_name) +def remove_packages_json_dir(): + shutil.rmtree("packages-json") + + +def copy_package_json(directory): + shutil.copy( + os.path.join("packages-json", directory, "package.json"), + "package.json", + ) def remove_celery_files(): @@ -377,9 +382,14 @@ def main(): if "{{ cookiecutter.js_task_runner}}".lower() == "none": remove_gulp_files() - remove_packagejson_file() if "{{ cookiecutter.use_docker }}".lower() == "y": remove_node_dockerfile() + else: + if "{{ cookiecutter.custom_bootstrap_compilation }}".lower() == "y": + copy_package_json("custom-bs") + else: + copy_package_json("gulp") + remove_packages_json_dir() if "{{ cookiecutter.cloud_provider}}".lower() == "none": print( diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/packages-json/custom-bs/package.json similarity index 76% rename from {{cookiecutter.project_slug}}/package.json rename to {{cookiecutter.project_slug}}/packages-json/custom-bs/package.json index 6edf2e114..fe1640b44 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/packages-json/custom-bs/package.json @@ -3,13 +3,10 @@ "version": "{{ cookiecutter.version }}", "dependencies": {}, "devDependencies": { - {% if cookiecutter.js_task_runner == 'Gulp' -%} - {% if cookiecutter.custom_bootstrap_compilation == 'y' -%} "bootstrap": "4.3.1", "gulp-concat": "^2.6.1", "jquery": "3.3.1", "popper.js": "1.14.3", - {% endif -%} "autoprefixer": "^9.4.7", "browser-sync": "^2.14.0", "cssnano": "^4.1.10", @@ -21,7 +18,6 @@ "gulp-sass": "^4.0.2", "gulp-uglify-es": "^1.0.4", "pixrem": "^5.0.0" - {%- endif %} }, "engines": { "node": ">=8" @@ -30,9 +26,7 @@ "last 2 versions" ], "scripts": { - {% if cookiecutter.js_task_runner == 'Gulp' -%} "dev": "gulp", "build": "gulp generate-assets" - {%- endif %} } } diff --git a/{{cookiecutter.project_slug}}/packages-json/gulp/package.json b/{{cookiecutter.project_slug}}/packages-json/gulp/package.json new file mode 100644 index 000000000..b5cd6a794 --- /dev/null +++ b/{{cookiecutter.project_slug}}/packages-json/gulp/package.json @@ -0,0 +1,28 @@ +{ + "name": "{{cookiecutter.project_slug}}", + "version": "{{ cookiecutter.version }}", + "dependencies": {}, + "devDependencies": { + "autoprefixer": "^9.4.7", + "browser-sync": "^2.14.0", + "cssnano": "^4.1.10", + "gulp": "^4.0.0", + "gulp-imagemin": "^5.0.3", + "gulp-plumber": "^1.2.1", + "gulp-postcss": "^8.0.0", + "gulp-rename": "^1.2.2", + "gulp-sass": "^4.0.2", + "gulp-uglify-es": "^1.0.4", + "pixrem": "^5.0.0" + }, + "engines": { + "node": ">=8" + }, + "browserslist": [ + "last 2 versions" + ], + "scripts": { + "dev": "gulp", + "build": "gulp generate-assets" + } +}