Fix rollup incompatibility, fix test failure (#1208)

* Fix rollup incompatibility

* Fix ts js problems

Author: powerivq

config/rollup.main-thread.mjs

@@ -1,5 +1,5 @@
 import compiler from '@ampproject/rollup-plugin-closure-compiler';
-import { terser } from 'rollup-plugin-terser';
+import terser from '@rollup/plugin-terser';
 import { babelPlugin, removeDebugCommandExecutors, removeWorkerWhitespace, replacePlugin } from './rollup.plugins.mjs';
 
 const ESModules = [

config/rollup.worker-thread.mjs

@@ -1,5 +1,5 @@
 import compiler from '@ampproject/rollup-plugin-closure-compiler';
-import { terser } from 'rollup-plugin-terser';
+import terser from '@rollup/plugin-terser';
 import { babelPlugin, replacePlugin } from './rollup.plugins.mjs';
 
 // Compile plugins should always be added at the end of the plugin list.

package.json

@@ -49,14 +49,13 @@
     "@types/sinon": "10.0.20",
     "acorn": "8.11.3",
     "acorn-walk": "8.3.2",
-    "ava": "3.15.0",
+    "ava": "6.4.0",
     "babel-plugin-minify-replace": "0.5.0",
     "babel-plugin-transform-remove-console": "6.9.4",
     "benchmark": "2.1.4",
     "cross-env": "7.0.3",
-    "esm": "3.2.25",
     "husky": "8.0.3",
-    "jsdom": "22.1.0",
+    "jsdom": "19.0.0",
     "lint-staged": "14.0.1",
     "magic-string": "0.30.8",
     "np": "8.0.4",
@@ -66,8 +65,8 @@
     "rimraf": "5.0.5",
     "rollup": "3.29.4",
     "rollup-plugin-analyzer": "4.0.0",
-    "rollup-plugin-terser": "7.0.2",
-    "sinon": "15.2.0",
+    "@rollup/plugin-terser": "0.4.4",
+    "sinon": "14.0.0",
     "sirv": "2.0.4",
     "tslint": "6.1.3",
     "typescript": "5.4.2"
@@ -115,9 +114,6 @@
     "cjs": true
   },
   "ava": {
-    "require": [
-      "esm"
-    ],
     "files": [
       "output/test/**/*.test.js"
     ]

src/main-thread/commands/attribute.ts

@@ -1,5 +1,5 @@
-import { AttributeMutationIndex, TransferrableMutationType } from '../../transfer/TransferrableMutation';
-import { CommandExecutorInterface } from './interface';
+import { AttributeMutationIndex, TransferrableMutationType } from '../../transfer/TransferrableMutation.js';
+import { CommandExecutorInterface } from './interface.js';
 
 export const AttributeProcessor: CommandExecutorInterface = (strings, nodes, workerContext, objectContext, config) => {
   const allowedExecution = config.executorsAllowed.includes(TransferrableMutationType.ATTRIBUTES);

src/main-thread/commands/bounding-client-rect.ts

@@ -1,8 +1,8 @@
-import { TransferrableKeys } from '../../transfer/TransferrableKeys';
-import { MessageType } from '../../transfer/Messages';
-import { CommandExecutorInterface } from './interface';
-import { BoundClientRectMutationIndex } from '../../transfer/TransferrableBoundClientRect';
-import { TransferrableMutationType } from '../../transfer/TransferrableMutation';
+import { TransferrableKeys } from '../../transfer/TransferrableKeys.js';
+import { MessageType } from '../../transfer/Messages.js';
+import { CommandExecutorInterface } from './interface.js';
+import { BoundClientRectMutationIndex } from '../../transfer/TransferrableBoundClientRect.js';
+import { TransferrableMutationType } from '../../transfer/TransferrableMutation.js';
 
 export const BoundingClientRectProcessor: CommandExecutorInterface = (strings, nodes, workerContext, objectContext, config) => {
   const allowedExecution = config.executorsAllowed.includes(TransferrableMutationType.GET_BOUNDING_CLIENT_RECT);

src/main-thread/commands/character-data.ts

@@ -1,5 +1,5 @@
-import { CharacterDataMutationIndex, TransferrableMutationType } from '../../transfer/TransferrableMutation';
-import { CommandExecutorInterface } from './interface';
+import { CharacterDataMutationIndex, TransferrableMutationType } from '../../transfer/TransferrableMutation.js';
+import { CommandExecutorInterface } from './interface.js';
 
 export const CharacterDataProcessor: CommandExecutorInterface = (strings, nodes, workerContext, objectContext, config) => {
   const allowedExecution = config.executorsAllowed.includes(TransferrableMutationType.CHARACTER_DATA);

src/main-thread/commands/child-list.ts

@@ -1,7 +1,7 @@
-import { ChildListMutationIndex, TransferrableMutationType } from '../../transfer/TransferrableMutation';
-import { CommandExecutorInterface } from './interface';
-import { NodeContext } from '../nodes';
-import { applyDefaultInputListener, sendValueChangeOnAttributeMutation } from './event-subscription';
+import { ChildListMutationIndex, TransferrableMutationType } from '../../transfer/TransferrableMutation.js';
+import { CommandExecutorInterface } from './interface.js';
+import { NodeContext } from '../nodes.js';
+import { applyDefaultInputListener, sendValueChangeOnAttributeMutation } from './event-subscription.js';
 
 export const ChildListProcessor: CommandExecutorInterface = (strings, { getNode }: NodeContext, workerContext, objectContext, config) => {
   const allowedExecution = config.executorsAllowed.includes(TransferrableMutationType.CHILD_LIST);

src/main-thread/commands/event-subscription.ts

@@ -1,16 +1,16 @@
-import { MessageType } from '../../transfer/Messages';
-import { TransferrableKeys } from '../../transfer/TransferrableKeys';
+import { MessageType } from '../../transfer/Messages.js';
+import { TransferrableKeys } from '../../transfer/TransferrableKeys.js';
 import {
   ADD_EVENT_SUBSCRIPTION_LENGTH,
   REMOVE_EVENT_SUBSCRIPTION_LENGTH,
   EventSubscriptionMutationIndex,
   TransferrableTouchList,
   AddEventRegistrationIndex,
-} from '../../transfer/TransferrableEvent';
-import { WorkerContext } from '../worker';
-import { CommandExecutorInterface } from './interface';
-import { TransferrableMutationType } from '../../transfer/TransferrableMutation';
-import { BASE_ELEMENT_INDEX } from '../nodes';
+} from '../../transfer/TransferrableEvent.js';
+import { WorkerContext } from '../worker.js';
+import { CommandExecutorInterface } from './interface.js';
+import { TransferrableMutationType } from '../../transfer/TransferrableMutation.js';
+import { BASE_ELEMENT_INDEX } from '../nodes.js';
 
 /**
  * Monitoring Nodes attribute changes requires a Mutation Observer.

src/main-thread/commands/function.ts

@@ -1,6 +1,6 @@
-import { CommandExecutorInterface } from './interface';
-import { TransferrableMutationType, FunctionMutationIndex } from '../../transfer/TransferrableMutation';
-import { ResolveOrReject } from '../../transfer/Messages';
+import { CommandExecutorInterface } from './interface.js';
+import { TransferrableMutationType, FunctionMutationIndex } from '../../transfer/TransferrableMutation.js';
+import { ResolveOrReject } from '../../transfer/Messages.js';
 
 let fnCallCount = 0;
 

src/main-thread/commands/image-bitmap.ts

@@ -1,7 +1,7 @@
-import { CommandExecutorInterface } from './interface';
-import { TransferrableMutationType, ImageBitmapMutationIndex } from '../../transfer/TransferrableMutation';
-import { TransferrableKeys } from '../../transfer/TransferrableKeys';
-import { MessageType } from '../../transfer/Messages';
+import { CommandExecutorInterface } from './interface.js';
+import { TransferrableMutationType, ImageBitmapMutationIndex } from '../../transfer/TransferrableMutation.js';
+import { TransferrableKeys } from '../../transfer/TransferrableKeys.js';
+import { MessageType } from '../../transfer/Messages.js';
 
 export const ImageBitmapProcessor: CommandExecutorInterface = (strings, nodeContext, workerContext, objectContext, config) => {
   const allowedExecution = config.executorsAllowed.includes(TransferrableMutationType.IMAGE_BITMAP_INSTANCE);