github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Revert "Revert "support for Rnw files""

GitOrigin-RevId: 2bdaf154592f0b3c4bd3762d266b89a159a0b091
This commit is contained in:
Tyna William 2023-07-06 08:41:09 -04:00 committed by Copybot
parent d89b62e965
commit 36db21ed56
6 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/clsi/app/js/LatexRunner.js
View file

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

1
services/clsi/test/acceptance/js/helpers/Client.js
View file

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

2
services/web/app/src/Features/Project/ProjectRootDocManager.js
View file

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

2
services/web/config/settings.defaults.js
View file

@ -679,7 +679,7 @@ module.exports = {
process.env.FILE_IGNORE_PATTERN || 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}}', '**/{{__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: emailConfirmationDisabled:
process.env.EMAIL_CONFIRMATION_DISABLED === 'true' || false, process.env.EMAIL_CONFIRMATION_DISABLED === 'true' || false,

2
services/web/cypress/support/ct/window.ts
View file

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

2
services/web/frontend/stories/decorators/scope.tsx
View file

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