leanweb 2.0.0 → 2.0.2

package/commands/build.js

@@ -10,6 +10,7 @@ import fse from 'fs-extra';
 import { minify } from 'html-minifier';
 import * as utils from './utils.js';
 import * as parser from '../lib/lw-html-parser.js';
+import CleanCSS from 'clean-css';
 
 (async () => {
   let env;
@@ -27,12 +28,12 @@ import * as parser from '../lib/lw-html-parser.js';
     fs.mkdirSync(utils.dirs.build, { recursive: true });
 
     const copySrc = () => {
-      fse.copySync(`${projectPath}/${utils.dirs.src}/`, utils.dirs.build, { filter: utils.copySymbolLinkFilter });
+      fse.copySync(`${projectPath}/${utils.dirs.src}/`, utils.dirs.build, { filter: utils.copyFilter });
     };
 
     const copyEnv = () => {
       if (env) {
-        fse.copySync(`${utils.dirs.build}/env/${env}.js`, `${utils.dirs.build}/env.js`);
+        fse.copySync(`${utils.dirs.build}/env/${env}.js`, `${utils.dirs.build}/env.js`, { filter: utils.copyFilter });
       }
     };
 
@@ -42,7 +43,7 @@ import * as parser from '../lib/lw-html-parser.js';
         let importString = `import './components/${cur}/${cmpName}.js';`;
         return acc + importString + '\n';
       }, '');
-      fs.writeFileSync(`${utils.dirs.build}/${project.name}.js`, jsString);
+      utils.writeIfChanged(`${utils.dirs.build}/${project.name}.js`, jsString);
     };
 
     const buildHTML = () => {
@@ -60,7 +61,6 @@ import * as parser from '../lib/lw-html-parser.js';
             scssString += '\n[lw-false],[lw-for]{display:none !important;}\n';
             cssString = utils.buildCSS(scssString, utils.dirs.build, `${utils.dirs.build}/components/${cmp}`);
           }
-          const styleString = cssString || '';
           const htmlString = fs.readFileSync(htmlFilename, 'utf8');
           const minifiedHtml = minify(htmlString, {
             caseSensitive: true,
@@ -70,11 +70,12 @@ import * as parser from '../lib/lw-html-parser.js';
             removeComments: true,
           });
           const ast = parser.parse(minifiedHtml);
-          ast.css = styleString;
+          const minifiedCss = new CleanCSS({}).minify(cssString ?? '');
+          ast.css = minifiedCss.styles ?? '';
           ast.componentFullName = project.name + '-' + cmp.replace(/\//g, '-');
           ast.runtimeVersion = project.version;
           ast.builderVersion = leanwebPackageJSON.version;
-          fs.writeFileSync(`${utils.dirs.build}/components/${cmp}/ast.js`, `export default ${JSON.stringify(ast, null, 0)};`);
+          utils.writeIfChanged(`${utils.dirs.build}/components/${cmp}/ast.js`, `export default ${JSON.stringify(ast, null, 0)};`);
         }
       });
     };
@@ -86,7 +87,7 @@ import * as parser from '../lib/lw-html-parser.js';
         const projectScssString = fs.readFileSync(projectScssFilename, 'utf8');
         projectCssString += utils.buildCSS(projectScssString, utils.dirs.build);
       }
-      fs.writeFileSync(`${utils.dirs.build}/${project.name}.css`, projectCssString);
+      utils.writeIfChanged(`${utils.dirs.build}/${project.name}.css`, projectCssString);
     };
 
     copySrc();

package/commands/clean.js

@@ -4,5 +4,4 @@ import * as utils from './utils.js';
 (async () => {
   fs.rmSync(utils.dirs.build + '/', { recursive: true, force: true });
   fs.rmSync(utils.dirs.dist + '/', { recursive: true, force: true });
-  fs.rmSync(utils.dirs.serve + '/', { recursive: true, force: true });
 })();

package/commands/destroy.js

@@ -8,7 +8,7 @@ import * as utils from './utils.js';
   const args = process.argv;
   if (args.length < 3) {
     console.log('Usage: lw destroy project-name');
-    console.log(`This will delete ${utils.dirs.src}/ ${utils.dirs.build}/ ${utils.dirs.dist}/ and ${utils.dirs.serve}/`)
+    console.log(`This will delete ${utils.dirs.src}/ ${utils.dirs.build}/ and ${utils.dirs.dist}/.`);
     return;
   }
 
@@ -24,5 +24,4 @@ import * as utils from './utils.js';
   fs.rmSync(utils.dirs.build + '/', { recursive: true, force: true });
   fs.rmSync(utils.dirs.dist + '/', { recursive: true, force: true });
   fs.rmSync(utils.dirs.src + '/', { recursive: true, force: true });
-  fs.rmSync(utils.dirs.serve + '/', { recursive: true, force: true });
 })();

package/commands/dist.js

@@ -15,6 +15,8 @@ if (args.length >= 3) {
   env = args[2];
 }
 
