sinto 1.2.3 → 1.3.0

package/generators/genGulpfile.js

@@ -1,38 +1,48 @@
 
 const gulfileContent = `
-const { src, dest, series, parallel, watch } = require('gulp');
-const uglify = require('gulp-uglify');
-const cleanCss = require('gulp-clean-css');
-const browserSync = require('browser-sync').create();
+import {src, dest, parallel} from 'gulp';
+import cleanCss from 'gulp-clean-css';
+import replace from 'gulp-replace';
+import minify from 'gulp-minify';
+import concat from 'gulp-concat'
+
+import {create as bsCreate} from 'browser-sync';
+const browserSync = bsCreate();
  
 function genHTML(cb) {
-    console.log('HTML copying...');
     src('src/**/*.html')
+    .pipe(replace(/app.js/g, 'app-min.js'))
     .pipe(dest('public'))
     cb();
 }
  
 function minifyJS(cb) {
-  console.log('JavaScript minification ...');
-  src('src/**/*.js')
-    .pipe(uglify())
+  src([
+    'src/**/*.js', 
+    'node_modules/bootstrap/dist/js/bootstrap.js'
+  ])
+    .pipe(replace(/import .*/g, ''))
+    .pipe(replace(/export .*/g, ''))
+    .pipe(concat('app.js'))
+    .pipe(minify())
     .pipe(dest('public'));
   cb();
 }
- 
+
 function minifyCSS(cb) {
-  console.log('CSS minification ...');
-  src('src/**/*.css')
+  src([
+    'src/**/*.css', 
+    'node_modules/bootstrap/dist/css/bootstrap.css'])
     .pipe(cleanCss())
     .pipe(dest('public'));
   cb();
 }
- 
+
 function build(cb) {
   parallel(genHTML, minifyJS, minifyCSS)(cb);
 }
 
-exports.default = build;
+export default build
 
 `;
 

package/generators/genHtml.js

@@ -15,7 +15,7 @@ const htmlContent = `
       <h1>Sinto Project</h1>
       <p>This is a default index.html file, which was created by the sin command.</p>
     </div>
-    <script src="app.js"></script>
+    <script type="module" src="app.js"></script>
   </body>
 </html>
 

package/generators/genPackage.js

@@ -15,8 +15,11 @@ const packageContent =
       "browser-sync": "^3.0.2",
       "gulp": "^5.0.0",
       "gulp-clean-css": "^4.3.0",
-      "gulp-uglify": "^3.0.2"      
-    }
+      "gulp-concat": "^2.6.1",
+      "gulp-minify": "^3.1.0",
+      "gulp-replace": "^1.1.4"
+    },
+    "type": "module"
 }
 
 module.exports = packageContent;

package/gentest/generate.js

@@ -0,0 +1,16 @@
+const { createFile, createDirectory } = require('../tools/tools.js');
+const puppeteerTestContent = require('./testPupContent')
+
+const createPuppeteerTest = () => {    
+    const dir = process.cwd();
+    createDirectory(`${dir}/test`);
+    createFile(`${dir}/test/apptest.js`, puppeteerTestContent);
+    console.log('\n')
+    console.log('Install the dependencies:')
+    console.log('  npm install --save-dev puppeteer mocha')
+    console.log('Add start script to package.json:')
+    console.log('  \"test\": \"mocha\"')
+    console.log('\n')
+}
+
+module.exports.createPuppeteerTest = createPuppeteerTest;

package/gentest/testPupContent.js

@@ -0,0 +1,27 @@
+const puppeteerTestContent = `
+import puppeteer from 'puppeteer'
+import assert from 'assert'
+
+describe('Weblap tartalmának tesztelése', () => {
+    let browser;
+    let page;
+    before(async function () {
+        browser = await puppeteer.launch({headless: true})
+        page = await browser.newPage()
+        await page.goto('http://localhost:3000')        
+    })
+    after(async function() {
+        await browser.close()
+    })
+    it('Böngésző címsora', async function() {        
+        const title = await page.title()
+        assert.strictEqual(title, 'Sinto Project')
+    })
+    it('h1 tartalma', async function() {
+        const content = await page.$eval('h1', element => element.textContent)
+        assert.strictEqual(content, 'Sinto Project')                                     
+    })    
+})
+
+`
+module.exports = puppeteerTestContent

package/package.json

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

package/sin.js

@@ -7,6 +7,7 @@ const cli = require('./cli');
 const serve = require('./server');
 const { createApi } = require('./haiserver/apigen');
 const { createWebpack } = require('./webpack/generate');
+const { createPuppeteerTest } = require('./gentest/generate');
 
 const { 
   createDirectory, 
@@ -57,6 +58,7 @@ cli.command('build', 'Start build with gulp', {}, build);
 cli.command('rmno', 'Delete node_modules directory', {}, rmno);
 cli.command('api', 'REST API with hai-server', {}, createApi);
 cli.command('webpack', 'Webpack client', {}, createWebpack);
+cli.command('pup', 'Puppeteer test', {}, createPuppeteerTest);
 
 const main = () => {
   argv = cli.parse();