From 09b7b70664e4f84173d38b33e58f88ec29be09d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 25 Aug 2020 16:37:59 +0200 Subject: [PATCH] Remove yarn-closure code --- dist/yarn-plugin-nixify.js | 2 +- src/index.ts | 50 +++----------------------------------- src/yarn-project.nix.in | 17 +++---------- 3 files changed, 8 insertions(+), 61 deletions(-) diff --git a/dist/yarn-plugin-nixify.js b/dist/yarn-plugin-nixify.js index 0bbde59..af25bcf 100644 --- a/dist/yarn-plugin-nixify.js +++ b/dist/yarn-plugin-nixify.js @@ -1 +1 @@ -module.exports={name:"yarn-plugin-nixify",factory:function(e){return(()=>{"use strict";var n={216:(e,n,t)=>{t.r(n),t.d(n,{default:()=>x});var r,i,o,a,s,c,l,p,u,h,d=t(42),f=t(688),y=t(798),m=t(966);function b(e,n,t,r){t&&Object.defineProperty(e,n,{enumerable:t.enumerable,configurable:t.configurable,writable:t.writable,value:t.initializer?t.initializer.call(r):void 0})}function g(e,n,t,r,i){var o={};return Object.keys(r).forEach((function(e){o[e]=r[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=t.slice().reverse().reduce((function(t,r){return r(e,n,t)||t}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,n,o),o=null),o}const x={commands:[(r=d.Command.String(),i=d.Command.Path("nixify","fetch-one"),s=class extends d.Command{constructor(...e){super(...e),b(this,"locatorHash",a,this)}async execute(){const e=await m.Configuration.find(this.context.cwd,this.context.plugins),{project:n}=await m.Project.find(e,this.context.cwd),t=await m.Cache.find(e),r=e.makeFetcher();return(await m.StreamReport.start({configuration:e,stdout:this.context.stdout},async e=>{const i=n.originalPackages.get(this.locatorHash);i?await r.fetch(i,{checksums:n.storedChecksums,project:n,cache:t,fetcher:r,report:e}):e.reportError(0,"Invalid locator hash")})).exitCode()}},a=g((o=s).prototype,"locatorHash",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),g(o.prototype,"execute",[i],Object.getOwnPropertyDescriptor(o.prototype,"execute"),o.prototype),o),(c=d.Command.String(),l=d.Command.Path("nixify","install-bin"),h=class extends d.Command{constructor(...e){super(...e),b(this,"binDir",u,this)}async execute(){const e=await m.Configuration.find(this.context.cwd,this.context.plugins),{project:n,workspace:t}=await m.Project.find(e,this.context.cwd);if(t){const e=f.npath.toPortablePath(this.binDir),r=(0,y.getPnpPath)(n).main;for(const[i,o]of t.manifest.bin){const t=f.ppath.join(e,i),a=f.ppath.join(n.cwd,f.npath.toPortablePath(o)),s="#!/bin/sh\nexec node -r '@@PNP_PATH@@' '@@SCRIPT_PATH@@' \"$@\"\n".replace("@@PNP_PATH@@",r).replace("@@SCRIPT_PATH@@",a);f.xfs.writeFileSync(t,s),f.xfs.chmodSync(t,493)}}}},u=g((p=h).prototype,"binDir",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),g(p.prototype,"execute",[l],Object.getOwnPropertyDescriptor(p.prototype,"execute"),p.prototype),p)],hooks:{afterAllInstalled:async(e,n)=>{!1!==n.persistProject&&await(async(e,n,t)=>{const{configuration:r,cwd:i}=e,o=r.get("yarnPath"),a=r.get("cacheFolder"),s=r.get("lockfileFilename");if("pnp"!==r.get("nodeLinker"))return void t.reportWarning(0,"Currently, yarn-plugin-nixify only supports 'pnp' for the 'nodeLinker' setting.");let c=f.ppath.relative(i,o);c.startsWith("../")&&(c=o,t.reportWarning(0,`The Yarn path ${o} is outside the project - it may not be reachable by the Nix build`));let l=f.ppath.relative(i,a);l.startsWith("../")&&(l=a,t.reportWarning(0,`The cache folder ${a} is outside the project - it may not be reachable by the Nix build`));const p=new Set(["package.json",s,c]);for(const e of r.sources.values())e.startsWith("<")||p.add(e);const u=f.ppath.join(i,".yarn/plugins");if(f.xfs.existsSync(u))for(const e of f.xfs.readdirSync(u))p.add(f.ppath.join(u,e));const h=new Set;for(const e of p){const n=f.ppath.relative(i,e);if(n.startsWith("../")){e!==c&&t.reportWarning(0,`The path ${e} is outside the project and was ignored - it may not be reachable in the Nix build`);continue}h.add("regular:"+n);let r=f.ppath.dirname(n);for(;"."!==r;)h.add("directory:"+r),r=f.ppath.dirname(r)}let d=[];const y=new Set(f.xfs.readdirSync(n.cwd));for(const t of e.storedPackages.values()){const r=e.storedChecksums.get(t.locatorHash);if(!r)continue;const i=n.getLocatorPath(t,r);if(!i)continue;const o=f.ppath.basename(i);if(!y.has(o))continue;const a=r.split("/").pop();d.push([`filename = ${JSON.stringify(o)};`,`sha512 = ${JSON.stringify(a)};`,`locator-hash = ${JSON.stringify(t.locatorHash)};`])}const b=e.topLevelWorkspace.manifest.name,g=b?m.structUtils.stringifyIdent(b):"workspace",x="# This file is generated by running \"yarn install\" inside your project.\n# Manual changes might be lost - proceed with caution!\n\n{ lib, bash, coreutils, nodejs, perl, stdenv, writeText }:\n\nwith lib;\n\nlet\n\n # Variables provided by the generator.\n project-name = @@PROJECT_NAME@@;\n cache-folder = @@CACHE_FOLDER@@;\n cache-entries = @@CACHE_ENTRIES@@;\n yarn-path = @@YARN_PATH@@;\n yarn-closure-entries = @@YARN_CLOSURE_ENTRIES@@;\n\n # Defines the shell alias to run Yarn.\n yarn-alias = ''\n yarn() {\n CI=1 node \"$NIX_YARN_PATH\" \"$@\"\n }\n '';\n\n # Directory of just the files needed to run Yarn.\n yarn-closure = cleanSourceWith {\n src = ./.;\n filter = let\n srcStr = toString ./.;\n srcRel = removePrefix \"${srcStr}/\";\n in path: type:\n elem \"${type}:${srcRel path}\" yarn-closure-entries;\n };\n\n # Fetch a single dependency.\n fetch = { filename, sha512, locator-hash }: stdenv.mkDerivation {\n name = replaceStrings [ \"@\" ] [ \"-\" ] filename;\n buildInputs = [ nodejs ];\n builder = builtins.toFile \"builder.sh\" ''\n source $stdenv/setup\n\n # Yarn may need a writable home directory for the global cache mirror.\n # TODO: Can't disable the mirror, because it changes cache filenames.\n export HOME=\"$PWD\"\n\n # Fetch into the build directory.\n export yarn_cache_folder=\"$PWD\"\n\n # Setup to environment so we can run Yarn.\n pushd '${yarn-closure}' > /dev/null\n\n export NIX_YARN_PATH=\"$(readlink -f '${yarn-path}')\"\n ${yarn-alias}\n\n # Invoke a plugin internal command to build the cache.\n yarn nixify fetch-one '${locator-hash}'\n\n popd > /dev/null\n\n # The cache file that was just fetched is our output.\n mv '${filename}' $out\n '';\n outputHashMode = \"flat\";\n outputHashAlgo = \"sha512\";\n outputHash = sha512;\n };\n\n # Shell snippet to collect all project dependencies.\n collect-cache = concatMapStrings (args: ''\n cp ${fetch args} './${args.filename}'\n '') cache-entries;\n\nin stdenv.mkDerivation {\n name = project-name;\n src = ./.;\n\n # Tell node-gyp to use the provided Node.js headers for native code builds.\n npm_config_nodedir = nodejs;\n # Tell node-pre-gyp to never fetch binaries / always build from source.\n npm_config_build_from_source = \"true\";\n\n # Make sure the build uses the right Node.js version everywhere.\n buildInputs = [ coreutils nodejs ];\n\n # Define the Yarn alias in the build environment.\n postHook = yarn-alias;\n\n configurePhase = ''\n runHook preConfigure\n\n # Copy over the Yarn cache.\n # TODO: Can we do without the copy somehow? Links don't work.\n rm -fr '${cache-folder}'\n mkdir -p '${cache-folder}'\n pushd '${cache-folder}' > /dev/null\n ${collect-cache}\n popd > /dev/null\n\n # Store the absolute path to Yarn for the 'yarn' alias.\n export NIX_YARN_PATH=\"$(readlink -f '${yarn-path}')\"\n\n # Run normal Yarn install to complete dependency installation.\n yarn install --immutable --immutable-cache\n\n runHook postConfigure\n '';\n\n buildPhase = ''\n runHook preBuild\n runHook postBuild\n '';\n\n installPhase = ''\n runHook preInstall\n\n mkdir -p $out/libexec $out/bin\n\n # Move the entire project to the output directory.\n mv $PWD \"$out/libexec/$sourceRoot\"\n cd \"$out/libexec/$sourceRoot\"\n\n # Update the path to Yarn.\n export NIX_YARN_PATH=\"$(readlink -f '${yarn-path}')\"\n\n # Invoke a plugin internal command to setup binaries.\n yarn nixify install-bin $out/bin\n\n runHook postInstall\n '';\n\n passthru = {\n inherit yarn-closure offline-cache;\n };\n}\n".replace("@@PROJECT_NAME@@",JSON.stringify(g)).replace("@@CACHE_FOLDER@@",JSON.stringify(l)).replace("@@CACHE_ENTRIES@@","[\n"+[...d].map(e=>` { ${e.join(" ")} }\n`).join("")+" ]").replace("@@YARN_PATH@@",JSON.stringify(c)).replace("@@YARN_CLOSURE_ENTRIES@@","[\n"+[...h].map(e=>` ${JSON.stringify(e)}\n`).join("")+" ]"),v=f.ppath.join(i,"yarn-project.nix");f.xfs.writeFileSync(v,x);const P=f.ppath.join(i,"default.nix");f.xfs.existsSync(P)||(f.xfs.writeFileSync(P,"# This is a minimal `default.nix` by yarn-plugin-nixify. You can customize it\n# as needed, it will not be overwritten by the plugin.\n\n{ pkgs ? import {} }:\n\npkgs.callPackage ./yarn-project.nix {}\n"),t.reportInfo(0,"A minimal default.nix was created. You may want to customize it."))})(e,n.cache,n.report)}}}},966:n=>{n.exports=e("@yarnpkg/core")},688:n=>{n.exports=e("@yarnpkg/fslib")},798:n=>{n.exports=e("@yarnpkg/plugin-pnp")},42:n=>{n.exports=e("clipanion")}},t={};function r(e){if(t[e])return t[e].exports;var i=t[e]={exports:{}};return n[e](i,i.exports,r),i.exports}return r.d=(e,n)=>{for(var t in n)r.o(n,t)&&!r.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:n[t]})},r.o=(e,n)=>Object.prototype.hasOwnProperty.call(e,n),r.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r(216)})()}}; \ No newline at end of file +module.exports={name:"yarn-plugin-nixify",factory:function(e){return(()=>{"use strict";var n={609:(e,n,t)=>{t.r(n),t.d(n,{default:()=>P});var i,r,o,a,s,c,l,p,u,h,d=t(42),f=t(688),b=t(798),y=t(966);function m(e,n,t,i){t&&Object.defineProperty(e,n,{enumerable:t.enumerable,configurable:t.configurable,writable:t.writable,value:t.initializer?t.initializer.call(i):void 0})}function g(e,n,t,i,r){var o={};return Object.keys(i).forEach((function(e){o[e]=i[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=t.slice().reverse().reduce((function(t,i){return i(e,n,t)||t}),o),r&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(r):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,n,o),o=null),o}const x=["pnp","node-modules"],P={commands:[(i=d.Command.String(),r=d.Command.Path("nixify","fetch-one"),s=class extends d.Command{constructor(...e){super(...e),m(this,"locatorHash",a,this)}async execute(){const e=await y.Configuration.find(this.context.cwd,this.context.plugins),{project:n}=await y.Project.find(e,this.context.cwd),t=await y.Cache.find(e),i=e.makeFetcher();return(await y.StreamReport.start({configuration:e,stdout:this.context.stdout},async e=>{const r=n.originalPackages.get(this.locatorHash);r?await i.fetch(r,{checksums:n.storedChecksums,project:n,cache:t,fetcher:i,report:e}):e.reportError(0,"Invalid locator hash")})).exitCode()}},a=g((o=s).prototype,"locatorHash",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),g(o.prototype,"execute",[r],Object.getOwnPropertyDescriptor(o.prototype,"execute"),o.prototype),o),(c=d.Command.String(),l=d.Command.Path("nixify","install-bin"),h=class extends d.Command{constructor(...e){super(...e),m(this,"binDir",u,this)}async execute(){const e=await y.Configuration.find(this.context.cwd,this.context.plugins),{project:n,workspace:t}=await y.Project.find(e,this.context.cwd);await y.StreamReport.start({configuration:e,stdout:this.context.stdout},async i=>{if(!t||0===t.manifest.bin.size)return;let r=e.get("nodeLinker");x.includes(r)||(r="node-modules",i.reportWarning(0,`The nodeLinker ${r} is not supported - executables may have trouble finding dependencies`));const o=f.npath.toPortablePath(this.binDir),a=(0,b.getPnpPath)(n).main;for(const[e,i]of t.manifest.bin){const t=f.ppath.join(o,e),s=f.ppath.join(n.cwd,f.npath.toPortablePath(i));let c;switch(r){case"pnp":c="#!/bin/sh\nexec node -r '@@PNP_PATH@@' '@@SCRIPT_PATH@@' \"$@\"\n".replace("@@PNP_PATH@@",a).replace("@@SCRIPT_PATH@@",s);break;case"node-modules":c="#!/bin/sh\nexec node '@@SCRIPT_PATH@@' \"$@\"\n".replace("@@SCRIPT_PATH@@",s);break;default:throw Error("Invalid nodeLinker "+r)}f.xfs.writeFileSync(t,c),f.xfs.chmodSync(t,493)}})}},u=g((p=h).prototype,"binDir",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),g(p.prototype,"execute",[l],Object.getOwnPropertyDescriptor(p.prototype,"execute"),p.prototype),p)],hooks:{afterAllInstalled:async(e,n)=>{!1!==n.persistProject&&await(async(e,n,t)=>{const{configuration:i,cwd:r}=e,o=i.get("yarnPath"),a=i.get("cacheFolder");let s=f.ppath.relative(r,o);s.startsWith("../")&&(s=o,t.reportWarning(0,`The Yarn path ${o} is outside the project - it may not be reachable by the Nix build`));let c=f.ppath.relative(r,a);c.startsWith("../")&&(c=a,t.reportWarning(0,`The cache folder ${a} is outside the project - it may not be reachable by the Nix build`));for(const e of i.sources.values())e.startsWith("<")||f.ppath.relative(r,e).startsWith("../")&&t.reportWarning(0,`The config file ${e} is outside the project - it may not be reachable by the Nix build`);let l=[];const p=new Set(f.xfs.readdirSync(n.cwd));for(const t of e.storedPackages.values()){const i=e.storedChecksums.get(t.locatorHash);if(!i)continue;const r=n.getLocatorPath(t,i);if(!r)continue;const o=f.ppath.basename(r);if(!p.has(o))continue;const a=i.split("/").pop();l.push([`filename = ${JSON.stringify(o)};`,`sha512 = ${JSON.stringify(a)};`,`locator-hash = ${JSON.stringify(t.locatorHash)};`])}const u=e.topLevelWorkspace.manifest.name,h=u?y.structUtils.stringifyIdent(u):"workspace",d="# This file is generated by running \"yarn install\" inside your project.\n# Manual changes might be lost - proceed with caution!\n\n{ lib, coreutils, nodejs, stdenv, src ? ./. }:\n\nwith lib;\n\nlet\n\n # Variables provided by the generator.\n project-name = @@PROJECT_NAME@@;\n yarn-path = @@YARN_PATH@@;\n cache-folder = @@CACHE_FOLDER@@;\n cache-entries = @@CACHE_ENTRIES@@;\n\n # Defines the shell alias to run Yarn.\n yarn-alias = ''\n yarn() {\n CI=1 node \"$NIX_YARN_PATH\" \"$@\"\n }\n '';\n\n # Fetch a single dependency.\n fetch = { filename, sha512, locator-hash }: stdenv.mkDerivation {\n name = replaceStrings [ \"@\" ] [ \"-\" ] filename;\n buildInputs = [ nodejs ];\n builder = builtins.toFile \"builder.sh\" ''\n source $stdenv/setup\n\n # Yarn may need a writable home directory for the global cache mirror.\n # TODO: Can't disable the mirror, because it changes cache filenames.\n export HOME=\"$PWD\"\n\n # Fetch into the build directory.\n export yarn_cache_folder=\"$PWD\"\n\n # Setup to environment so we can run Yarn.\n pushd '${src}' > /dev/null\n\n export NIX_YARN_PATH=\"$(readlink -f '${yarn-path}')\"\n ${yarn-alias}\n\n # Invoke a plugin internal command to build the cache.\n yarn nixify fetch-one '${locator-hash}'\n\n popd > /dev/null\n\n # The cache file that was just fetched is our output.\n mv '${filename}' $out\n '';\n outputHashMode = \"flat\";\n outputHashAlgo = \"sha512\";\n outputHash = sha512;\n };\n\n # Shell snippet to collect all project dependencies.\n collect-cache = concatMapStrings (args: ''\n cp ${fetch args} './${args.filename}'\n '') cache-entries;\n\nin stdenv.mkDerivation {\n name = project-name;\n inherit src;\n\n # Tell node-gyp to use the provided Node.js headers for native code builds.\n npm_config_nodedir = nodejs;\n # Tell node-pre-gyp to never fetch binaries / always build from source.\n npm_config_build_from_source = \"true\";\n\n # Make sure the build uses the right Node.js version everywhere.\n buildInputs = [ coreutils nodejs ];\n\n # Define the Yarn alias in the build environment.\n postHook = yarn-alias;\n\n configurePhase = ''\n runHook preConfigure\n\n # Copy over the Yarn cache.\n # TODO: Can we do without the copy somehow? Links don't work.\n rm -fr '${cache-folder}'\n mkdir -p '${cache-folder}'\n pushd '${cache-folder}' > /dev/null\n ${collect-cache}\n popd > /dev/null\n\n # Store the absolute path to Yarn for the 'yarn' alias.\n export NIX_YARN_PATH=\"$(readlink -f '${yarn-path}')\"\n\n # Run normal Yarn install to complete dependency installation.\n yarn install --immutable --immutable-cache\n\n runHook postConfigure\n '';\n\n buildPhase = ''\n runHook preBuild\n runHook postBuild\n '';\n\n installPhase = ''\n runHook preInstall\n\n mkdir -p $out/libexec $out/bin\n\n # Move the entire project to the output directory.\n mv $PWD \"$out/libexec/$sourceRoot\"\n cd \"$out/libexec/$sourceRoot\"\n\n # Update the path to Yarn.\n export NIX_YARN_PATH=\"$(readlink -f '${yarn-path}')\"\n\n # Invoke a plugin internal command to setup binaries.\n yarn nixify install-bin $out/bin\n\n runHook postInstall\n '';\n\n passthru = {\n inherit offline-cache;\n };\n}\n".replace("@@PROJECT_NAME@@",JSON.stringify(h)).replace("@@YARN_PATH@@",JSON.stringify(s)).replace("@@CACHE_FOLDER@@",JSON.stringify(c)).replace("@@CACHE_ENTRIES@@","[\n"+[...l].map(e=>` { ${e.join(" ")} }\n`).join("")+" ]"),b=f.ppath.join(r,"yarn-project.nix");f.xfs.writeFileSync(b,d);const m=f.ppath.join(r,"default.nix");f.xfs.existsSync(m)||(f.xfs.writeFileSync(m,"# This is a minimal `default.nix` by yarn-plugin-nixify. You can customize it\n# as needed, it will not be overwritten by the plugin.\n\n{ pkgs ? import {} }:\n\npkgs.callPackage ./yarn-project.nix {}\n"),t.reportInfo(0,"A minimal default.nix was created. You may want to customize it."))})(e,n.cache,n.report)}}}},966:n=>{n.exports=e("@yarnpkg/core")},688:n=>{n.exports=e("@yarnpkg/fslib")},798:n=>{n.exports=e("@yarnpkg/plugin-pnp")},42:n=>{n.exports=e("clipanion")}},t={};function i(e){if(t[e])return t[e].exports;var r=t[e]={exports:{}};return n[e](r,r.exports,i),r.exports}return i.d=(e,n)=>{for(var t in n)i.o(n,t)&&!i.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:n[t]})},i.o=(e,n)=>Object.prototype.hasOwnProperty.call(e,n),i.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i(609)})()}}; \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index dd874ff..6b9687d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -27,7 +27,6 @@ const generate = async (project: Project, cache: Cache, report: Report) => { const { configuration, cwd } = project; const yarnPathAbs = configuration.get(`yarnPath`); const cacheFolderAbs = configuration.get(`cacheFolder`); - const lockfileFilename = configuration.get(`lockfileFilename`); let yarnPath = ppath.relative(cwd, yarnPathAbs); if (yarnPath.startsWith(`../`)) { @@ -47,48 +46,15 @@ const generate = async (project: Project, cache: Cache, report: Report) => { ); } - // List files the derivation will depend on. - const yarnClosureInput = new Set([ - `package.json`, - lockfileFilename, - yarnPath, - ]); for (const source of configuration.sources.values()) { if (!source.startsWith(`<`)) { - yarnClosureInput.add(source); - } - } - // TODO: Better way to find plugins? Re-parse rcfiles maybe? - const pluginsDir = ppath.join(cwd, `.yarn/plugins` as Filename); - if (xfs.existsSync(pluginsDir)) { - for (const filename of xfs.readdirSync(pluginsDir)) { - yarnClosureInput.add(ppath.join(pluginsDir, filename)); - } - } - - // Build Nix `filterSource` entries to match on. - const yarnClosureEntries = new Set(); - for (const inputPath of yarnClosureInput) { - // Filter paths not reachable during the build and warn. (These are often - // just user global configuration files, but the warnings can help highlight - // dependencies on private registries.) - const relativePath = ppath.relative(cwd, inputPath); - if (relativePath.startsWith(`../`)) { - if (inputPath !== yarnPath) { + const relativeSource = ppath.relative(cwd, source); + if (relativeSource.startsWith(`../`)) { report.reportWarning( 0, - `The path ${inputPath} is outside the project and was ignored - it may not be reachable in the Nix build` + `The config file ${source} is outside the project - it may not be reachable by the Nix build` ); } - continue; - } - // Add the file itself. - yarnClosureEntries.add(`regular:${relativePath}`); - // Add directories leading up to the file. - let dir = ppath.dirname(relativePath); - while (dir !== `.`) { - yarnClosureEntries.add(`directory:${dir}`); - dir = ppath.dirname(dir); } } @@ -118,6 +84,7 @@ const generate = async (project: Project, cache: Cache, report: Report) => { const projectName = ident ? structUtils.stringifyIdent(ident) : `workspace`; const projectExpr = projectExprTmpl .replace(`@@PROJECT_NAME@@`, JSON.stringify(projectName)) + .replace(`@@YARN_PATH@@`, JSON.stringify(yarnPath)) .replace(`@@CACHE_FOLDER@@`, JSON.stringify(cacheFolder)) .replace( `@@CACHE_ENTRIES@@`, @@ -126,15 +93,6 @@ const generate = async (project: Project, cache: Cache, report: Report) => { .map((entry) => ` { ${entry.join(` `)} }\n`) .join(``) + ` ]` - ) - .replace(`@@YARN_PATH@@`, JSON.stringify(yarnPath)) - .replace( - `@@YARN_CLOSURE_ENTRIES@@`, - `[\n` + - [...yarnClosureEntries] - .map((entry) => ` ${JSON.stringify(entry)}\n`) - .join(``) + - ` ]` ); const projectExprPath = ppath.join(cwd, `yarn-project.nix` as Filename); xfs.writeFileSync(projectExprPath, projectExpr); diff --git a/src/yarn-project.nix.in b/src/yarn-project.nix.in index bc10ca7..8c223fb 100644 --- a/src/yarn-project.nix.in +++ b/src/yarn-project.nix.in @@ -9,10 +9,9 @@ let # Variables provided by the generator. project-name = @@PROJECT_NAME@@; + yarn-path = @@YARN_PATH@@; cache-folder = @@CACHE_FOLDER@@; cache-entries = @@CACHE_ENTRIES@@; - yarn-path = @@YARN_PATH@@; - yarn-closure-entries = @@YARN_CLOSURE_ENTRIES@@; # Defines the shell alias to run Yarn. yarn-alias = '' @@ -21,16 +20,6 @@ let } ''; - # Directory of just the files needed to run Yarn. - yarn-closure = cleanSourceWith { - inherit src; - filter = let - srcStr = toString src; - srcRel = removePrefix "${srcStr}/"; - in path: type: - elem "${type}:${srcRel path}" yarn-closure-entries; - }; - # Fetch a single dependency. fetch = { filename, sha512, locator-hash }: stdenv.mkDerivation { name = replaceStrings [ "@" ] [ "-" ] filename; @@ -46,7 +35,7 @@ let export yarn_cache_folder="$PWD" # Setup to environment so we can run Yarn. - pushd '${yarn-closure}' > /dev/null + pushd '${src}' > /dev/null export NIX_YARN_PATH="$(readlink -f '${yarn-path}')" ${yarn-alias} @@ -128,6 +117,6 @@ in stdenv.mkDerivation { ''; passthru = { - inherit yarn-closure offline-cache; + inherit offline-cache; }; }