Continue convert to ESModule

Author: eliot-akira

commands/dev.js

@@ -5,7 +5,7 @@
  */
 
 import path from 'path'
-import rollup from 'rollup'
+import * as rollup from 'rollup'
 import onExit from '../utils/onExit.js'
 import displayError from '../utils/displayError.js'
 

commands/serve.js

@@ -2,7 +2,7 @@ import path from 'path'
 import http from 'http'
 import { execSync } from 'child_process'
 import handler from 'serve-handler'
-import getPort from '../utils/getPort.js'
+import getPort, { portNumbers } from '../utils/getPort.js'
 
 export default async function serve({ config }) {
   const { rootDir, isDev } = config
@@ -43,7 +43,7 @@ export default async function serve({ config }) {
      * @see https://github.com/remy/nodemon/blob/main/doc/requireable.md
      */
 
-    const nodemon = await import('nodemon')
+    const nodemon = (await import('nodemon')).default
 
     nodemon({
       script: scriptPath,
@@ -86,7 +86,7 @@ export default async function serve({ config }) {
   )
 
   const availablePort = await getPort({
-    port: getPort.portNumbers(port, port + 100),
+    port: portNumbers(port, port + 100),
   })
 
   if (serveOptions.port && parseInt(serveOptions.port) !== availablePort) {

lib/reloader/index.js

@@ -1,7 +1,7 @@
 import path from 'path'
 import fs from 'fs/promises'
 import { fileURLToPath } from 'url'
-import getPort from '../../utils/getPort.js'
+import getPort, { portNumbers } from '../../utils/getPort.js'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
@@ -29,7 +29,7 @@ export default async function createReloader({ commandName, config, tasks }) {
   const port = !active
     ? defaultPort
     : await getPort({
-        port: getPort.portNumbers(defaultPort, defaultPort + 100),
+        port: portNumbers(defaultPort, defaultPort + 100),
       })
   const clientScript = !active
     ? ''

lib/reloader/server.js

@@ -1,5 +1,5 @@
 import path from 'path'
-import ws from 'ws'
+import { WebSocketServer } from 'ws'
 import getPort from '../../utils/getPort.js'
 
 export default async function liveReloadServer(options = {}) {
@@ -14,9 +14,9 @@ export default async function liveReloadServer(options = {}) {
 
   const availablePort = reloader.port
   // Already found open port when reloader was created
-  // await getPort({ port: getPort.portNumbers(port, port + 100) })
+  // await getPort({ port: portNumbers(port, port + 100) })
 
-  const server = new ws.Server({ port: availablePort })
+  const server = new WebSocketServer({ port: availablePort })
 
   let firstTime = true
   server.on('connection', () => {

task/js.js

@@ -17,7 +17,7 @@ import injectProcessEnv from 'rollup-plugin-inject-process-env'
  * https://github.com/plumelo/rollup-plugin-styler
  * See [Support for Rollup v3](https://github.com/Anidetrix/rollup-plugin-styles/issues/224)
  */
-import styles from 'rollup-plugin-styler'
+import styles from '../lib/rollup-plugin-styler/index.js'
 import postcssUrl from 'postcss-url'
 import kebabToCamel from '../utils/kebabToCamel.js'
 import raw from '../utils/rollupPluginRaw.js'

task/sass.js

@@ -7,7 +7,7 @@ import del from 'rollup-plugin-delete'
  * Using fork of rollup-plugin-styles with updated dependencies
  * See [Support for Rollup v3](https://github.com/Anidetrix/rollup-plugin-styles/issues/224)
  */
-import styles from 'rollup-plugin-styler'
+import styles from '../lib/rollup-plugin-styler/index.js'
 
 export default async function createOptionsForTaskType(config, task) {
   const {