Simplify

Author: schmidt-sebastian

config/webpack.test.js

@@ -19,10 +19,11 @@ const path = require('path');
 const webpack = require('webpack');
 
 /**
- * A regular expression used to replace Firestore's platform specific modules,
- * which are located under 'packages/firestore/src/platform/'.
+ * A regular expression used to replace Firestore's and Storage's platform-
+ * specific modules, which are located under
+ * 'packages/(component)/src/platform/'.
  */
-const FIRESTORE_PLATFORM_RE = /^(.*)\/platform\/([^.\/]*)(\.ts)?$/;
+const PLATFORM_RE = /^(.*)\/platform\/([^.\/]*)(\.ts)?$/;
 
 module.exports = {
   mode: 'development',
@@ -100,16 +101,13 @@ module.exports = {
     symlinks: false
   },
   plugins: [
-    new webpack.NormalModuleReplacementPlugin(
-      FIRESTORE_PLATFORM_RE,
-      resource => {
-        const targetPlatform = process.env.TEST_PLATFORM || 'browser';
-        resource.request = resource.request.replace(
-          FIRESTORE_PLATFORM_RE,
-          `$1/platform/${targetPlatform}/$2.ts`
-        );
-      }
-    ),
+    new webpack.NormalModuleReplacementPlugin(PLATFORM_RE, resource => {
+      const targetPlatform = process.env.TEST_PLATFORM || 'browser';
+      resource.request = resource.request.replace(
+        PLATFORM_RE,
+        `$1/platform/${targetPlatform}/$2.ts`
+      );
+    }),
     new webpack.EnvironmentPlugin([
       'RTDB_EMULATOR_PORT',
       'RTDB_EMULATOR_NAMESPACE'

packages/storage/karma.conf.js

@@ -31,7 +31,6 @@ module.exports = function (config) {
 };
 
 function getTestFiles(argv) {
-  process.env.TEST_PLATFORM = 'browser';
   let unitTestFiles = ['test/unit/*'];
   let integrationTestFiles = [];
   if (argv.exp) {

packages/storage/src/platform/base64.ts

@@ -15,16 +15,19 @@
  * limitations under the License.
  */
 
-// This file is only used under ts-node.
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const platform = require(`./${process.env.TEST_PLATFORM ?? 'node'}/base64`);
+import {
+  decodeUint8Array as nodeDecodeUint8Array,
+  decodeBase64 as nodeDecodeBase64
+} from './node/base64';
 
 /** Converts a Base64 encoded string to a binary string. */
 export function decodeBase64(encoded: string): string {
-  return platform.decodeBase64(encoded);
+  // This file is only used under ts-node.
+  return nodeDecodeBase64(encoded);
 }
 
 /** Converts a Uint8Array to a string. */
 export function decodeUint8Array(data: Uint8Array): string {
-  return platform.decodeUint8Array(data);
+  // This file is only used under ts-node.
+  return nodeDecodeUint8Array(data);
 }

packages/storage/src/platform/connection.ts

@@ -15,11 +15,9 @@
  * limitations under the License.
  */
 import { Connection } from '../implementation/connection';
-
-// This file is only used under ts-node.
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const platform = require(`./${process.env.TEST_PLATFORM ?? 'node'}/connection`);
+import { newConnection as nodeNewConnection } from './node/connection';
 
 export function newConnection(): Connection {
-  return platform.newConnection();
+  // This file is only used under ts-node.
+  return nodeNewConnection();
 }