Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ This repository now includes:
- Unit tests for filesystem utilities (`npm test`)
- CI workflow for typecheck + tests (GitHub Actions)
- Contributing and security documentation
- A single runtime architecture: setup always generates one `gulpfile.js` from user choices (no parallel dynamic task runtime)

---

Expand Down
110 changes: 0 additions & 110 deletions _gulp/combineTasks.ts

This file was deleted.

6 changes: 4 additions & 2 deletions _gulp/gulpSetup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { writeFile } from 'fs/promises';
import { copyVendorCSS, createProjectFiles, createProjectStructure } from './modules/fileSetup';
import { generateGulpfile } from './modules/gulpfileGenerator';
import { confirmProjectDeletion, promptUser } from './modules/setupQuestions';
import { assertUserChoices } from './modules/userChoicesValidation';
import { UserChoices } from './types';
import { deleteDirectory, fileExists } from './utils/fileSystem';
import { logger } from './utils/logger';
Expand All @@ -20,7 +21,8 @@ async function setup(): Promise<void> {
deleteDirectory('dist');
}

const choices: UserChoices = await promptUser();
const rawChoices = await promptUser();
const choices: UserChoices = assertUserChoices(rawChoices);

await writeFile('_gulp/user-choices.json', JSON.stringify(choices, null, 2));