+const verbose = process.env.verbose || false;
+
 (async () => {
   const project = require(`${process.cwd()}/${utils.dirs.src}/leanweb.json`);
 
@@ -22,12 +24,19 @@ if (args.length >= 3) {
   await utils.exec(`npx leanweb build ${env}`);
 
   fs.mkdirSync(utils.dirs.dist, { recursive: true });
-  esbuild.build({
+  const result = await esbuild.build({
     entryPoints: [`./${utils.dirs.build}/${project.name}.js`],
     bundle: true,
+    minify: true,
+    sourcemap: true,
     format: 'esm',
     outfile: `./${utils.dirs.dist}/${project.name}.js`,
-  }).catch(() => process.exit(1))
+    metafile: !!verbose,
+  });
+  if (verbose) {
+    const text = await esbuild.analyzeMetafile(result.metafile);
+    console.log(text);
+  }
 
   const indexHTML = fs.readFileSync(`./${utils.dirs.build}/index.html`, 'utf8');
   const minifiedIndexHtml = minify(indexHTML, {

package/commands/init.js

@@ -74,9 +74,9 @@ import * as utils from './utils.js';
     await git.init({ fs, dir: process.cwd() });
 
     if (fs.existsSync(`${process.cwd()}/.gitignore`) && fs.statSync(`${process.cwd()}/.gitignore`).isFile()) {
-      fs.appendFileSync(`${process.cwd()}/.gitignore`, `\n${utils.dirs.build}/\n${utils.dirs.dist}/\n${utils.dirs.serve}/\n`, 'utf8');
+      fs.appendFileSync(`${process.cwd()}/.gitignore`, `\n${utils.dirs.build}/\n${utils.dirs.dist}/\n`, 'utf8');
     } else {
-      fs.writeFileSync(`${process.cwd()}/.gitignore`, `${utils.dirs.build}/\n${utils.dirs.dist}/\n${utils.dirs.serve}/\n`, 'utf8');
+      fs.writeFileSync(`${process.cwd()}/.gitignore`, `${utils.dirs.build}/\n${utils.dirs.dist}/\n`, 'utf8');
     }
 
     const paths = await globby(['./**', './**/.*'], { gitignore: true });

package/commands/serve.js

@@ -24,20 +24,7 @@ const noopen = process.env.noopen || false;
 
   const build = async (eventType, filename) => {
     // console.log(eventType + ': ', filename);
-    try {
-      await utils.exec(`npx leanweb build ${env}`);
-      fse.copySync(`./${utils.dirs.build}/index.html`, `./${utils.dirs.serve}/index.html`);
-      fse.copySync(`./${utils.dirs.build}/${project.name}.css`, `./${utils.dirs.serve}/${project.name}.css`);
-      fse.copySync(`./${utils.dirs.build}/favicon.svg`, `./${utils.dirs.serve}/favicon.svg`);
-      project.resources?.forEach(resource => {
-        const source = `./${utils.dirs.build}/${resource}`;
-        if (fs.existsSync(source)) {
-          fse.copySync(source, `./${utils.dirs.serve}/${resource}`, { filter: utils.copySymbolLinkFilter });
-        }
-      });
-    } catch (e) {
-      console.error(e);
-    }
+    await utils.exec(`npx leanweb build ${env}`);
   };
 
   const throttledBuild = utils.throttle(build);
@@ -54,7 +41,7 @@ const noopen = process.env.noopen || false;
     open: !noopen,
     file: 'index.html',
     wait: 1000,
-    logLevel: 0,
+    logLevel: 1,
   };
   liveServer.start(params);
 })();

package/commands/utils.js

@@ -2,6 +2,7 @@ import { execSync } from 'child_process';
 import sass from 'sass';
 import path from 'path';
 import net from 'net';
+import fs from 'fs';
 import fse from 'fs-extra';
 
 export const dirs = {
@@ -11,11 +12,30 @@ export const dirs = {
   dist: 'dist',
 };
 
-export const copySymbolLinkFilter = (src, dest) => {
+export const copyFilter = (src, dest) => {
+  const srcStats = fse.existsSync(src) && fse.lstatSync(src);
   const destStats = fse.existsSync(dest) && fse.lstatSync(dest);
+  if (srcStats?.isFile?.() && destStats?.isFile?.()) {
+    const srcBuf = fs.readFileSync(src);
+    const destBuf = fs.readFileSync(dest);
+    if (srcBuf.equals(destBuf)) {
+      return false;
+    }
+  }
   return !destStats?.isSymbolicLink?.();
 };
 
+export const writeIfChanged = (file, string) => {
+  const stats = fse.existsSync(file) && fse.lstatSync(file);
+  if (stats?.isFile?.()) {
+    const data = fs.readFileSync(file, 'utf8');
+    if (data === string) {
+      return;
+    }
+  }
+  fs.writeFileSync(file, string);
+}
+
 export const exec = command => execSync(command, { encoding: 'utf8', stdio: 'inherit' });
 
 export const buildCSS = (scssString, ...currentPaths) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leanweb",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Builds framework agnostic web components.",
   "bin": {
     "leanweb": "leanweb.js",
@@ -33,4 +33,4 @@
     "sass": "^1.56.1",
     "semver": "^7.3.8"
   }
-}
+}