sinto 1.8.0 → 1.8.1

package/README.md

@@ -55,11 +55,12 @@ This command is generate public directory from src directory.
 * sin init - Initilalize the project
 * sin serve - Start development server
 * sin build - Start public generation
+* sin rmno - Delete node_modules directory
 * sin api - Generate fake REST API with hai-server
 * sin webpack - Generate Webpack project
 * sin pup - Generate Puppeteer test with Mocha
-* sin rmno - Delete node_modules directory
-* sin ts - Generate tsconfig.json and add dependencies
+* sin addts - Generate tsconfig.json and add dependencies
+* sin ts - Initialize TypeScript Node.js project
 * sin web - Generate HTML and empty CSS files
 * sin esbuild - Generate esbuild project
 

package/gents/{tsPackageContent.js → contents/tsPackageContent.js}

@@ -17,6 +17,8 @@ const packageTsContent =
       "gulp": "^5.0.0",
       "gulp-clean-css": "^4.3.0",
       "gulp-concat": "^2.6.1",
+      "gulp-image": "^6.3.1",
+      "gulp-minify": "^3.1.0",
       "gulp-uglify": "^3.0.2",
       "gulp-replace": "^1.1.4",
       "gulp-typescript": "6.0.0-alpha.1"

package/gents/generators/genTsBsconfig.js

@@ -0,0 +1,13 @@
+
+const tsBsconfigContent = 
+{
+    server: [
+        "app",
+        "node_modules/bootstrap/dist/css",
+        "node_modules/bootstrap/dist/js"
+    ],
+    port: 3000,
+    watch: true
+};
+
+module.exports = tsBsconfigContent;

package/gents/generators/genTsGulpfile.js

@@ -1,18 +1,19 @@
 
 const tsGulfileContent = `
-import {src, dest, parallel} from 'gulp';
+import {src, dest, series} from 'gulp';
 import cleanCss from 'gulp-clean-css';
 import replace from 'gulp-replace';
 import concat from 'gulp-concat'
 import ts from 'gulp-typescript';
 import uglify from 'gulp-uglify';
+import minify from 'gulp-minify';
 
 import {create as bsCreate} from 'browser-sync';
 const browserSync = bsCreate();
  
 function genHTML(cb) {
-    src('src/**/*.html')
-    .pipe(dest('public'))
+    src('app/**/*.html')
+    .pipe(dest('dist'))
     cb();
 }
 
@@ -25,17 +26,36 @@ function streamTs(cb) {
   cb();
 }
 
+function minifyJS(cb) {
+  src([
+    'public/**/*.js', 
+    'node_modules/bootstrap/dist/js/bootstrap.js'
+  ])
+    .pipe(replace(/import .*/g, ''))
+    .pipe(replace(/export .*/g, ''))
+    .pipe(concat('app.js'))
+    .pipe(minify())
+    .pipe(dest('dist'));
+  cb();
+}
+
 function minifyCSS(cb) {
   src([
-    'src/**/*.css', 
+    'app/**/*.css', 
     'node_modules/bootstrap/dist/css/bootstrap.css'])
     .pipe(cleanCss())
-    .pipe(dest('public'));
+    .pipe(dest('dist'));
+  cb();
+}
+
+function copyImages(cb) {
+  src('app/assets/**/*')
+    .pipe(dest('dist/assets'));
   cb();
 }
 
 function build(cb) {
-  parallel(genHTML, streamTs, minifyCSS)(cb);
+  series(genHTML, streamTs, minifyJS, minifyCSS, copyImages)(cb);
 }
 
 export default build

package/gents/generators/genTsWeb.js

@@ -0,0 +1,44 @@
+const {debug} = require('../../config.json');
+const fsExtra = require('fs-extra');
+
+const defaultTsGulpfileContent = require('./genTsGulpfile');
+const defaultHtmlContent = require('../../genweb/generators/genHtml');
+const defaultTsBsconfigContent = require('./genTsBsconfig');
+const defaultTsPackageContent = require('../contents/tsPackageContent');
+
+const {
+  createDirectory, 
+  createFile,
+  createGulpfileJsFile,
+  createBsconfigFile,
+  createIndexHtmlFile,
+  createPackageJsonFile
+} = require('../../tools/tools');
+
+const outputDir = 'app';
+
+const createTsWeb = () => {
+  const dir = process.cwd();
+
+  createDirectory(`${dir}/src`);
+  createDirectory(`${dir}/${outputDir}`);
+  createDirectory(`${dir}/${outputDir}/assets`);
+
+  createFile(`${dir}/${outputDir}/style.css`, '');
+  
+  createFile(`${dir}/src/app.ts`, '');
+    
+  createFile(`${dir}/README.md`, '# Sinto Project');
+  
+  createPackageJsonFile(dir, defaultTsPackageContent);
+  createIndexHtmlFile(dir, outputDir, defaultHtmlContent);
+  createGulpfileJsFile(dir, defaultTsGulpfileContent);    
+  createBsconfigFile(dir, defaultTsBsconfigContent);
+
+
+  console.log('Base directories and files created.');
+};
+
+
+
+module.exports.createTsWeb = createTsWeb

package/gents/gents.js

@@ -1,15 +1,14 @@
 const {debug} = require('../config.json');
-const tsconfigContent = require('./tsconfigContent.js');
+const tsconfigContent = require('./contents/tsconfigContent.js');
 const { createFile } = require('../tools/tools.js');
 const jsonfile = require('jsonfile');
 const { addDevDep, addScript } = require('../tools/dep.js');
 const fs = require('fs');
-const { createWeb } = require('../genweb/genweb');
-const defaultTsPackageContent = require('./tsPackageContent.js');
+const { createTsWeb } = require('./generators/genTsWeb.js');
+const defaultTsPackageContent = require('./contents/tsPackageContent.js');
 
 const initTypescriptProject = async () => {
-  createWeb('ts');
-  createPackageJsonFile(process.cwd());
+  createTsWeb();
   writeConfigFile();
   showMsg();
 }
@@ -28,12 +27,4 @@ pnpm install
         `);
 }
 
