Enforce node: schema for builtins, import extensions

Author: indutny-signal

.eslintignore

@@ -23,6 +23,7 @@ js/WebAudioRecorderMp3.js
 js/calling-tools/**
 
 # TypeScript generated files
+build/**/*.js
 app/**/*.js
 ts/**/*.js
 

.eslintrc.js

@@ -100,6 +100,14 @@ const rules = {
 
   // We prefer named exports
   'import/prefer-default-export': 'off',
+  'import/enforce-node-protocol-usage': ['error', 'always'],
+  'import/extensions': [
+    'error',
+    'ignorePackages',
+    {
+      checkTypeImports: true,
+    },
+  ],
 
   // Prefer functional components with default params
   'react/require-default-props': 'off',

.gitignore

@@ -36,6 +36,7 @@ ts/sql/mainWorker.bundle.js.LICENSE.txt
 build/ICUMessageParams.d.ts
 
 # React / TypeScript
+build/**/*.js
 app/*.js
 ts/**/*.js
 ts/protobuf/*.d.ts

.prettierignore

@@ -2,6 +2,7 @@
 # supports `.gitignore`: https://github.com/prettier/prettier/issues/2294
 
 # Generated files
+build/**/*.js
 app/**/*.js
 config/local-*.json
 config/local.json

.storybook/main.ts

@@ -51,7 +51,9 @@ const config: StorybookConfig = {
       type: 'filesystem',
     };
 
-    config.resolve!.extensions = ['.tsx', '.ts', '...'];
+    config.resolve!.extensionAlias = {
+      '.js': ['.tsx', '.ts', '.js'],
+    };
 
     config.module!.rules!.unshift({
       test: /\.scss$/,
@@ -88,33 +90,12 @@ const config: StorybookConfig = {
 
     config.node = { global: true };
 
-    config.externals = {
-      net: 'commonjs net',
-      vm: 'commonjs vm',
-      fs: 'commonjs fs',
-      async_hooks: 'commonjs async_hooks',
-      module: 'commonjs module',
-      stream: 'commonjs stream',
-      tls: 'commonjs tls',
-      dns: 'commonjs dns',
-      http: 'commonjs http',
-      https: 'commonjs https',
-      os: 'commonjs os',
-      constants: 'commonjs constants',
-      zlib: 'commonjs zlib',
-      '@signalapp/libsignal-client': 'commonjs @signalapp/libsignal-client',
-      '@signalapp/libsignal-client/zkgroup':
-        'commonjs @signalapp/libsignal-client/zkgroup',
-      '@signalapp/ringrtc': 'commonjs @signalapp/ringrtc',
-      '@signalapp/better-sqlite3': 'commonjs @signalapp/better-sqlite3',
-      electron: 'commonjs electron',
-      'fs-xattr': 'commonjs fs-xattr',
-      fsevents: 'commonjs fsevents',
-      'mac-screen-capture-permissions':
-        'commonjs mac-screen-capture-permissions',
-      sass: 'commonjs sass',
-      bufferutil: 'commonjs bufferutil',
-      'utf-8-validate': 'commonjs utf-8-validate',
+    config.externals = ({ request }, callback) => {
+      if (/^node:/.test(request) && request !== 'node:buffer') {
+        // Keep Node.js imports unchanged
+        return callback(null, 'commonjs ' + request);
+      }
+      callback();
     };
 
     config.plugins!.push(

app/EmojiService.ts

@@ -7,9 +7,9 @@ import * as z from 'zod';
 import { protocol } from 'electron';
 import { LRUCache } from 'lru-cache';
 
-import type { OptionalResourceService } from './OptionalResourceService';
-import { SignalService as Proto } from '../ts/protobuf';
-import { parseUnknown } from '../ts/util/schemas';
+import type { OptionalResourceService } from './OptionalResourceService.js';
+import { SignalService as Proto } from '../ts/protobuf/index.js';
+import { parseUnknown } from '../ts/util/schemas.js';
 
 const MANIFEST_PATH = join(__dirname, '..', 'build', 'jumbomoji.json');
 

app/OptionalResourceService.ts

@@ -12,12 +12,12 @@ import PQueue from 'p-queue';
 import type {
   OptionalResourceType,
   OptionalResourcesDictType,
-} from '../ts/types/OptionalResource';
-import { OptionalResourcesDictSchema } from '../ts/types/OptionalResource';
-import { createLogger } from '../ts/logging/log';
-import { getGotOptions } from '../ts/updater/got';
-import { drop } from '../ts/util/drop';
-import { parseUnknown } from '../ts/util/schemas';
+} from '../ts/types/OptionalResource.js';
+import { OptionalResourcesDictSchema } from '../ts/types/OptionalResource.js';
+import { createLogger } from '../ts/logging/log.js';
+import { getGotOptions } from '../ts/updater/got.js';
+import { drop } from '../ts/util/drop.js';
+import { parseUnknown } from '../ts/util/schemas.js';
 
 const log = createLogger('OptionalResourceService');
 

app/PreventDisplaySleepService.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import type { PowerSaveBlocker } from 'electron';
-import { createLogger } from '../ts/logging/log';
+import { createLogger } from '../ts/logging/log.js';
 
 const log = createLogger('PreventDisplaySleepService');
 

app/SystemTrayService.ts

@@ -6,8 +6,8 @@ import { Menu, Tray, app, nativeImage, nativeTheme, screen } from 'electron';
 import os from 'node:os';
 import { join } from 'node:path';
 import { readFileSync } from 'node:fs';
-import { createLogger } from '../ts/logging/log';
-import type { LocalizerType } from '../ts/types/I18N';
+import { createLogger } from '../ts/logging/log.js';
+import type { LocalizerType } from '../ts/types/I18N.js';
 
 const log = createLogger('SystemTrayService');
 

app/SystemTraySettingCache.ts

@@ -1,14 +1,14 @@
 // Copyright 2017 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import { createLogger } from '../ts/logging/log';
-import OS from '../ts/util/os/osMain';
+import { createLogger } from '../ts/logging/log.js';
+import OS from '../ts/util/os/osMain.js';
 import {
   parseSystemTraySetting,
   SystemTraySetting,
-} from '../ts/types/SystemTraySetting';
-import { isSystemTraySupported } from '../ts/types/Settings';
-import type { ConfigType } from './base_config';
+} from '../ts/types/SystemTraySetting.js';
+import { isSystemTraySupported } from '../ts/types/Settings.js';
+import type { ConfigType } from './base_config.js';
 
 const log = createLogger('SystemTraySettingCache');