diff --git a/services/web/frontend/js/directives/asyncForm.js b/services/web/frontend/js/directives/asyncForm.js index 43f6419307..970b186a76 100644 --- a/services/web/frontend/js/directives/asyncForm.js +++ b/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', diff --git a/services/web/frontend/js/directives/complexPassword.js b/services/web/frontend/js/directives/complexPassword.js index b1bc278fb1..3d82ec5045 100644 --- a/services/web/frontend/js/directives/complexPassword.js +++ b/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'], diff --git a/services/web/frontend/js/ide/directives/layout.js b/services/web/frontend/js/ide/directives/layout.js index 448a3cc46f..0007801dc4 100644 --- a/services/web/frontend/js/ide/directives/layout.js +++ b/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() { diff --git a/services/web/frontend/js/ide/editor/ShareJsDoc.js b/services/web/frontend/js/ide/editor/ShareJsDoc.js index 2e560b73b5..402f096fea 100644 --- a/services/web/frontend/js/ide/editor/ShareJsDoc.js +++ b/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 diff --git a/services/web/frontend/js/ide/human-readable-logs/HumanReadableLogs.js b/services/web/frontend/js/ide/human-readable-logs/HumanReadableLogs.js index f2896a7e27..86c4aa313c 100644 --- a/services/web/frontend/js/ide/human-readable-logs/HumanReadableLogs.js +++ b/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 { diff --git a/services/web/frontend/js/ide/pdf/controllers/PdfController.js b/services/web/frontend/js/ide/pdf/controllers/PdfController.js index 3edd647404..3874f4795f 100644 --- a/services/web/frontend/js/ide/pdf/controllers/PdfController.js +++ b/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' diff --git a/services/web/frontend/js/ide/pdfng/directives/pdfJsLoader.js b/services/web/frontend/js/ide/pdfng/directives/pdfJsLoader.js index 1953803ecb..4d6400ad2b 100644 --- a/services/web/frontend/js/ide/pdfng/directives/pdfJsLoader.js +++ b/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() diff --git a/services/web/frontend/js/libraries.js b/services/web/frontend/js/libraries.js index b33fa17904..ac453c8013 100644 --- a/services/web/frontend/js/libraries.js +++ b/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' diff --git a/services/web/webpack.config.js b/services/web/webpack.config.js index c337acb72d..759698f7c7 100644 --- a/services/web/webpack.config.js +++ b/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