Update deps, convert to ESM

pepelsbey · pepelsbey · commit f80d70f8bd96 · 2026-03-04T21:26:26.000+02:00
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/bin/cli.js b/bin/cli.js
@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require('../core/index')
+import '../core/index.js'
diff --git a/core/command/__tests__/archive.test.js b/core/command/__tests__/archive.test.js
@@ -1,4 +1,4 @@
-const { handler: archive, messages } = require('../archive')
+import { handler as archive, messages } from '../archive.js'
 
 it('Must be function', () => {
   expect(typeof archive).toBe('function')
diff --git a/core/command/__tests__/bundle.test.js b/core/command/__tests__/bundle.test.js
@@ -1,4 +1,4 @@
-const { handler: bundle, messages } = require('../bundle')
+import { handler as bundle, messages } from '../bundle.js'
 
 it('Must be function', () => {
   expect(typeof bundle).toBe('function')
diff --git a/core/command/__tests__/create.test.js b/core/command/__tests__/create.test.js
@@ -1,4 +1,4 @@
-const { handler: create, messages } = require('../create')
+import { handler as create, messages } from '../create.js'
 
 it('Must be function', () => {
   expect(typeof create).toBe('function')
diff --git a/core/command/__tests__/pdf.test.js b/core/command/__tests__/pdf.test.js
@@ -1,4 +1,4 @@
-const { handler: pdf, messages } = require('../pdf')
+import { handler as pdf, messages } from '../pdf.js'
 
 it('Must be function', () => {
   expect(typeof pdf).toBe('function')
diff --git a/core/command/__tests__/publish.test.js b/core/command/__tests__/publish.test.js
@@ -1,4 +1,4 @@
-const { handler: publish, messages } = require('../publish')
+import { handler as publish, messages } from '../publish.js'
 
 it('Must be function', () => {
   expect(typeof publish).toBe('function')
diff --git a/core/command/__tests__/serve.test.js b/core/command/__tests__/serve.test.js
@@ -1,4 +1,4 @@
-const { handler: serve } = require('../serve')
+import { handler as serve } from '../serve.js'
 
 it('Must be function', () => {
   expect(typeof serve).toBe('function')
diff --git a/core/command/archive.js b/core/command/archive.js
@@ -1,8 +1,8 @@
-const vfs = require('vinyl-fs')
-const zip = require('gulp-zip')
-const chalk = require('chalk')
+import vfs from 'vinyl-fs'
+import zip from 'gulp-zip'
+import chalk from 'chalk'
 
-const { loadPresentationFiles } = require('../lib/presentation')
+import { loadPresentationFiles } from '../lib/presentation.js'
 
 function handler ({ output, files }) {
   const stream = loadPresentationFiles(files)
@@ -41,4 +41,4 @@ function messages ({ output }) {
   }
 }
 
-module.exports = { handler, builder, messages }
+export { handler, builder, messages }
diff --git a/core/command/bundle.js b/core/command/bundle.js
@@ -1,16 +1,16 @@
-const vfs = require('vinyl-fs')
-const chalk = require('chalk')
-const path = require('path')
-const del = require('del')
+import vfs from 'vinyl-fs'
+import chalk from 'chalk'
+import path from 'node:path'
+import { deleteSync } from 'del'
 
-const { loadPresentationFiles } = require('../lib/presentation')
+import { loadPresentationFiles } from '../lib/presentation.js'
 
 function handler ({ cwd, output, files }) {
   if (!path.isAbsolute(output)) {
     output = path.join(cwd, output)
   }
 
-  del.sync([output])
+  deleteSync([output])
 
   const stream = loadPresentationFiles(files)
     .pipe(vfs.dest(output))
@@ -47,4 +47,4 @@ function messages ({ output }) {
   }
 }
 
-module.exports = { handler, builder, messages }
+export { handler, builder, messages }
diff --git a/core/command/create.js b/core/command/create.js
@@ -1,14 +1,19 @@
-const fs = require('fs')
-const del = require('del')
-const path = require('path')
-const chalk = require('chalk')
-const Listr = require('listr')
-const vfs = require('vinyl-fs')
-const inquirer = require('inquirer')
-const { promisify } = require('util')
-const template = require('gulp-template')
-
-const { installDependencies } = require('../lib/npm')
+import fs from 'node:fs'
+import path from 'node:path'
+import { promisify } from 'node:util'
+import { dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+import { deleteAsync } from 'del'
+import chalk from 'chalk'
+import Listr from 'listr'
+import vfs from 'vinyl-fs'
+import inquirer from 'inquirer'
+import template from 'gulp-template'
+
+import { installDependencies } from '../lib/npm.js'
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
 
 async function handler ({ cwd, directory: folderName = 'slides', yes: isDefault }) {
   // Let's check if such folder exists
@@ -23,7 +28,7 @@ async function handler ({ cwd, directory: folderName = 'slides', yes: isDefault
     })
 
     if (isForce) {
-      await del([directory])
+      await deleteAsync([directory])
     } else {
       process.stdout.write(chalk.red(`\n Creating aborted\n`))
 
@@ -118,4 +123,4 @@ function messages ({ directory: folderName = 'slides' }) {
   }
 }
 
-module.exports = { handler, builder, messages }
+export { handler, builder, messages }
diff --git a/core/command/pdf.js b/core/command/pdf.js
@@ -1,14 +1,13 @@
-const chalk = require('chalk')
-const puppeteer = require('puppeteer-core')
-const { getPlatform } = require('chrome-launcher/dist/utils.js')
-const chromeFinder = require('chrome-launcher/dist/chrome-finder.js')
+import chalk from 'chalk'
+import puppeteer from 'puppeteer-core'
+import { getPlatform } from 'chrome-launcher/dist/utils.js'
+import * as chromeFinder from 'chrome-launcher/dist/chrome-finder.js'
 
 function evalCalcExpression (value) {
   const expression = value
     .replace(/calc/g, '')
     .replace(/px/g, '')
 
-  // eslint-disable-next-line no-eval
   return eval(expression) + 'px'
 }
 
@@ -23,9 +22,9 @@ async function handler ({ cwd, output }) {
   await page.goto(`file://${cwd}/index.html`)
 
   const [width, height] = await page.evaluate(async () => {
-    const container = document.querySelector('.shower')
+    const container = document.querySelector('.shower') // eslint-disable-line no-undef
 
-    const styles = window.getComputedStyle(container)
+    const styles = window.getComputedStyle(container) // eslint-disable-line no-undef
 
     return [
       styles.getPropertyValue('--slide-width'),
@@ -61,4 +60,4 @@ function messages ({ output }) {
   }
 }
 
-module.exports = { handler, builder, messages }
+export { handler, builder, messages }
diff --git a/core/command/publish.js b/core/command/publish.js
@@ -1,9 +1,9 @@
-const tmp = require('tmp')
-const vfs = require('vinyl-fs')
-const pages = require('gh-pages')
-const { promisify } = require('util')
+import tmp from 'tmp'
+import vfs from 'vinyl-fs'
+import pages from 'gh-pages'
+import { promisify } from 'node:util'
 
-const { loadPresentationFiles } = require('../lib/presentation')
+import { loadPresentationFiles } from '../lib/presentation.js'
 
 function handler ({ files }) {
   let tempDirPath = null
@@ -58,4 +58,4 @@ function messages () {
   }
 }
 
-module.exports = { handler, builder, messages }
+export { handler, builder, messages }
diff --git a/core/command/serve.js b/core/command/serve.js
@@ -1,4 +1,4 @@
-const { create } = require('browser-sync')
+import { create } from 'browser-sync'
 
 function handler ({ cwd, port, open, ui, notify }) {
   const bs = create()
@@ -58,4 +58,4 @@ function messages () {
   return {}
 }
 
-module.exports = { handler, builder, messages }
+export { handler, builder, messages }
diff --git a/core/index.js b/core/index.js
@@ -1,7 +1,12 @@
-const chalk = require('chalk')
-const semver = require('semver')
+import { readFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 
-const pkg = require('../package.json')
+import chalk from 'chalk'
+import semver from 'semver'
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+const pkg = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf-8'))
 
 process.title = pkg.name
 
@@ -17,14 +22,17 @@ if (!semver.satisfies(process.version, pkg.engines.node)) {
   process.exit(1)
 }
 
-const app = require('yargs')
-const Listr = require('listr')
-const updateNotifier = require('update-notifier')
+import yargs from 'yargs'
+import { hideBin } from 'yargs/helpers'
+import Listr from 'listr'
+import updateNotifier from 'update-notifier'
+
+import { getEnv } from './lib/env.js'
 
 // Warn the user about new versions
 updateNotifier({ pkg }).notify()
 
-const { getEnv } = require('./lib/env')
+const app = yargs(hideBin(process.argv))
 
 app.strict()
 app.locale('en')
@@ -106,14 +114,14 @@ function lazyLoadCommand (id) {
     aliases: command.aliases,
     describe: chalk.yellow(command.describe),
 
-    builder (...args) {
-      const { builder } = require(`./command/${id}.js`)
+    async builder (...args) {
+      const { builder } = await import(`./command/${id}.js`)
 
       return builder.call(this, ...args)
     },
 
     async handler (options) {
-      const { handler, messages } = require(`./command/${id}.js`)
+      const { handler, messages } = await import(`./command/${id}.js`)
       const { start, end } = messages(options)
 
       if (start) {
@@ -138,7 +146,7 @@ for (const commandID in commandsList) {
   app.command(lazyLoadCommand(commandID))
 }
 
-app.argv // eslint-disable-line no-unused-expressions
+app.parse()
 
 if (!process.argv.slice(2).length) {
   app.showHelp()
diff --git a/core/lib/env.js b/core/lib/env.js
@@ -1,5 +1,5 @@
-const fs = require('fs')
-const { resolve } = require('path')
+import fs from 'node:fs'
+import { resolve } from 'node:path'
 
 /**
  * @typedef {Object} ProjectConfig
@@ -32,4 +32,4 @@ function findProject (cwd) {
   return project
 }
 
-module.exports = { getEnv: findProject }
+export { findProject as getEnv }
diff --git a/core/lib/npm.js b/core/lib/npm.js
@@ -1,4 +1,4 @@
-const execa = require('execa')
+import { execa } from 'execa'
 
 /**
  * Install node modules synchronously and save to dependencies in package.json
@@ -7,7 +7,7 @@ const execa = require('execa')
  * @param {string} mode Type package installing
  * @returns {void}
  */
-module.exports.installDependencies = async function installDevDependencies (cwd, packages, mode = 'save') {
+export async function installDependencies (cwd, packages, mode = 'save') {
   packages = Array.isArray(packages) ? packages : [packages]
 
   try {
diff --git a/core/lib/presentation.js b/core/lib/presentation.js
@@ -1,7 +1,7 @@
-const vfs = require('vinyl-fs')
-const merge = require('merge-stream')
-const rename = require('gulp-rename')
-const replace = require('gulp-replace')
+import vfs from 'vinyl-fs'
+import merge from 'merge-stream'
+import rename from 'gulp-rename'
+import replace from 'gulp-replace'
 
 const defaultFiles = [
   '**',
@@ -45,4 +45,4 @@ function loadPresentationFiles (files = defaultFiles) {
   return merge(presentations, core, getThemeFiles('material'), getThemeFiles('ribbon'))
 }
 
-module.exports = { loadPresentationFiles }
+export { loadPresentationFiles }
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,21 @@
+import js from '@eslint/js'
+import globals from 'globals'
+
+export default [
+  {
+    ignores: [
+      'temp/',
+      'node_modules/',
+      '**/__tests__/**/fixtures/',
+    ],
+  },
+  js.configs.recommended,
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+      },
+    },
+  },
+]
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/usr/bin/env node`
`2`	`2`
`3`		`-require('../core/index')`
	`3`	`+import '../core/index.js'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { handler: archive, messages } = require('../archive')`
	`1`	`+import { handler as archive, messages } from '../archive.js'`
`2`	`2`
`3`	`3`	`it('Must be function', () => {`
`4`	`4`	`expect(typeof archive).toBe('function')`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { handler: bundle, messages } = require('../bundle')`
	`1`	`+import { handler as bundle, messages } from '../bundle.js'`
`2`	`2`
`3`	`3`	`it('Must be function', () => {`
`4`	`4`	`expect(typeof bundle).toBe('function')`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { handler: create, messages } = require('../create')`
	`1`	`+import { handler as create, messages } from '../create.js'`
`2`	`2`
`3`	`3`	`it('Must be function', () => {`
`4`	`4`	`expect(typeof create).toBe('function')`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { handler: pdf, messages } = require('../pdf')`
	`1`	`+import { handler as pdf, messages } from '../pdf.js'`
`2`	`2`
`3`	`3`	`it('Must be function', () => {`
`4`	`4`	`expect(typeof pdf).toBe('function')`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { handler: publish, messages } = require('../publish')`
	`1`	`+import { handler as publish, messages } from '../publish.js'`
`2`	`2`
`3`	`3`	`it('Must be function', () => {`
`4`	`4`	`expect(typeof publish).toBe('function')`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { handler: serve } = require('../serve')`
	`1`	`+import { handler as serve } from '../serve.js'`
`2`	`2`
`3`	`3`	`it('Must be function', () => {`
`4`	`4`	`expect(typeof serve).toBe('function')`