@ixon-cdk/core 1.2.0-next.4 → 1.2.0-next.6

package/meta-files.js

@@ -1,77 +1,73 @@
 const fs = require('fs');
+const fse = require('fs-extra');
 const path = require('path');
+const { watch } = require('chokidar');
 const { globSync } = require('glob');
 const { debounce, uniq } = require('lodash');
-const rimraf = require('rimraf');
+const { getRootDir } = require('./utils');
 
 const ICON_FILE_NAME = 'icon.svg';
 const MANIFEST_FILE_NAME = 'manifest.json';
 const WATCH_OPTIONS = {
-  cwd: require('./utils').getRootDir(),
+  cwd: getRootDir(),
   usePolling: process.platform !== 'darwin',
 };
 
 module.exports = {
   cleanDir(dir) {
-    if (fs.existsSync(dir)) {
-      rimraf.sync(dir);
-    }
-    fs.mkdirSync(dir, { recursive: true });
+    fse.emptyDirSync(dir);
   },
   copyAssets(assets, inputDir, outputDir) {
-    const paths = uniq([MANIFEST_FILE_NAME, ICON_FILE_NAME, ...assets]).map((asset) =>
-      path.join(inputDir, asset),
+    const paths = uniq([MANIFEST_FILE_NAME, ICON_FILE_NAME, ...assets]).map(
+      asset => path.join(inputDir, asset),
     );
-    paths.forEach((_path) => {
+    paths.forEach(_path => {
       const globFilePath = _path.replaceAll('\\', '/');
       globSync(globFilePath).forEach(file => {
-        const fileName = file.slice(inputDir.length + 1);
-        _copyFileNameFromToSync(fileName, inputDir, outputDir);
+        const filePath = file.slice(inputDir.length + 1);
+        _copyFromToSync(filePath, inputDir, outputDir);
       });
     });
   },
   watchAssets(assets, inputDir, outputDir) {
-    const root = require('./utils').getRootDir();
-    return require('chokidar')
-      .watch(
-        uniq([MANIFEST_FILE_NAME, ICON_FILE_NAME, ...assets]).map((asset) =>
-          path.join(inputDir, asset),
-        ),
-        WATCH_OPTIONS,
-      )
-      .on('all', (type, file) => {
-        const fileName = path.join(root, file).slice(inputDir.length + 1);
-        switch (type) {
-          case 'add':
-          case 'change':
-            _copyFileNameFromToSync(fileName, inputDir, outputDir);
-            break;
-          case 'unlink':
-            if (fs.existsSync(path.join(outputDir, fileName))) {
-              rimraf.sync(path.join(outputDir, fileName));
-            }
-            break;
-          default:
-            break;
-        }
-      });
+    const root = getRootDir();
+    return watch(
+      uniq([MANIFEST_FILE_NAME, ICON_FILE_NAME, ...assets]).map(asset =>
+        path.join(inputDir, asset),
+      ),
+      WATCH_OPTIONS,
+    ).on('all', (type, file) => {
+      const filePath = path.join(root, file).slice(inputDir.length + 1);
+      switch (type) {
+        case 'add':
+        case 'addDir':
+        case 'change':
+        case 'changeDir':
+          _copyFromToSync(filePath, inputDir, outputDir);
+          break;
+        case 'unlink':
+        case 'unlinkDir':
+          fse.removeSync(path.join(outputDir, filePath));
+          break;
+        default:
+          break;
+      }
+    });
   },
   watchInputDir(dir, watchCallback) {
     const _debouncedCallback = debounce(() => watchCallback(), 300);
-    require('chokidar')
-      .watch([`${dir}/**`], WATCH_OPTIONS)
-      .on('all', (_, _path) => {
-        if (
-          _path.endsWith(path.join(dir, MANIFEST_FILE_NAME)) ||
-          _path.endsWith(path.join(dir, ICON_FILE_NAME))
-        ) {
-          watchCallback(true);
-        } else {
-          _debouncedCallback();
-        }
-      });
+    watch([`${dir}/**`], WATCH_OPTIONS).on('all', (_, _path) => {
+      if (
+        _path.endsWith(path.join(dir, MANIFEST_FILE_NAME)) ||
+        _path.endsWith(path.join(dir, ICON_FILE_NAME))
+      ) {
+        watchCallback(true);
+      } else {
+        _debouncedCallback();
+      }
+    });
   },
-  writeDemoFile: function writeDemoFile(tag, outputDir, outputFile) {
+  writeDemoFile(tag, outputDir, outputFile) {
     const demoFileContent = `<meta charset="utf-8">\n<title>${tag} demo</title>\n<script src="./${path.basename(
       outputFile,
     )}"></script>\n\n\n<${tag}></${tag}>\n\n`;
@@ -82,18 +78,17 @@ module.exports = {
   },
 };
 
-function _copyFileNameFromToSync(fileName, sourceDir, destDir) {
-  const sourceFile = path.join(sourceDir, fileName);
+/**
+ * Copies an asset file or directory from the source directory to a destination directory.
+ *
+ * @param {String} filePath
+ * @param {String} sourceDir
+ * @param {String} destDir
+ */
+function _copyFromToSync(filePath, sourceDir, destDir) {
+  const sourceFile = path.join(sourceDir, filePath);
   if (fs.existsSync(sourceFile)) {
-    const destFile = path.join(destDir, fileName);
-    if (!fs.existsSync(destDir)) {
-      fs.mkdirSync(destDir, { recursive: true });
-    }
-    if (!fs.existsSync(path.dirname(path.join(destDir, fileName)))) {
-      fs.mkdirSync(path.dirname(path.join(destDir, fileName)), {
-        recursive: true,
-      });
-    }
-    fs.copyFileSync(sourceFile, destFile);
+    const destFile = path.join(destDir, filePath);
+    fse.copySync(sourceFile, destFile);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ixon-cdk/core",
-  "version": "1.2.0-next.4",
+  "version": "1.2.0-next.6",
   "description": "",
   "main": "index.js",
   "author": "",
@@ -14,12 +14,12 @@
     "cors": "^2.8.5",
     "crypto-js": "^4.1.1",
     "express": "^4.18.2",
+    "fs-extra": "^11.1.1",
     "glob": "^9.2.1",
     "livereload": "^0.9.3",
     "lodash": "^4.17.21",
     "opener": "^1.5.2",
     "prompts": "^2.4.2",
-    "rimraf": "^4.3.1",
     "yargs": "^17.7.1"
   }
 }

package/utils.js

@@ -1,4 +1,5 @@
 const fs = require('fs');
+const fse = require('fs-extra');
 const path = require('path');
 const chalk = require('chalk');
 const { globSync } = require('glob');
@@ -70,7 +71,7 @@ function zip(output, callback) {
   const zipFile = path.join(`${outputDir}.zip`);
   const stream = fs.createWriteStream(zipFile);
   stream.on('close', () => {
-    require('rimraf').sync(outputDir);
+    fse.removeSync(outputDir);
     callback(zipFile);
   });
   const archive = require('archiver')('zip', { zlib: { level: 9 } });