Przeglądaj źródła

Merge pull request #13475 from overleaf/revert-13473-revert-13439-tw-support-rnw-files

Revert "Revert "support for Rnw files""

GitOrigin-RevId: 2bdaf154592f0b3c4bd3762d266b89a159a0b091
Tyna William 3 lat temu
rodzic
commit
36db21ed56

+ 1 - 1
services/clsi/app/js/LatexRunner.js

@@ -184,7 +184,7 @@ function _buildLatexCommand(mainFile, opts = {}) {
 
   // We want to run latexmk on the tex file which we will automatically
   // generate from the Rtex/Rmd/md file.
-  mainFile = mainFile.replace(/\.(Rtex|md|Rmd)$/, '.tex')
+  mainFile = mainFile.replace(/\.(Rtex|md|Rmd|Rnw)$/, '.tex')
   command.push(Path.join('$COMPILE_DIR', mainFile))
 
   return command

+ 1 - 0
services/clsi/test/acceptance/js/helpers/Client.js

@@ -178,6 +178,7 @@ module.exports = Client = {
             'ist',
             'md',
             'Rmd',
+            'Rnw',
           ].indexOf(extension) > -1
         ) {
           resources.push({

+ 1 - 1
services/web/app/src/Features/Project/ProjectRootDocManager.js

@@ -72,7 +72,7 @@ module.exports = ProjectRootDocManager = {
     if (callback == null) {
       callback = function () {}
     }
-    const filePathsPromise = globby(['**/*.{tex,Rtex}'], {
+    const filePathsPromise = globby(['**/*.{tex,Rtex,Rnw}'], {
       cwd: directoryPath,
       followSymlinkedDirectories: false,
       onlyFiles: true,

+ 1 - 1
services/web/config/settings.defaults.js

@@ -679,7 +679,7 @@ module.exports = {
     process.env.FILE_IGNORE_PATTERN ||
     '**/{{__MACOSX,.git,.texpadtmp,.R}{,/**},.!(latexmkrc),*.{dvi,aux,log,toc,out,pdfsync,synctex,synctex(busy),fdb_latexmk,fls,nlo,ind,glo,gls,glg,bbl,blg,doc,docx,gz,swp}}',
 
-  validRootDocExtensions: ['tex', 'Rtex', 'ltx'],
+  validRootDocExtensions: ['tex', 'Rtex', 'ltx', 'Rnw'],
 
   emailConfirmationDisabled:
     process.env.EMAIL_CONFIRMATION_DISABLED === 'true' || false,

+ 1 - 1
services/web/cypress/support/ct/window.ts

@@ -1,5 +1,5 @@
 window.i18n = { currentLangCode: 'en' }
 window.ExposedSettings = {
   appName: 'Overleaf',
-  validRootDocExtensions: ['tex', 'Rtex', 'ltx'],
+  validRootDocExtensions: ['tex', 'Rtex', 'ltx', 'Rnw'],
 } as typeof window.ExposedSettings

+ 1 - 1
services/web/frontend/stories/decorators/scope.tsx

@@ -185,7 +185,7 @@ const initialize = () => {
       'gv',
       'mf',
     ],
-    validRootDocExtensions: ['tex', 'Rtex', 'ltx'],
+    validRootDocExtensions: ['tex', 'Rtex', 'ltx', 'Rnw'],
   }
 
   window.project_id = project._id