cleanup

Author: pavelsavara

src/native/rollup.config.defines.js

@@ -18,21 +18,10 @@ export const reserved = [
     "netSetInternals", "netUpdateAllInternals", "netUpdateModuleInternals", "netInitializeModule",
     "netLoaderExports", "netRuntimeExports", "netBrowserHostExports", "netInteropJSExports", "netNativeBrowserExports",
     "netTabulateLE", "netTabulateRE", "netTabulateHE", "netTabulateJSNE", "netTabulateNBE"];
-const crossModule = "Logger|Assert|netJSEngine|Module|netInternals|netPublicApi|netLoaderExports|netRuntimeExports|netBrowserHostExports|netInteropJSExports|netNativeBrowserExports|netInternalUpdates";
-const crossModuleFn = "netSetInternals|netUpdateAllInternals|netUpdateModuleInternals|netTabulateLE|netTabulateRE|netTabulateHE|netTabulateJSNE|netTabulateNBE";
-const browserHostAPI = "runMain|runMainAndExit|setEnvironmentVariable|exit|setHeapB32|setHeapB8|setHeapU8|setHeapU16|setHeapU32|setHeapI8|setHeapI16|setHeapI32|setHeapI52|setHeapU52|setHeapI64Big|setHeapF32|setHeapF64|getHeapB32|getHeapB8|getHeapU8|getHeapU16|getHeapU32|getHeapI8|getHeapI16|getHeapI32|getHeapI52|getHeapU52|getHeapI64Big|getHeapF32|getHeapF64|localHeapViewI8|localHeapViewI16|localHeapViewI32|localHeapViewI64Big|localHeapViewU8|localHeapViewU16|localHeapViewU32|localHeapViewF32|localHeapViewF64";
-const dotnetJSAPI = "INTERNAL|Module|runtimeId|runtimeBuildInfo|productVersion|gitHash|buildConfiguration|wasmEnableThreads|wasmEnableSIMD|wasmEnableExceptionHandling|dotnet|exit|";
-const dotnetJSHostBuilderApi = "download|run|create|withConfig|withConfigSrc|withApplicationArguments|withEnvironmentVariable|withEnvironmentVariables|withVirtualWorkingDirectory|withDiagnosticTracing|withDebugging|withMainAssembly|withApplicationArgumentsFromQuery|withApplicationEnvironment|withApplicationCulture|withResourceLoader|withModuleConfig|withConsoleForwarding|withExitOnUnhandledError|withAsyncFlushOnExit|withExitCodeLogging|withElementOnExit|withInteropCleanupOnExit|";
-const dotnetRuntimeJSAPI = "getAssemblyExports|setModuleImports";
-export const dotnetJSReservedProps = new RegExp(`^(?!(${dotnetJSAPI}))`);//|${crossModule}
-export const dotnetRuntimeJSReservedProps = new RegExp(`^(?!(${dotnetRuntimeJSAPI}|${dotnetJSHostBuilderApi}|${crossModule}))`);
-export const libBrowserHostReservedProps = new RegExp(`^(?!(BrowserHost_.*|\\$BROWSER_HOST.*|\\$libBrowserHostFn|selfInitialize|netInitializeModule|assignExports|${browserHostAPI}|${crossModule}))`);
-export const libNativeBrowserReservedProps = new RegExp(`^(?!(SystemJS_.*|\\$DOTNET.*|selfInitialize|netInitializeModule|${browserHostAPI}|${crossModule}|${crossModuleFn}))`);
-export const libInteropJavaScriptNativeReservedProps = new RegExp(`^(?!(SystemInteropJS_.*.*|\\$DOTNET_INTEROP.*|selfInitialize|netInitializeModule|${crossModule}))`);
 
 export const externalDependencies = ["module", "process", "perf_hooks", "node:crypto"];
 export const artifactsObjDir = "../../artifacts/obj";
-export const isDebug = false; //process.env.Configuration !== "Release";
+export const isDebug = process.env.Configuration !== "Release";
 
 let gitHash;
 try {

src/native/rollup.config.js

@@ -7,8 +7,7 @@ import { nodeResolve } from "@rollup/plugin-node-resolve";
 import dts from "rollup-plugin-dts";
 import {
     externalDependencies, isDebug, artifactsObjDir, envConstants, banner, banner_dts, configuration,
-    keep_classnames, keep_fnames, reserved,
-    dotnetJSReservedProps, dotnetRuntimeJSReservedProps, libBrowserHostReservedProps, libNativeBrowserReservedProps, libInteropJavaScriptNativeReservedProps
+    keep_classnames, keep_fnames, reserved
 } from "./rollup.config.defines.js"
 import { terserPlugin, writeOnChangePlugin, consts, onwarn, alwaysLF, iife2fe, sourcemapPathTransform } from "./rollup.config.plugins.js"
 import { promises as fs } from "fs";
@@ -45,7 +44,7 @@ const dotnetJS = configure({
             module: true,
         }, mangle: {
             module: true,
-            reserved,
+            reserved
         }
     }
 });
@@ -60,10 +59,10 @@ const libNativeBrowser = configure({
     }],
     terser: {
         compress: {
-            toplevel: false,
+            toplevel: true,
             keep_fnames,
         }, mangle: {
-            toplevel: false,
+            toplevel: true,
             keep_fnames,
             reserved,
         }
@@ -76,9 +75,12 @@ const dotnetRuntimeJS = configure({
         file: artifactsObjDir + `/native/browser-${configuration}-wasm/System.Runtime.InteropServices.JavaScript.Native/dotnet.runtime.js`,
     }],
     terser: {
-        mangle: {
+        compress: {
+            module: true,
+        }, mangle: {
+            module: true,
             keep_classnames,
-            reserved,
+            reserved
         }
     }
 });
@@ -93,8 +95,10 @@ const libInteropJavaScriptNative = configure({
     }],
     terser: {
         compress: {
+            toplevel: true,
             keep_fnames,
         }, mangle: {
+            toplevel: true,
             keep_fnames,
             reserved,
         }
@@ -111,8 +115,10 @@ const libBrowserHost = configure({
     }],
     terser: {
         compress: {
+            toplevel: true,
             keep_fnames,
         }, mangle: {
+            toplevel: true,
             keep_fnames,
             reserved,
         }