frontend/submission: add cypress-file-upload to devDependencies

Author: astro

frontend/nix/tools/cypress/node-packages.json

@@ -1,3 +1 @@
-[ {"cypress": "9.5.3"}
-, {"cypress-file-upload": "5.0.8"}
-]
+[ {"cypress": "9.5.3"} ]

frontend/nix/tools/cypress/node-packages.nix

@@ -427,13 +427,13 @@ let
         sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     };
-    "dayjs-1.11.1" = {
+    "dayjs-1.11.0" = {
       name = "dayjs";
       packageName = "dayjs";
-      version = "1.11.1";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.1.tgz";
-        sha512 = "ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA==";
+        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.0.tgz";
+        sha512 = "JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==";
       };
     };
     "debug-3.2.7" = {
@@ -1547,7 +1547,7 @@ in
       sources."core-util-is-1.0.2"
       sources."cross-spawn-7.0.3"
       sources."dashdash-1.14.1"
-      sources."dayjs-1.11.1"
+      sources."dayjs-1.11.0"
       (sources."debug-4.3.4" // {
         dependencies = [
           sources."ms-2.1.2"
@@ -1679,22 +1679,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "cypress-file-upload-5.0.8" = nodeEnv.buildNodePackage {
-    name = "cypress-file-upload";
-    packageName = "cypress-file-upload";
-    version = "5.0.8";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz";
-      sha512 = "+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A Cypress command for file upload";
-      homepage = "https://github.com/abramenal/cypress-file-upload#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
 }

frontend/nix/tools/cypress/override.nix

@@ -4,31 +4,20 @@
 let
   nodePackages = import ./default.nix { inherit pkgs system; };
 
-  cypressNpm = nodePackages."cypress-${pkgs.cypress.version}".override (oa: {
+  cypressNpm = nodePackages."cypress-${pkgs.cypress.version}".override {
     preRebuild = ''
       export CYPRESS_INSTALL_BINARY=0
     '';
-    dependencies = oa.dependencies ++ [ rec {
-      name = "cypress-file-upload";
-      packageName = name;
-      version = "5.0.8";
-      src = nodePackages."${packageName}-${version}".src;
-    } ];
-  });
+  };
 in
-pkgs.writeScriptBin "cypress" ''
+(pkgs.writeScriptBin "cypress" ''
   #!${pkgs.runtimeShell} -e
 
   [ -d ~/.config/Cypress ] && chmod -R +w ~/.config/Cypress
   export CYPRESS_RUN_BINARY=${pkgs.cypress}/bin/Cypress
 
   export PATH=$PATH:${pkgs.lib.makeBinPath (with pkgs; [xorg.xorgserver which])}
   export FONTCONFIG_PATH=${pkgs.fontconfig.out}/etc/fonts
-  export CYPRESS_NODE_PATH=$NODE_PATH:${nodePackages."cypress-file-upload-5.0.8"}
 
-  if [ -e cypress ]; then
-    mkdir -p cypress/support/node_modules
-    ln -s ${nodePackages."cypress-file-upload-5.0.8"}/lib/node_modules cypress/support/node_modules/cypress-file-upload
-  fi
-  ${cypressNpm.override (oa: builtins.trace "dependencies: ${pkgs.lib.generators.toPretty {} oa}" oa)}/bin/cypress $@
-''
+  ${cypressNpm}/bin/cypress $@
+'')

frontend/submission/nix/package.json

@@ -46,6 +46,7 @@
     "@types/react": "^17.0.2",
     "@types/react-dom": "^17.0.2",
     "@types/uuid": "^8.3.4",
+    "cypress-file-upload": "^5.0.8",
     "eslint": "^8.12.0",
     "next-remove-imports": "^1.0.6",
     "typescript": "^4.6.3"

frontend/submission/nix/yarn.nix

@@ -1233,6 +1233,14 @@
         sha1 = "d66700c5eacfac1940deb4e3ee5642792d85cd33";
       };
     }
+    {
+      name = "cypress_file_upload___cypress_file_upload_5.0.8.tgz";
+      path = fetchurl {
+        name = "cypress_file_upload___cypress_file_upload_5.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz";
+        sha1 = "d8824cbeaab798e44be8009769f9a6c9daa1b4a1";
+      };
+    }
     {
       name = "dayjs___dayjs_1.10.6.tgz";
       path = fetchurl {

frontend/submission/tsconfig.json

@@ -13,7 +13,8 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true
+    "incremental": true,
+    "types": ["cypress", "cypress-file-upload"]
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"]

frontend/submission/yarn.lock

@@ -1134,6 +1134,11 @@ csstype@^3.0.11, csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
   integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
 
+cypress-file-upload@^5.0.8:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1"
+  integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==
+
 dayjs@1.10.6:
   version "1.10.6"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63"