-const createPackageJsonFile = (dir) => {
-  const packageJsonPath = `${dir}/package.json`;
-  jsonfile.writeFileSync(packageJsonPath, defaultTsPackageContent, { spaces: 2 });
-  if(debug) {
-      console.log('package.json file created.');
-  }        
-}
-
 module.exports.initTypescriptProject = initTypescriptProject;

package/genweb/genweb.js

@@ -1,79 +1,47 @@
 const {debug} = require('../config.json');
-const jsonfile = require('jsonfile');
 const fsExtra = require('fs-extra');
 
 const defaultPackageContent = require('../genweb/generators/genPackage');
 const defaultHtmlContent = require('../genweb/generators/genHtml');
 const defaultGulpfileContent = require('../genweb/generators/genGulpfile');
-const defaultTsGulpfileContent = require('../gents/generators/genTsGulpfile');
 const defaultBsconfigContent = require('../genweb/generators/genBsconfig');
 
-
 const {
     createDirectory, 
-    createFile
+    createFile,
+    createGulpfileJsFile,
+    createBsconfigFile,
+    createIndexHtmlFile,
+    createPackageJsonFile
   } = require('../tools/tools');
 
-const createWeb = (type) => {
-    const currentDirectory = process.cwd();
+const createWeb = () => {
+    const dir = process.cwd();
   
-    createDirectory(`${currentDirectory}/src`);
-    createDirectory(`${currentDirectory}/src/assets`);
+    createDirectory(`${dir}/src`);
+    createDirectory(`${dir}/src/assets`);
   
-    createFile(`${currentDirectory}/src/style.css`, '');
+    createFile(`${dir}/src/style.css`, '');
+
 
-    let content = '';
-    if(type === 'ts') {
-        createFile(`${currentDirectory}/src/app.ts`, '');
-        content = defaultTsGulpfileContent;
-    }else {
-        createFile(`${currentDirectory}/src/app.js`, '');
-        content = defaultGulpfileContent;
-    }
+    createFile(`${dir}/src/app.js`, '');
 
-    createFile(`${currentDirectory}/README.md`, '# Sinto Project');
+    createFile(`${dir}/README.md`, '# Sinto Project');
     
-    createPackageJsonFile(currentDirectory);
-    createIndexHtmlFile(currentDirectory);
-    createGulpfileJsFile(currentDirectory, content);    
-    createBsconfigFile(currentDirectory);
+    createPackageJsonFile(dir, defaultPackageContent);
+    createIndexHtmlFile(dir, 'src', defaultHtmlContent);
+    createGulpfileJsFile(dir, defaultGulpfileContent);    
+    createBsconfigFile(dir, defaultBsconfigContent);
   
     console.log('Base directories and files created.');
 };
 
-const createPackageJsonFile = (directory) => {
-  const packageJsonPath = `${directory}/package.json`;
-  jsonfile.writeFileSync(packageJsonPath, defaultPackageContent, { spaces: 2 });
-  if(debug) {
-      console.log('package.json file created.');
-  }        
-}
-
-const createIndexHtmlFile = (directory) => {
-  const indexHtmlPath = `${directory}/src/index.html`;
-  fsExtra.writeFileSync(indexHtmlPath, defaultHtmlContent);
-  if(debug)
-  console.log('index.html file created');
-}
 
-const createGulpfileJsFile = (directory, content) => {
-  const gulpfileJsPath = `${directory}/gulpfile.js`;
-  fsExtra.writeFileSync(gulpfileJsPath, content);
-  if(debug)
-  console.log('gulpfile.js file created.');
-}
 
 
 
-const createBsconfigFile = (directory) => {
-  const bsconfigPath = `${directory}/bs-config.json`;
-  jsonfile.writeFileSync(bsconfigPath, defaultBsconfigContent, { spaces: 2 });
-  if(debug)
-  console.log('bs-config.json file created.');
-}
 
 module.exports.createWeb = createWeb;
-module.exports.createPackageJsonFile = createPackageJsonFile;
-module.exports.createIndexHtmlFile = createIndexHtmlFile;
-module.exports.createGulpfileJsFile = createGulpfileJsFile;
-module.exports.createBsconfigFile = createBsconfigFile;
+// module.exports.createPackageJsonFile = createPackageJsonFile;
+// module.exports.createGulpfileJsFile = createGulpfileJsFile;
+// module.exports.createBsconfigFile = createBsconfigFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sinto",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Website project development manager",
   "bin": {
     "sin": "sin.js"

package/sin.js

@@ -18,7 +18,7 @@ const program = new Command();
 program
     .name('sin')
     .description('Project handler')
-    .version('1.8.0');
+    .version('1.8.1');
 
 program
     .command('init')

package/tools/tools.js

@@ -1,5 +1,6 @@
 const {debug} = require('../config.json');
 const fsExtra = require('fs-extra');
+const jsonfile = require('jsonfile');
 
 const createDirectory = (path) => {
     if (!fsExtra.existsSync(path)) {
@@ -13,5 +14,38 @@ const createFile = (path, content) => {
     }
 }
 
+const createGulpfileJsFile = (dir, content) => {
+    const gulpfileJsPath = `${dir}/gulpfile.js`;
+    fsExtra.writeFileSync(gulpfileJsPath, content);
+    if(debug)
+    console.log('gulpfile.js file created.');
+}
+
+const createBsconfigFile = (directory, content) => {
+    const bsconfigPath = `${directory}/bs-config.json`;
+    jsonfile.writeFileSync(bsconfigPath, content, { spaces: 2 });
+    if(debug)
+    console.log('bs-config.json file created.');
+}
+
+const createIndexHtmlFile = (dir, outputDir, content) => {
+    const indexHtmlPath = `${dir}/${outputDir}/index.html`;
+    fsExtra.writeFileSync(indexHtmlPath, content);
+    if(debug)
+    console.log('index.html file created');
+}
+
+const createPackageJsonFile = (directory, content) => {
+    const packageJsonPath = `${directory}/package.json`;
+    jsonfile.writeFileSync(packageJsonPath, content, { spaces: 2 });
+    if(debug) {
+        console.log('package.json file created.');
+    }        
+}
+
 module.exports.createDirectory = createDirectory;
 module.exports.createFile = createFile;
+module.exports.createGulpfileJsFile = createGulpfileJsFile;
+module.exports.createBsconfigFile = createBsconfigFile;
+module.exports.createIndexHtmlFile = createIndexHtmlFile;
+module.exports.createPackageJsonFile = createPackageJsonFile;