Cleanups

Author: vitvakatu

app/electron-client/BUILD.bazel

@@ -50,8 +50,6 @@ esbuild(
     config = ":esbuild.config.mjs",
     define = {
         "process.env.ELECTRON_DEV_MODE": "false",
-        "process.env.ENSO_IDE_VERSION": '"2025.0.0-dev"',
-        "process.env.ENSO_IDE_COMMIT_HASH": '"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"',
     },
     entry_points = [
         "src/index.ts",
@@ -79,11 +77,10 @@ electron_builder_bin.electron_builder(
     name = "electron_builder_run",
     srcs = npm_link_targets() + [
         "package.json",
+        ":bundle",
         ":electron-builder-config.cjs",
         "//:sbt_build_engine_distribution",
         "//:sbt_build_small_jdk",
-    ] + [
-        ":bundle",
         "//app/gui:dist",
     ],
     args = [
@@ -95,7 +92,6 @@ electron_builder_bin.electron_builder(
         # Disable Node fs patching for this target to avoid readlink issues on Bazel bin symlinks.
         "JS_BINARY__PATCH_NODE_FS": "0",
     },
-    # Run from BINDIR (default); rely on package.json "build" config.
     out_dirs = ["ide-dist"],
     visibility = ["//visibility:public"],
 )

app/electron-client/electron-builder-config.cjs

@@ -5,19 +5,17 @@ function artifactName(version) {
   return 'enso-${os}-${arch}-' + version + '.${ext}'
 }
 
-function engineDistributionSource(version) {
-  let platform = process.platform
-  let arch = process.arch
-  if (platform === 'darwin') {
-    platform = 'macos'
-    if (arch === 'arm64') {
-      arch = 'aarch64'
-    }
-  }
-  if (platform === 'linux' && arch === 'x64') {
-    arch = 'amd64'
+function engineDistributionSource(version, platform = process.platform, arch = process.arch) {
+  const platformMap = { darwin: 'macos' }
+  const archMapByPlatform = {
+    darwin: { arm64: 'aarch64' },
+    linux: { x64: 'amd64' },
   }
-  return `../../built-distribution/enso-engine-${version}-${platform}-${arch}/enso-${version}/`
+
+  const normalizedPlatform = platformMap[platform] ?? platform
+  const normalizedArch = archMapByPlatform[platform]?.[arch] ?? arch
+
+  return `../../built-distribution/enso-engine-${version}-${normalizedPlatform}-${normalizedArch}/enso-${version}/`
 }
 
 function engineDistributionTarget(version) {
@@ -58,10 +56,10 @@ module.exports = {
   appId: 'org.enso',
   productName: 'Enso',
   extraMetadata: {
-    version: '2025.3.0-dev',
+    version: '0.0.0-dev',
     installer: {},
   },
-  artifactName: artifactName('2025.3.0-dev'),
+  artifactName: artifactName('0.0.0-dev'),
   protocols: [
     {
       name: 'Enso url',
@@ -117,8 +115,8 @@ module.exports = {
   directories: {
     output: 'ide-dist',
   },
+  // Providing empty beforeBuild hook and using npmRebuild: true to prevent electron-builder from trying to install dependencies.
   beforeBuild: function () {
-    // We handle node_modules manually.
     return false
   },
   npmRebuild: true,

app/electron-client/electron-builder-config.json

@@ -57,7 +57,7 @@ lezer_generator_bin.lezer_generator(
     ],
     chdir = package_name(),
     env = {
-        # Disable Node fs patching on Windows to avoid EPERM on Bazel symlinked outputs.
+        # Disable Node fs patching to avoid EPERM on Bazel symlinked outputs on Windows.
         "JS_BINARY__PATCH_NODE_FS": "0",
     },
     visibility = ["//visibility:public"],

app/electron-client/pre-electron-builder.cjs

@@ -16,4 +16,4 @@ fi
 
 
 echo "STABLE_IDE_VERSION $IDE_VERSION"
-echo "STABLE_IDE_COMMIT_HASH $IDE_COMMIT_HASH"
+echo "STABLE_IDE_COMMIT_HASH $IDE_COMMIT_HASH"

app/table-expression/BUILD.bazel

@@ -191,7 +191,6 @@ const config = [
       '**/*.json',
       'app/rust-ffi/pkg/',
       'app/electron-client/electron-builder-config.cjs',
-      'app/electron-client/create-build-info.cjs',
     ],
   },
   {
@@ -220,8 +219,8 @@ const config = [
             'app/ydoc-shared/vitest.config.ts',
             'app/project-manager-shim/scripts/*.js',
             'app/ide-desktop/icons/src/index.js',
-            'app/electron-client/pre-electron-builder.cjs',
             'app/electron-client/electron-builder-config.cjs',
+            'app/electron-client/create-build-info.mjs',
           ],
         },
       },
@@ -559,12 +558,6 @@ const config = [
   {
     files: ['**/*.js', '**/*.jsx', '**/*.cjs', '**/*.mjs'],
     ignores: ['**/build.mjs'],
-    languageOptions: {
-      parserOptions: {
-        // Avoid TS project service errors for plain JS/CJS files.
-        projectService: false,
-      },
-    },
     rules: {
       '@typescript-eslint/no-var-requires': 'off',
       // Parameter types must be specified using JSDoc in JS files.