browsertime 16.16.0 → 17.0.0-beta.0

package/lib/support/fileUtil.js

@@ -1,72 +1,85 @@
-'use strict';
-const fs = require('fs');
-const path = require('path');
-const { promisify } = require('util');
-const readdir = promisify(fs.readdir);
-const lstat = promisify(fs.lstat);
-const unlink = promisify(fs.unlink);
-const rmdir = promisify(fs.rmdir);
-const copyFile = promisify(fs.copyFile);
-const rename = promisify(fs.rename);
-const readFile = promisify(fs.readFile);
-const filters = require('./filters');
-const log = require('intel').getLogger('browsertime');
+import { join } from 'node:path';
+import { promisify } from 'node:util';
+import {
+  readdir as _readdir,
+  lstat as _lstat,
+  unlink as _unlink,
+  rmdir as _rmdir,
+  copyFile as _copyFile,
+  rename as _rename,
+  readFile as _readFile,
+  copyFileSync as _copyFileSync,
+  unlinkSync as _unlinkSync
+} from 'node:fs';
+import intel from 'intel';
+import { onlyFiles, onlyWithExtension } from './filters.js';
+const readdir = promisify(_readdir);
+const lstat = promisify(_lstat);
+const unlink = promisify(_unlink);
+const rmdir = promisify(_rmdir);
+const copyFile2 = promisify(_copyFile);
+const rename2 = promisify(_rename);
+const readFile2 = promisify(_readFile);
+const log = intel.getLogger('browsertime');
 
-module.exports = {
-  async rename(old, newName) {
-    return rename(old, newName);
-  },
-  async copyFile(source, destination) {
-    return copyFile(source, destination);
-  },
-  async removeFile(fileName) {
-    return unlink(fileName);
-  },
-  async readFile(fileName) {
-    return readFile(fileName);
-  },
-  async removeDirAndFiles(dirName) {
-    const removeDir = async dir => {
-      try {
-        const files = await readdir(dir);
-        await Promise.all(
-          files.map(async file => {
-            try {
-              const p = path.join(dir, file);
-              const stat = await lstat(p);
-              if (stat.isDirectory()) {
-                await removeDir(p);
-              } else {
-                await unlink(p);
-              }
-            } catch (err) {
-              log.error('Could not remove file:' + file, err);
-            }
-          })
-        );
-        await rmdir(dir);
-      } catch (err) {
-        log.error('Could not remove dir:' + dir, err);
-      }
-    };
-    return removeDir(dirName);
-  },
-  async removeByType(dir, type) {
-    const fileNames = await readdir(dir);
-    const filePaths = fileNames
-      .map(fileName => path.join(dir, fileName))
-      .filter(filters.onlyFiles)
-      .filter(filters.onlyWithExtension('.' + type));
+export async function rename(old, newName) {
+  return rename2(old, newName);
+}
 
-    for (const filePath of filePaths) {
-      await unlink(filePath);
+export function copyFileSync(source, destination) {
+  return _copyFileSync(source, destination);
+}
+
+export async function removeFileSync(fileName) {
+  return _unlinkSync(fileName);
+}
+
+export async function copyFile(source, destination) {
+  return copyFile2(source, destination);
+}
+export async function removeFile(fileName) {
+  return unlink(fileName);
+}
+export async function readFile(fileName) {
+  return readFile2(fileName);
+}
+export async function removeDirAndFiles(dirName) {
+  const removeDir = async dir => {
+    try {
+      const files = await readdir(dir);
+      await Promise.all(
+        files.map(async file => {
+          try {
+            const p = join(dir, file);
+            const stat = await lstat(p);
+            await (stat.isDirectory() ? removeDir(p) : unlink(p));
+          } catch (error) {
+            log.error('Could not remove file:' + file, error);
+          }
+        })
+      );
+      await rmdir(dir);
+    } catch (error) {
+      log.error('Could not remove dir:' + dir, error);
     }
-  },
-  async findFiles(dir, filter) {
-    const fileNames = await readdir(dir);
-    const filePaths = fileNames.filter(fileName => {
-      return fileName.indexOf(filter) >= 0;
-    });
-    return filePaths;
+  };
+  return removeDir(dirName);
+}
+export async function removeByType(dir, type) {
+  const fileNames = await readdir(dir);
+  const filePaths = fileNames
+    .map(fileName => join(dir, fileName))
+    .filter(element => onlyFiles(element))
+    .filter(onlyWithExtension('.' + type));
+
+  for (const filePath of filePaths) {
+    await unlink(filePath);
   }
-};
+}
+export async function findFiles(dir, filter) {
+  const fileNames = await readdir(dir);
+  const filePaths = fileNames.filter(fileName => {
+    return fileName.includes(filter);
+  });
+  return filePaths;
+}

package/lib/support/filters.js

@@ -1,24 +1,19 @@
-'use strict';
-
-const { promisify } = require('util');
-const fs = require('fs');
-const path = require('path');
-
-const stat = promisify(fs.stat);
+import { promisify } from 'node:util';
+import { stat as _stat } from 'node:fs';
+import { extname } from 'node:path';
+const stat = promisify(_stat);
 
 /**
  * Filters to use with Array.prototype.filter, e.g. ['/a/path', '/another/path'].filter(onlyFiles)
  */
-module.exports = {
-  onlyWithExtension(ext) {
-    return filepath => path.extname(filepath) === ext;
-  },
-  async onlyFiles(filepath) {
-    const stats = await stat(filepath);
-    return stats.isFile();
-  },
-  async onlyDirectories(filepath) {
-    const stats = await stat(filepath);
-    return stats.isDirectory();
-  }
-};
+export function onlyWithExtension(extension) {
+  return filepath => extname(filepath) === extension;
+}
+export async function onlyFiles(filepath) {
+  const stats = await stat(filepath);
+  return stats.isFile();
+}
+export async function onlyDirectories(filepath) {
+  const stats = await stat(filepath);
+  return stats.isDirectory();
+}

package/lib/support/getViewPort.js

@@ -1,8 +1,7 @@
-'use strict';
-
-const get = require('lodash.get');
-const { isAndroidConfigured } = require('../android');
-const log = require('intel').getLogger('browsertime');
+import get from 'lodash.get';
+import intel from 'intel';
+import { isAndroidConfigured } from '../android/index.js';
+const log = intel.getLogger('browsertime');
 
 // Most use screen size as of 2018
 // https://www.w3schools.com/browsers/browsers_display.asp
@@ -30,7 +29,7 @@ const sizeMap = {
   'Samsung Galaxy S8+': '412x846'
 };
 
-module.exports = function (options) {
+export default function (options) {
   // you cannot set the width/height for phone so just keep the viewport undefined
   if (isAndroidConfigured(options)) {
     return;
@@ -64,4 +63,4 @@ module.exports = function (options) {
   }
 
   return DEFAULT_VIEWPORT;
-};
+}