mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-02-25 07:50:40 +03:00
Bump gulp from 4.0.2 to 5.0.0 (#4949)
This commit is contained in:
parent
c02a16d6bf
commit
0de4a2f6eb
|
@ -114,7 +114,7 @@ def remove_sass_files():
|
||||||
|
|
||||||
|
|
||||||
def remove_gulp_files():
|
def remove_gulp_files():
|
||||||
file_names = ["gulpfile.js"]
|
file_names = ["gulpfile.mjs"]
|
||||||
for file_name in file_names:
|
for file_name in file_names:
|
||||||
os.remove(file_name)
|
os.remove(file_name)
|
||||||
|
|
||||||
|
@ -179,7 +179,7 @@ def handle_js_runner(choice, use_docker, use_async):
|
||||||
remove_keys=["babel"],
|
remove_keys=["babel"],
|
||||||
scripts={
|
scripts={
|
||||||
"dev": "gulp",
|
"dev": "gulp",
|
||||||
"build": "gulp generate-assets",
|
"build": "gulp build",
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
remove_webpack_files()
|
remove_webpack_files()
|
||||||
|
|
|
@ -3,28 +3,33 @@
|
||||||
////////////////////////////////
|
////////////////////////////////
|
||||||
|
|
||||||
// Gulp and package
|
// Gulp and package
|
||||||
const { src, dest, parallel, series, watch } = require('gulp');
|
import { src, dest, parallel, series, task, watch } from 'gulp';
|
||||||
const pjson = require('./package.json');
|
import pjson from './package.json' with {type: 'json'};
|
||||||
|
|
||||||
// Plugins
|
// Plugins
|
||||||
const autoprefixer = require('autoprefixer');
|
import autoprefixer from 'autoprefixer';
|
||||||
const browserSync = require('browser-sync').create();
|
import browserSyncLib from 'browser-sync';
|
||||||
const concat = require('gulp-concat');
|
import concat from 'gulp-concat';
|
||||||
const tildeImporter = require('node-sass-tilde-importer');
|
import tildeImporter from 'node-sass-tilde-importer';
|
||||||
const cssnano = require('cssnano');
|
import cssnano from 'cssnano';
|
||||||
const imagemin = require('gulp-imagemin');
|
import imagemin from 'gulp-imagemin';
|
||||||
const pixrem = require('pixrem');
|
import pixrem from 'pixrem';
|
||||||
const plumber = require('gulp-plumber');
|
import plumber from 'gulp-plumber';
|
||||||
const postcss = require('gulp-postcss');
|
import postcss from 'gulp-postcss';
|
||||||
|
import rename from 'gulp-rename';
|
||||||
|
import gulpSass from 'gulp-sass';
|
||||||
|
import * as dartSass from 'sass';
|
||||||
|
import gulUglifyES from 'gulp-uglify-es';
|
||||||
|
import { spawn } from 'node:child_process';
|
||||||
|
|
||||||
|
const browserSync = browserSyncLib.create();
|
||||||
const reload = browserSync.reload;
|
const reload = browserSync.reload;
|
||||||
const rename = require('gulp-rename');
|
const sass = gulpSass(dartSass);
|
||||||
const sass = require('gulp-sass')(require('sass'));
|
const uglify = gulUglifyES.default;
|
||||||
const spawn = require('child_process').spawn;
|
|
||||||
const uglify = require('gulp-uglify-es').default;
|
|
||||||
|
|
||||||
// Relative paths function
|
// Relative paths function
|
||||||
function pathsConfig(appName) {
|
function pathsConfig() {
|
||||||
this.app = `./${pjson.name}`;
|
const appName = `./${pjson.name}`;
|
||||||
const vendorsRoot = 'node_modules';
|
const vendorsRoot = 'node_modules';
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
@ -32,13 +37,13 @@ function pathsConfig(appName) {
|
||||||
`${vendorsRoot}/@popperjs/core/dist/umd/popper.js`,
|
`${vendorsRoot}/@popperjs/core/dist/umd/popper.js`,
|
||||||
`${vendorsRoot}/bootstrap/dist/js/bootstrap.js`,
|
`${vendorsRoot}/bootstrap/dist/js/bootstrap.js`,
|
||||||
],
|
],
|
||||||
app: this.app,
|
app: appName,
|
||||||
templates: `${this.app}/templates`,
|
templates: `${appName}/templates`,
|
||||||
css: `${this.app}/static/css`,
|
css: `${appName}/static/css`,
|
||||||
sass: `${this.app}/static/sass`,
|
sass: `${appName}/static/sass`,
|
||||||
fonts: `${this.app}/static/fonts`,
|
fonts: `${appName}/static/fonts`,
|
||||||
images: `${this.app}/static/images`,
|
images: `${appName}/static/images`,
|
||||||
js: `${this.app}/static/js`,
|
js: `${appName}/static/js`,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -163,7 +168,7 @@ function watchPaths() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate all assets
|
// Generate all assets
|
||||||
const generateAssets = parallel(styles, scripts, vendorScripts, imgCompression);
|
const build = parallel(styles, scripts, vendorScripts, imgCompression);
|
||||||
|
|
||||||
// Set up dev environment
|
// Set up dev environment
|
||||||
{%- if cookiecutter.use_docker == 'n' %}
|
{%- if cookiecutter.use_docker == 'n' %}
|
||||||
|
@ -176,6 +181,6 @@ const dev = parallel(runServer, initBrowserSync, watchPaths);
|
||||||
const dev = parallel(initBrowserSync, watchPaths);
|
const dev = parallel(initBrowserSync, watchPaths);
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
exports.default = series(generateAssets, dev);
|
task('default', series(build, dev));
|
||||||
exports['generate-assets'] = generateAssets;
|
task('build', build);
|
||||||
exports['dev'] = dev;
|
task('dev', dev);
|
|
@ -13,7 +13,7 @@
|
||||||
"gulp-concat": "^2.6.1",
|
"gulp-concat": "^2.6.1",
|
||||||
"concurrently": "^9.0.0",
|
"concurrently": "^9.0.0",
|
||||||
"cssnano": "^7.0.0",
|
"cssnano": "^7.0.0",
|
||||||
"gulp": "^4.0.2",
|
"gulp": "^5.0.0",
|
||||||
"gulp-imagemin": "^7.1.0",
|
"gulp-imagemin": "^7.1.0",
|
||||||
"gulp-plumber": "^1.2.1",
|
"gulp-plumber": "^1.2.1",
|
||||||
"gulp-postcss": "^10.0.0",
|
"gulp-postcss": "^10.0.0",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user