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 #3176 from overleaf/jpa-devendor-ace

Browse source 
[misc] devendor ace

GitOrigin-RevId: 25f7590773464889a088c96f337456f8542a1859
This commit is contained in:
Jakob Ackermann 2020-11-11 11:50:00 +01:00 committed by Copybot
parent b0d1817afb
commit 9303fcedae
5 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/web/app/src/Features/Project/ProjectController.js
View file

@ -23,7 +23,6 @@ const ProjectUpdateHandler = require('./ProjectUpdateHandler')
const ProjectGetter = require('./ProjectGetter') const ProjectGetter = require('./ProjectGetter')
const PrivilegeLevels = require('../Authorization/PrivilegeLevels') const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
const AuthenticationController = require('../Authentication/AuthenticationController') const AuthenticationController = require('../Authentication/AuthenticationController')
const PackageVersions = require('../../infrastructure/PackageVersions')
const Sources = require('../Authorization/Sources') const Sources = require('../Authorization/Sources')
const TokenAccessHandler = require('../TokenAccess/TokenAccessHandler') const TokenAccessHandler = require('../TokenAccess/TokenAccessHandler')
const CollaboratorsGetter = require('../Collaborators/CollaboratorsGetter') const CollaboratorsGetter = require('../Collaborators/CollaboratorsGetter')
@ -1043,11 +1042,7 @@ var defaultSettingsForAnonymousUser = userId => ({
var THEME_LIST = [] var THEME_LIST = []
function generateThemeList() { function generateThemeList() {
const files = fs.readdirSync( const files = fs.readdirSync(
Path.join( Path.join(__dirname, '/../../../../node_modules/ace-builds/src-noconflict')
__dirname,
'/../../../../frontend/js/vendor/',
PackageVersions.lib('ace')
)
) )
const result = [] const result = []
for (let file of files) { for (let file of files) {

4
services/web/app/src/infrastructure/PackageVersions.js
View file

@ -5,8 +5,10 @@
* DS207: Consider shorter variations of null checks * DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/ */
const ACE_VERSION = require('ace-builds/version')
const version = { const version = {
ace: '1.4.12', // Upgrade instructions: https://github.com/overleaf/write_latex/wiki/Upgrading-Ace // Upgrade instructions: https://github.com/overleaf/write_latex/wiki/Upgrading-Ace
ace: ACE_VERSION,
fineuploader: '5.15.4' fineuploader: '5.15.4'
} }

4
services/web/package-lock.json generated
View file

@ -9140,6 +9140,10 @@
} }
} }
}, },
"ace-builds": {
"version": "https://github.com/overleaf/ace-builds/archive/v1.4.12-69aace50e6796d42116f8f96e19d2468d8a88af9.tar.gz",
"integrity": "sha512-jHzJycBpJVzEuSiMZj8hotpzuH49uMOIcJtrdTkx2UVKGJDYpJZOrN922k+IPAiWqnfpMzUO0lmXFSBDGGguQA=="
},
"acorn": { "acorn": {
"version": "7.1.1", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",

1
services/web/package.json
View file

@ -47,6 +47,7 @@
"@pollyjs/core": "^4.2.1", "@pollyjs/core": "^4.2.1",
"@pollyjs/persister-fs": "^4.2.1", "@pollyjs/persister-fs": "^4.2.1",
"@sentry/browser": "^5.12.0", "@sentry/browser": "^5.12.0",
"ace-builds": "https://github.com/overleaf/ace-builds/archive/v1.4.12-69aace50e6796d42116f8f96e19d2468d8a88af9.tar.gz",
"algoliasearch": "^3.35.1", "algoliasearch": "^3.35.1",
"angular": "~1.8.0", "angular": "~1.8.0",
"angular-sanitize": "~1.8.0", "angular-sanitize": "~1.8.0",

7
services/web/webpack.config.js
View file

@ -201,10 +201,7 @@ module.exports = {
// Shortcut to vendored dependencies in frontend/js/vendor/libs // Shortcut to vendored dependencies in frontend/js/vendor/libs
libs: path.join(__dirname, 'frontend/js/vendor/libs'), libs: path.join(__dirname, 'frontend/js/vendor/libs'),
// Enables ace/ace shortcut // Enables ace/ace shortcut
ace: path.join( ace: 'ace-builds/src-noconflict',
__dirname,
`frontend/js/vendor/${PackageVersions.lib('ace')}`
),
// fineupload vendored dependency (which we're aliasing to fineuploadER // fineupload vendored dependency (which we're aliasing to fineuploadER
// for some reason) // for some reason)
fineuploader: path.join( fineuploader: path.join(
@ -263,7 +260,7 @@ module.exports = {
to: 'js/libs/sigma-master' to: 'js/libs/sigma-master'
}, },
{ {
from: `frontend/js/vendor/ace-${PackageVersions.version.ace}/`, from: 'node_modules/ace-builds/src-noconflict',
to: `js/ace-${PackageVersions.version.ace}/` to: `js/ace-${PackageVersions.version.ace}/`
}, },
// Copy CMap files from pdfjs-dist package to build output. These are used // Copy CMap files from pdfjs-dist package to build output. These are used