feat: @W-11668812 explicitly import/export types (#382)

salesforce · Aug 30, 2022 · 7192482 · 7192482
1 parent 4b6c330
commit 7192482
Show file tree

Hide file tree

Showing 22 changed files with 375 additions and 328 deletions.
diff --git a/examples/rollup.config.js → examples/.rolluprc.cjs b/examples/rollup.config.js → examples/.rolluprc.cjs
@@ -1,5 +1,6 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { nodeResolve } from '@rollup/plugin-node-resolve';
+'use strict';
+
+const { nodeResolve } = require('@rollup/plugin-node-resolve');
 
 function config(dir) {
     return {
@@ -8,11 +9,15 @@ function config(dir) {
             file: `${dir}/bundle.js`,
             format: 'cjs',
         },
-        plugins: [nodeResolve()],
+        plugins: [
+            nodeResolve({
+                preferBuiltins: true,
+            })
+        ],
     };
 }
 
-export default [
+module.exports = [
     config('custom-elements'),
     config('custom-events'),
     config('errors'),

diff --git a/examples/package.json b/examples/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "scripts": {
         "clean": "rimraf */bundle.js",
-        "build": "rollup -c"
+        "build": "rollup --config .rolluprc.cjs"
     },
     "dependencies": {
         "@locker/near-membrane-dom": "0.11.1"

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   ],
   "description": "JavaScript Near Membrane Library to create a sandboxed environment",
   "module": "dist/index.js",
-  "types": "types/index.js",
+  "typings": "types/index.js",
   "scripts": {
     "clean": "lerna run clean --stream",
     "build": "lerna run build --stream",

diff --git a/packages/near-membrane-base/package.json b/packages/near-membrane-base/package.json
@@ -12,7 +12,7 @@
     "main": "dist/index.cjs.js",
     "module": "dist/index.js",
     "sideEffects": false,
-    "types": "types/index.d.ts",
+    "typings": "types/index.d.ts",
     "scripts": {
         "clean": "rimraf dist types",
         "build": "tsc --project tsconfig.types.json && rollup --config .rolluprc.cjs",

diff --git a/packages/near-membrane-base/src/connector.ts b/packages/near-membrane-base/src/connector.ts
@@ -1,6 +1,5 @@
 import { createMembraneMarshall } from './membrane';
-
-export type Connector = ReturnType<typeof createMembraneMarshall>;
+import type { Connector } from './types';
 
 const TypeErrorCtor = TypeError;
 

diff --git a/packages/near-membrane-base/src/environment.ts b/packages/near-membrane-base/src/environment.ts
@@ -1,31 +1,18 @@
-import {
+import type {
     CallableDefineProperties,
     CallableEvaluate,
     CallableGetPropertyValuePointer,
     CallableInstallLazyPropertyDescriptors,
     CallableLinkPointers,
     CallableSetPrototypeOf,
-    DistortionCallback,
     GetSelectedTarget,
     GetTransferableValue,
     HooksCallback,
     Pointer,
     ProxyTarget,
-} from './membrane';
-import { Connector } from './connector';
-import { Instrumentation } from './instrumentation';
-import { PropertyKeys } from './types';
-
-export interface VirtualEnvironmentOptions {
-    // Blue connector factory.
-    blueConnector: Connector;
-    // Optional distortion callback to tame functionalities observed through the membrane.
-    distortionCallback?: DistortionCallback;
-    // Red connector factory.
-    redConnector: Connector;
-    // Instrumentation library object.
-    instrumentation?: Instrumentation;
-}
+    PropertyKeys,
+    VirtualEnvironmentOptions,
+} from './types';
 
 const LOCKER_NEAR_MEMBRANE_UNDEFINED_VALUE_SYMBOL = Symbol.for(
     '@@lockerNearMembraneUndefinedValue'

diff --git a/packages/near-membrane-base/src/index.ts b/packages/near-membrane-base/src/index.ts
@@ -1,6 +1,5 @@
 export * from './connector';
 export * from './environment';
-export * from './instrumentation';
 export * from './intrinsics';
 export * from './membrane';
 export * from './types';

diff --git a/packages/near-membrane-base/src/instrumentation.ts b/packages/near-membrane-base/src/instrumentation.ts
diff --git a/packages/near-membrane-base/src/intrinsics.ts b/packages/near-membrane-base/src/intrinsics.ts
@@ -1,6 +1,6 @@
 import { toSafeArray } from './utils';
 import { VirtualEnvironment } from './environment';
-import { PropertyKeys } from './types';
+import type { PropertyKeys } from './types';
 
 const { assign: ObjectAssign } = Object;
 const { ownKeys: ReflectOwnKeys } = Reflect;
@@ -167,7 +167,7 @@ export function linkIntrinsics(env: VirtualEnvironment, globalObject: typeof glo
     // Remap intrinsics that are realm agnostic.
     for (let i = 0, { length } = ReflectiveIntrinsicObjectNames; i < length; i += 1) {
         const globalName = ReflectiveIntrinsicObjectNames[i];
-        const reflectiveValue = globalObject[globalName];
+        const reflectiveValue = (globalObject as any)[globalName];
         if (reflectiveValue) {
             // Proxy.prototype is undefined.
             if (reflectiveValue.prototype) {