leanweb 1.0.9 → 1.1.0

package/README.md

@@ -476,9 +476,7 @@ Assuming npm module `lodash-es` is installed, you could use any of the
 following `import` statements for your web component class:
 
 ```javascript
-import { get } from "lodash-es"; // find from node_modules
-import get from "lodash-es/get.js"; // find from node_modules
-import * as _ from "lodash-es"; // find from node_modules
+import get from "/node_modules/lodash-es/get.js"; // find from node_modules
 ```
 
 Importing a JSON file:
@@ -490,7 +488,7 @@ import someJSON from "./some.json";
 Importing CSS/SCSS:
 
 ```javascript
-import agate from "highlight.js/scss/agate.scss";
+import agate from "/node_modules/highlight.js/scss/agate.scss";
 
 // customElements.define('demo-root',
 //  class extends LWElement {  // LWElement extends HTMLElement

package/commands/build.js

@@ -11,39 +11,44 @@
       env = args[2];
    }
 
-   const replaceNodeModulesImport = (str, filePath) => {
-      // match import not starting with dot or slash
-      return str.replace(/^(\s*import.+?['"])([^\.|\/].+?)(['"].*)$/gm, (m, a, b, c) => {
-         if (b.startsWith(`~`)) {
-            // ~/package.json
-            return a + path.normalize(`${process.cwd()}/` + b.substring(1)) + c;
-         } else if (b.indexOf('/') > -1) {
-            // lodash-es/get.js
-            return a + path.normalize(`${process.cwd()}/node_modules/` + b) + c;
-         } else {
-            const nodeModulePath = `${process.cwd()}/node_modules/` + b + '/package.json';
-            const package = require(nodeModulePath);
-            // lodash-es
-            return a + path.normalize(`${process.cwd()}/node_modules/` + b + '/' + package.main) + c;
-         }
-      });
-   };
-
-   const walkDirSync = (dir, accept = null, callback) => {
-      fs.readdirSync(dir).forEach(f => {
-         let dirPath = path.join(dir, f);
-         const isDirectory = fs.statSync(dirPath).isDirectory() && (!accept || (typeof accept === 'function' && accept(dirPath, f)));
-         isDirectory ? walkDirSync(dirPath, accept, callback) : callback(path.join(dirPath));
-      });
-   };
-
-   const preprocessJsImport = filePath => {
-      if (filePath.toLowerCase().endsWith('.js') && !filePath.toLowerCase().endsWith('/ast.js') && !filePath.startsWith(`${utils.dirs.build}/lib/`)) {
-         let jsFileString = fs.readFileSync(filePath, 'utf8');
-         jsFileString = replaceNodeModulesImport(jsFileString, filePath);
-         fs.writeFileSync(filePath, jsFileString);
-      }
-   };
+   // const replaceNodeModulesImport = (str, filePath) => {
+   //    // match import not starting with dot or slash
+   //    return str.replace(/^([^\S\r\n]*(?:importScripts|import).+?['"])((?!\.|\/|http\:|https\:).*?)(['"].*)$/gm, (m, a, b, c) => {
+   //       if (b.startsWith(`~`)) {
+   //          // ~/package.json
+   //          return a + path.normalize(`${process.cwd()}/` + b.substring(1)) + c;
+   //       } else if (b.indexOf('/') > -1) {
+   //          // lodash-es/get.js
+   //          return a + path.normalize(`${process.cwd()}/node_modules/` + b) + c;
+   //       } else {
+   //          const nodeModulePath = `${process.cwd()}/node_modules/` + b + '/package.json';
+   //          const package = require(nodeModulePath);
+   //          // lodash-es
+   //          return a + path.normalize(`${process.cwd()}/node_modules/` + b + '/' + package.main) + c;
+   //       }
+   //    });
+   // };
+
+   // const walkDirSync = (dir, accept = null, callback) => {
+   //    fs.readdirSync(dir).forEach(f => {
+   //       let dirPath = path.join(dir, f);
+   //       const isDirectory = fs.statSync(dirPath).isDirectory() && (!accept || (typeof accept === 'function' && accept(dirPath, f)));
+   //       isDirectory ? walkDirSync(dirPath, accept, callback) : callback(path.join(dirPath));
+   //    });
+   // };
+
+   // const preprocessJsImport = filePath => {
+   //    if (
+   //       filePath.toLowerCase().endsWith('.js') &&
+   //       !filePath.toLowerCase().endsWith('/ast.js') &&
+   //       !filePath.startsWith(`${utils.dirs.build}/lib/`) &&
+   //       !filePath.startsWith(`${utils.dirs.build}/resources/`)
+   //    ) {
+   //       let jsFileString = fs.readFileSync(filePath, 'utf8');
+   //       jsFileString = replaceNodeModulesImport(jsFileString, filePath);
+   //       fs.writeFileSync(filePath, jsFileString);
+   //    }
+   // };
 
    const buildDirFilter = dirPath => {
       if (dirPath.startsWith(`${utils.dirs.build}/lib/`)) {
@@ -96,7 +101,7 @@
       };
 
       const buildJS = () => {
-         walkDirSync(buildDir, buildDirFilter, preprocessJsImport);
+         // walkDirSync(buildDir, buildDirFilter, preprocessJsImport);
 
          const jsString = project.components.reduce((acc, cur) => {
             const cmpName = utils.getComponentName(cur);

package/commands/dist.js

@@ -54,7 +54,7 @@ if (args.length >= 3) {
       fs.writeFileSync(`./${utils.dirs.dist}/${project.name}.css`, minifiedAppCss.styles);
 
       fse.copySync(`./${utils.dirs.build}/favicon.svg`, `./${utils.dirs.dist}/favicon.svg`);
-      project.resources.forEach(resource => {
+      project.resources?.forEach(resource => {
          fse.copySync(`./${utils.dirs.build}/${resource}`, `./${utils.dirs.dist}/${resource}`, { dereference: true });
       });
    });

package/commands/generate.js

@@ -44,7 +44,7 @@
       }
 
       if (!fs.existsSync(`${cmpPath}/${cmpName}.scss`)) {
-         fs.writeFileSync(`${cmpPath}/${cmpName}.scss`, '');
+         fs.writeFileSync(`${cmpPath}/${cmpName}.scss`, ':host {\n\tdisplay: inline-block;\n\tposition: relative;\n}');
       }
    }
 })();

package/commands/utils.js

@@ -80,7 +80,7 @@ module.exports.getWebPackConfig = (outputDir, project) => {
                }]
             },
          }, {
-            test: /\.(scss|sass)$/i,
+            test: /\.(scss|sass|css)$/i,
             use: [
                {
                   loader: require.resolve('css-loader'),

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "leanweb",
-   "version": "1.0.9",
+   "version": "1.1.0",
    "description": "Builds framework agnostic web components.",
    "bin": {
       "leanweb": "leanweb.js",
@@ -20,24 +20,24 @@
    "license": "MIT",
    "dependencies": {
       "@babel/core": "^7.16.7",
-      "@babel/parser": "^7.16.7",
-      "@babel/plugin-transform-runtime": "^7.16.7",
-      "@babel/preset-env": "^7.16.7",
+      "@babel/parser": "^7.16.8",
+      "@babel/plugin-transform-runtime": "^7.16.8",
+      "@babel/preset-env": "^7.16.8",
       "babel-loader": "^8.2.3",
       "clean-css": "^5.2.2",
       "css-loader": "^6.5.1",
       "fs-extra": "^10.0.0",
       "globby": "^11.0.4",
       "html-minifier": "^4.0.0",
-      "isomorphic-git": "^1.10.3",
+      "isomorphic-git": "^1.10.4",
       "json5-loader": "^4.0.1",
       "node-watch": "^0.7.2",
       "parse5": "^6.0.1",
       "raw-loader": "^4.0.2",
-      "sass": "^1.46.0",
+      "sass": "^1.48.0",
       "sass-loader": "^12.4.0",
       "semver": "^7.3.5",
-      "webpack": "^5.65.0",
-      "webpack-dev-server": "^4.7.2"
+      "webpack": "^5.66.0",
+      "webpack-dev-server": "^4.7.3"
    }
 }