Unverified Commit 515e5fe4 authored by Ezri Zhu's avatar Ezri Zhu
Browse files

wrangler: 3.80.1 -> 4.16.0 

Also resolved below two build issues

* Broken symlinks: nixpkgs build now checks for broken symlinks, this PR
  adds all the relevant directories back to the out dir so all symlinks
  are intact.
* Missing npm: wrangler specifies an older version of pnpm than the one
  in pnpm_9 as used in the build process, this PR patches the
  package.json to remove the pnpm version so pnpm_9 doesn't attempt to
  change it's version resulting in a pnpm binary not found error. (with
  help from @cameronraysmith in #377334)
parent eb394bfc

pkgs/by-name/wr/wrangler/package.nix

+29 −14
Original line number Diff line number Diff line
@@ -10,23 +10,35 @@ 
  llvmPackages,

  musl,

  xorg,

  jq,

  moreutils,

  gitUpdater,

  versionCheckHook,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "wrangler";

  version = "3.80.1";

  version = "4.16.0";



  src = fetchFromGitHub {

    owner = "cloudflare";

    repo = "workers-sdk";

    rev = "wrangler@${finalAttrs.version}";

    hash = "sha256-9ClosoDIT+yP2dvNenHW2RSxLimOT3znXD+Pq+N6cQA=";

    hash = "sha256-H/ds5NfOjyTZ4AcsCAP0wbalgOljOUtLSjkjEn+atVk=";

  };



  pnpmDeps = pnpm_9.fetchDeps {

    inherit (finalAttrs) pname version src;

    hash = "sha256-8EItfBV2n2rnXPCTYjDZlr/tdlEn8YOdIzOsj35w5gQ=";

    inherit (finalAttrs)

      pname

      version

      src

      postPatch

      ;

    hash = "sha256-msIXeN8t8Dm3RUkw4woZIMn7wXxw/0jVl8oFmkPJbrA=";

  };

  # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs

  postPatch = ''

    jq 'del(.packageManager)' package.json | sponge package.json

  '';



  passthru.updateScript = gitUpdater { rev-prefix = "wrangler@"; };
@@ -45,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: { 
      makeWrapper

      nodejs

      pnpm_9.configHook

      jq

      moreutils

    ]

    ++ lib.optionals (stdenv.hostPlatform.isLinux) [

      autoPatchelfHook
@@ -53,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { 
  # @cloudflare/vitest-pool-workers wanted to run a server as part of the build process

  # so I simply removed it

  postBuild = ''

    rm -fr packages/vitest-pool-workers

    mv packages/vitest-pool-workers packages/~vitest-pool-workers

    NODE_ENV="production" pnpm --filter workers-shared run build

    NODE_ENV="production" pnpm --filter miniflare run build

    NODE_ENV="production" pnpm --filter wrangler run build
@@ -65,19 +79,17 @@ stdenv.mkDerivation (finalAttrs: { 
  # - the build process builds a version of miniflare which is used by wrangler; for this reason, the miniflare package is copied also

  # - pnpm stores all content in the top-level node_modules directory, but it is linked to from a node_modules directory inside wrangler

  # - as they are linked via symlinks, the relative location of them on the filesystem should be maintained

  # - Update: Now we're copying everything over due to broken symlink errors

  installPhase = ''

    runHook preInstall

    mkdir -p $out/bin $out/lib $out/lib/packages/wrangler

    rm -rf node_modules/typescript node_modules/eslint node_modules/prettier node_modules/bin node_modules/.bin node_modules/**/bin node_modules/**/.bin

    mv packages/~vitest-pool-workers packages/vitest-pool-workers

    cp -r fixtures $out/lib

    cp -r packages $out/lib

    cp -r node_modules $out/lib

    cp -r packages/miniflare $out/lib/packages

    cp -r packages/workers-tsconfig $out/lib/packages

    cp -r packages/workers-shared $out/lib/packages

    cp -r packages/wrangler/node_modules $out/lib/packages/wrangler

    cp -r packages/wrangler/templates $out/lib/packages/wrangler

    cp -r packages/wrangler/wrangler-dist $out/lib/packages/wrangler

    cp -r tools $out/lib/tools

    rm -rf node_modules/typescript node_modules/eslint node_modules/prettier node_modules/bin node_modules/.bin node_modules/**/bin node_modules/**/.bin

    rm -rf $out/lib/**/bin $out/lib/**/.bin

    cp -r packages/wrangler/bin $out/lib/packages/wrangler

    NODE_PATH_ARRAY=( "$out/lib/node_modules" "$out/lib/packages/wrangler/node_modules" )

    makeWrapper ${lib.getExe nodejs} $out/bin/wrangler \

      --inherit-argv0 \
@@ -86,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: { 
      --set-default SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" # https://github.com/cloudflare/workers-sdk/issues/3264

    runHook postInstall

  '';



  doInstallCheck = true;

  nativeInstallCheckInputs = [

    versionCheckHook

  ];

  meta = {

    description = "Command-line interface for all things Cloudflare Workers";

    homepage = "https://github.com/cloudflare/workers-sdk#readme";