diff options
Diffstat (limited to 'pkgs/applications/editors/rstudio/use-system-node.patch')
-rw-r--r-- | pkgs/applications/editors/rstudio/use-system-node.patch | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/pkgs/applications/editors/rstudio/use-system-node.patch b/pkgs/applications/editors/rstudio/use-system-node.patch index bb4480b4ae5f3..6e0acf46dda05 100644 --- a/pkgs/applications/editors/rstudio/use-system-node.patch +++ b/pkgs/applications/editors/rstudio/use-system-node.patch @@ -6,7 +6,7 @@ index d18362b..98cdd4c 100644 external-pandoc-path=${RSTUDIO_DEPENDENCIES_PANDOC_DIR} external-quarto-path=${RSTUDIO_DEPENDENCIES_QUARTO_DIR} external-libclang-path=${RSTUDIO_DEPENDENCIES_DIR}/common/libclang --external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/16.14.0/bin/node +-external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/18.18.2/bin/node +external-node-path=@node@/bin/node # enable copilot @@ -32,7 +32,7 @@ index 033d605..f1ee63d 100644 +++ b/src/gwt/build.xml @@ -87,29 +87,7 @@ <!-- ensure version matches RSTUDIO_NODE_VERSION --> - <property name="node.version" value="16.14.0"/> + <property name="node.version" value="18.18.2"/> <property name="node.dir" value="../../dependencies/common/node/${node.version}"/> - <!-- use yarn from system but will prefer yarn from dependencies if available --> - <condition property="yarn.bin" value="yarn"> @@ -58,15 +58,18 @@ index 033d605..f1ee63d 100644 - value="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd" - file="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"/> + <property name="node.bin" value="@node@/bin/node"/> - + <property name="panmirror.dir" value="./lib/quarto/apps/panmirror"/> <property name="panmirror.build.dir" value="./www/js/panmirror"/> -@@ -126,21 +104,11 @@ - file="c:\rstudio-tools\src\gwt\lib\quarto\apps\panmirror"/> - - <target name="panmirror" description="Compile panmirror library"> +@@ -133,28 +111,11 @@ + <isset property="panmirror.minify" /> + </not> + </condition> +- - <echo message="yarn location: ${yarn.bin}"/> - <echo message="panmirror location: ${panmirror.dir}"/> +- <echo message="panmirror minify: ${panmirror.minify}"/> +- <mkdir dir="${panmirror.build.dir}"/> - <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true"> - <arg value="install"/> @@ -75,14 +78,19 @@ index 033d605..f1ee63d 100644 - </exec> - <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true"> - <arg value="build"/> +- <arg value="--minify"/> +- <arg value="${panmirror.minify}"/> +- <arg value="--sourcemap"/> +- <arg value="true"/> - <env key="PANMIRROR_OUTDIR" value="dist-rstudio"/> -+ <exec executable="${node.bin}" dir="${panmirror.dir}" spawn="${panmirror.spawn}"> -+ <arg value="fuse"/> -+ <arg value="${panmirror.target}"/> ++ <exec executable="${node.bin}" dir="${panmirror.dir}" spawn="${panmirror.spawn}"> ++ <arg value="fuse"/> ++ <arg value="${panmirror.target}"/> </exec> - <copy todir="${panmirror.build.dir}"> - <fileset dir="${panmirror.dir}/dist-rstudio"/> - </copy> </target> - + <target name="javac" description="Compile java source"> + |