nodejs: remove preserveSymlinks hacks

Author: wmertens

overrides/nodejs/default.nix

@@ -104,6 +104,7 @@ in
       };
     };
 
+    # TODO not sure if this works
     edex-ui = {
       build = {
         electronAppDir = "src";
@@ -428,31 +429,6 @@ in
       };
     };
 
-    enhanced-resolve = {
-      fix-resolution-v4 = {
-        _condition = satisfiesSemver "^4.0.0";
-
-        # respect node path
-        postPatch = ''
-          ${ensureFileModified} lib/ResolverFactory.js \
-            sed -zi 's/const symlinks =.*options.symlinks : true;/const symlinks = false;/g' lib/ResolverFactory.js
-
-          substituteInPlace lib/ResolverFactory.js --replace \
-            'let modules = options.modules || ["node_modules"];' \
-            'let modules = (options.modules || ["node_modules"]).concat(process.env.NODE_PATH.split( /[;:]/ ));'
-        '';
-      };
-
-      fix-resolution-v5 = {
-        _condition = satisfiesSemver "^5.0.0";
-
-        patches = [
-          ./enhanced-resolve/npm-preserve-symlinks-v5.patch
-          ./enhanced-resolve/respect-node-path-v5.patch
-        ];
-      };
-    };
-
     gifsicle = {
       add-binary = {
         buildScript = ''
@@ -600,15 +576,6 @@ in
       };
     };
 
-    rollup = {
-      preserve-symlinks = {
-        postPatch = ''
-          find -name '*.js' -exec \
-            ${ensureFileModified} {} sed -i "s/preserveSymlinks: .*/preserveSymlinks: true,/g" {} \;
-        '';
-      };
-    };
-
     simple-git-hooks = {
       dont-postinstall = {
         buildScript = "true";
@@ -706,16 +673,6 @@ in
       };
     };
 
-    # TODO: confirm this is actually working
-    typescript = {
-      preserve-symlinks = {
-        postPatch = ''
-          find -name '*.js' -exec \
-            ${ensureFileModified} {} sed -i "s/options.preserveSymlinks/true/g; s/compilerOptions.preserveSymlinks/true/g" {} \;
-        '';
-      };
-    };
-
     usb-detection = {
       build = {
         nativeBuildInputs = old:
@@ -842,21 +799,6 @@ in
       };
     };
 
-    # This should not be necessary, as this plugin claims to
-    # respect the `preserveSymlinks` option of rollup.
-    # Adding the NODE_PATH to the module directories fixes it for now.
-    "@rollup/plugin-node-resolve" = {
-      respect-node-path = {
-        postPatch = ''
-          for f in $(find -name '*.js'); do
-            substituteInPlace $f --replace \
-              "moduleDirectories: ['node_modules']," \
-              "moduleDirectories: ['node_modules'].concat(process.env.NODE_PATH.split( /[;:]/ )),"
-          done
-        '';
-      };
-    };
-
     "@sentry/cli" = {
       add-binary = {
         buildScript = ''

overrides/nodejs/enhanced-resolve/npm-preserve-symlinks-v4.patch

@@ -1,3 +1,7 @@
+# implements tree-of-symlinks node_modules
+# If there are modules that can't handle that for some reason,
+# a copy strategy could be made that copies just the problematic modules
+# to the root and keeps symlinks for the rest.
 {...}: {
   type = "pure";
 
@@ -381,6 +385,13 @@
         d2nLoadFuncsPhase = ''
           # function to resolve symlinks to copies
           symlinksToCopies() {
+            # TODO symlinksToCopies should take a list of names and only copy those to project root
+            # That might be enough to handle problematic cases
+            # Bash has associative arrays and node_module cannot have cycles,
+            # so it can be implemented as a recursive function
+            echo "ERROR: symlinksToCopies doesn't work right now, make sure you actually still need it"
+            exit 1
+
             local dir="$1"
 
             echo "transforming symlinks to copies..."
@@ -484,12 +495,6 @@
           else
             exit 1
           fi
-
-          # configure typescript to resolve symlinks locally
-          # disabled since it should just work
-          # if [ -f ./tsconfig.json ]; then
-          #   node ${./tsconfig-to-json.js}
-          # fi
         '';
 
         # - links dependencies into the node_modules directory + adds bin to PATH
@@ -592,4 +597,16 @@
       // {sourceInfo = getSourceSpec name version;};
   in
     outputs;
+
+  extraArgs = {
+    nodejs = {
+      description = "nodejs version to use for building";
+      default = "14";
+      examples = [
+        "14"
+        "16"
+      ];
+      type = "argument";
+    };
+  };
 }