Expand All @@ -32,7 +34,7 @@ async function setup(): Promise<void> {
logger.success('Setup complete. Gulpfile has been generated.');
logger.info('Starting development server...');

exec('yarn start', (error, stdout, stderr) => {
exec('npm start', (error, stdout, stderr) => {
if (error) {
logger.error(`Error: ${error.message}`);
return;
Expand Down
40 changes: 0 additions & 40 deletions _gulp/modules/buildEnvironment.ts

This file was deleted.

28 changes: 15 additions & 13 deletions _gulp/modules/fileSetup.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import { resolveProjectPaths } from './pathConfig';
import { UserChoices } from '../types';
import { copyFile, createDirectory, writeFile } from '../utils/fileSystem';

export function createProjectStructure(choices: UserChoices): void {
const paths = resolveProjectPaths(choices);

const dirs = [
'src',
`src/${choices.script === 'JavaScript' ? 'js' : 'ts'}`,
`src/${choices.style === 'Sass' ? 'sass/base' : 'scss/base'}`, // Updated path for base
`src/${choices.markup === 'HTML' ? 'html' : 'pug'}`,
`src/${paths.scriptFolder}`,
`src/${paths.styleBaseFolder}`,
`src/${paths.markupFolder}`,
'src/img',
'dist/css'
];
Expand All @@ -15,35 +18,34 @@ export function createProjectStructure(choices: UserChoices): void {
}

export function createProjectFiles(choices: UserChoices): void {
const scriptExt = choices.script === 'JavaScript' ? 'js' : 'ts';
const styleExt = choices.style === 'Sass' ? 'sass' : 'scss';
const paths = resolveProjectPaths(choices);

const scriptContent = choices.script === 'JavaScript'
? 'console.log("Hello, World!");'
: 'console.log("Hello, TypeScript!");';
writeFile(`src/${scriptExt}/main.${scriptExt}`, scriptContent);
writeFile(`src/${paths.scriptFolder}/main.${paths.scriptExtension}`, scriptContent);

let styleContent = `// Main ${choices.style} file\n`;
if (choices.addNormalize) styleContent += choices.style === 'Sass' ? "@import 'base/normalize'\n" : "@import 'base/normalize';\n";
if (choices.addReset) styleContent += choices.style === 'Sass' ? "@import 'base/reset'\n" : "@import 'base/reset';\n";
writeFile(`src/${styleExt}/main.${styleExt}`, styleContent);
writeFile(`src/${paths.styleFolder}/main.${paths.styleExtension}`, styleContent);

const markupContent = choices.markup === 'HTML' ? getHtmlTemplate() : getPugTemplate();
const markupFilePath = choices.markup === 'HTML' ? 'src/html/index.html' : 'src/pug/index.pug';

writeFile(markupFilePath, markupContent);
writeFile(`src/${paths.markupFolder}/index.${paths.markupExtension}`, markupContent);
writeFile('src/favicon.ico', '');
}

export function copyVendorCSS(choices: UserChoices): void {
const paths = resolveProjectPaths(choices);

const vendorFiles = [
{ type: 'Normalize', src: `_gulp/vendors/normalize.${choices.style === 'Sass' ? 'sass' : 'scss'}` },
{ type: 'Reset', src: `_gulp/vendors/reset.${choices.style === 'Sass' ? 'sass' : 'scss'}` }
{ type: 'Normalize', src: `_gulp/vendors/normalize.${paths.styleExtension}` },
{ type: 'Reset', src: `_gulp/vendors/reset.${paths.styleExtension}` }
];

vendorFiles.forEach(file => {
if (choices[`add${file.type}` as keyof UserChoices]) {
const dest = `src/${choices.style === 'Sass' ? 'sass/base' : 'scss/base'}/_${file.type.toLowerCase()}.${choices.style === 'Sass' ? 'sass' : 'scss'}`; // Save in base folder
const dest = `src/${paths.styleBaseFolder}/_${file.type.toLowerCase()}.${paths.styleExtension}`;
copyFile(file.src, dest);
}
});
Expand Down
113 changes: 3 additions & 110 deletions _gulp/modules/gulpfileGenerator.ts
Original file line number Diff line number Diff line change
@@ -1,115 +1,8 @@
import { UserChoices } from '../types';
import { writeFile } from '../utils/fileSystem';
import { buildGulpfileTemplate } from '../templates/gulpfile';

export function generateGulpfile(choices: UserChoices): void {
const gulpfileContent = `
const { src, dest, watch, series, parallel } = require('gulp');
const sass = require('gulp-sass')(require('sass'));
const autoprefixer = require('gulp-autoprefixer');
const cleanCSS = require('gulp-clean-css');
const browserify = require('browserify');
const babelify = require('babelify');
const source = require('vinyl-source-stream');
const buffer = require('vinyl-buffer');
const uglify = require('gulp-uglify');
const rename = require('gulp-rename');
const browserSync = require('browser-sync').create();
const imagemin = require('gulp-imagemin');
const del = require('del');
const plumber = require('gulp-plumber');
const sourcemaps = require('gulp-sourcemaps');
const gulpif = require('gulp-if');
const pug = ${choices.markup === 'Pug' ? "require('gulp-pug')" : 'null'};
const typescript = ${choices.script === 'TypeScript' ? "require('gulp-typescript')" : 'null'};
const tsify = ${choices.script === 'TypeScript' ? "require('tsify')" : 'null'};

const production = process.env.NODE_ENV === 'production';

async function clean() {
await del(['dist']);
}

function styles() {
return src('src/${choices.style.toLowerCase()}/**/*.${choices.style.toLowerCase()}')
.pipe(plumber())
.pipe(gulpif(!production, sourcemaps.init()))
.pipe(sass({ outputStyle: 'compressed' }).on('error', sass.logError))
.pipe(autoprefixer())
.pipe(cleanCSS())
.pipe(gulpif(!production, sourcemaps.write('.')))
.pipe(dest('dist/css'))
.pipe(browserSync.stream());
const gulpfileContent = buildGulpfileTemplate(choices);
writeFile('gulpfile.js', `${gulpfileContent}\n`);
}

function scripts() {
const b = browserify({
entries: 'src/${choices.script === 'TypeScript' ? 'ts' : 'js'}/main.${choices.script === 'TypeScript' ? 'ts' : 'js'}',
debug: !production,
})
.transform(babelify, {
presets: ['@babel/preset-env'],
extensions: ['.js', '.ts']
});

${choices.script === 'TypeScript' ? 'b.plugin(tsify);' : ''}

return b.bundle()
.pipe(source('main.js'))
.pipe(buffer())
.pipe(gulpif(!production, sourcemaps.init({ loadMaps: true })))
.pipe(dest('dist/js'))
.pipe(uglify())
.pipe(rename('main.min.js'))
.pipe(gulpif(!production, sourcemaps.write('.')))
.pipe(dest('dist/js'));
}

function markup() {
return src('src/${choices.markup === 'Pug' ? 'pug' : 'html'}/**/*.${choices.markup === 'Pug' ? 'pug' : 'html'}')
.pipe(plumber())
${choices.markup === 'Pug' ? '.pipe(pug())' : ''}
.pipe(dest('dist'));
}

function images() {
return src('src/img/**/*')
.pipe(imagemin())
.pipe(dest('dist/img'));
}

function serve(cb) {
browserSync.init({
server: {
baseDir: './dist'
},
open: true
});
cb();
}

function watchFiles(cb) {
watch('src/${choices.style.toLowerCase()}/**/*.${choices.style.toLowerCase()}', styles);
watch('src/${choices.script === 'TypeScript' ? 'ts' : 'js'}/**/*.${choices.script === 'TypeScript' ? 'ts' : 'js'}', series(scripts, reload));
watch('src/${choices.markup === 'Pug' ? 'pug' : 'html'}/**/*.${choices.markup === 'Pug' ? 'pug' : 'html'}', series(markup, reload));
watch('src/img/**/*', series(images, reload));
cb();
}

function reload(cb) {
browserSync.reload();
cb();
}

exports.clean = clean;
exports.styles = styles;
exports.scripts = scripts;
exports.markup = markup;
exports.images = images;
exports.watch = watchFiles;

exports.build = series(clean, parallel(styles, scripts, markup, images));
exports.default = series(clean, parallel(styles, scripts, markup, images), serve, watchFiles);
`;

writeFile('gulpfile.js', gulpfileContent);
}
Loading
Loading