Procházet zdrojové kódy

Merge pull request #5081 from overleaf/ae-webpack-libs-alias

Remove webpack alias for vendor/libs

GitOrigin-RevId: ab84b21402236143ad4d5d988b01fbbbcc081532
Alf Eaton před 5 roky
rodič
revize
49b1356976

+ 1 - 1
services/web/frontend/js/directives/asyncForm.js

@@ -1,5 +1,5 @@
 import App from '../base'
-import 'libs/passfield'
+import '../vendor/libs/passfield'
 App.directive('asyncForm', ($http, validateCaptcha, validateCaptchaV3) => ({
   controller: [
     '$scope',

+ 1 - 1
services/web/frontend/js/directives/complexPassword.js

@@ -5,7 +5,7 @@ import _ from 'lodash'
     max-len
 */
 import App from '../base'
-import 'libs/passfield'
+import '../vendor/libs/passfield'
 App.directive('complexPassword', () => ({
   require: ['^asyncForm', 'ngModel'],
 

+ 2 - 2
services/web/frontend/js/ide/directives/layout.js

@@ -14,8 +14,8 @@
  */
 import App from '../../base'
 import _ from 'lodash'
-import 'libs/jquery-layout'
-import 'libs/jquery.ui.touch-punch'
+import '../../vendor/libs/jquery-layout'
+import '../../vendor/libs/jquery.ui.touch-punch'
 
 export default App.directive('layout', ($parse, $compile, ide) => ({
   compile() {

+ 1 - 1
services/web/frontend/js/ide/editor/ShareJsDoc.js

@@ -17,7 +17,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 import EventEmitter from '../../utils/EventEmitter'
-import ShareJs from 'libs/sharejs'
+import ShareJs from '../../vendor/libs/sharejs'
 import EditorWatchdogManager from '../connection/EditorWatchdogManager'
 
 let ShareJsDoc

+ 1 - 1
services/web/frontend/js/ide/human-readable-logs/HumanReadableLogs.js

@@ -1,4 +1,4 @@
-import LogParser from 'libs/latex-log-parser'
+import LogParser from '../../vendor/libs/latex-log-parser'
 import ruleset from './HumanReadableLogsRules'
 
 export default {

+ 1 - 1
services/web/frontend/js/ide/pdf/controllers/PdfController.js

@@ -1,6 +1,6 @@
 import App from '../../../base'
 import HumanReadableLogs from '../../human-readable-logs/HumanReadableLogs'
-import BibLogParser from 'libs/bib-log-parser'
+import BibLogParser from '../../../vendor/libs/bib-log-parser'
 import PreviewPane from '../../../features/preview/components/preview-pane'
 import { react2angular } from 'react2angular'
 import { rootContext } from '../../../shared/context/root-context'

+ 2 - 2
services/web/frontend/js/ide/pdfng/directives/pdfJsLoader.js

@@ -18,8 +18,8 @@
  * to customise the loader's options. However the rest of the file is identical
  * to the one provided by PDF.js.
  */
-var pdfjs = require('libs/pdfjs-dist/build/pdf.js')
-var PdfjsWorker = require('libs/pdfjs-dist/build/pdf.worker.js')
+var pdfjs = require('../../../vendor/libs/pdfjs-dist/build/pdf.js')
+var PdfjsWorker = require('../../../vendor/libs/pdfjs-dist/build/pdf.worker.js')
 
 if (typeof window !== 'undefined' && 'Worker' in window) {
   pdfjs.GlobalWorkerOptions.workerPort = new PdfjsWorker()

+ 7 - 7
services/web/frontend/js/libraries.js

@@ -2,13 +2,13 @@ import 'jquery'
 import 'angular'
 import 'angular-sanitize'
 import 'lodash'
-import 'libs/angular-autocomplete/angular-autocomplete'
-import 'libs/ui-bootstrap'
-import 'libs/ng-context-menu-0.1.4'
-import 'libs/jquery.storage'
-import 'libs/angular-cookie'
-import 'libs/passfield'
-import 'libs/select/select'
+import './vendor/libs/angular-autocomplete/angular-autocomplete'
+import './vendor/libs/ui-bootstrap'
+import './vendor/libs/ng-context-menu-0.1.4'
+import './vendor/libs/jquery.storage'
+import './vendor/libs/angular-cookie'
+import './vendor/libs/passfield'
+import './vendor/libs/select/select'
 
 // CSS
 import 'angular/angular-csp.css'

+ 0 - 2
services/web/webpack.config.js

@@ -229,8 +229,6 @@ module.exports = {
     alias: {
       // Aliases for AMD modules
 
-      // Shortcut to vendored dependencies in frontend/js/vendor/libs
-      libs: path.join(__dirname, 'frontend/js/vendor/libs'),
       // Enables ace/ace shortcut
       ace: 'ace-builds/src-noconflict',
       // fineupload vendored dependency (which we're aliasing to fineuploadER