mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fix webpack errors

Browse source 
files adapted to scss imports
added sass loader
This commit is contained in:
vitorsemeano 2020-11-06 00:00:34 +00:00
parent 067ddba5ba
commit 2383a01335
32 changed files with 108 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

7
package.json
View file

@ -14,9 +14,8 @@
"autoprefixer": "^9.8.6",
"babel-loader": "^8.0.6",
"browser-sync": "^2.26.13",
"confusing-browser-globals": "^1.0.10",
"clean-webpack-plugin": "^3.0.0",
"confusing-browser-globals": "^1.0.9",
"confusing-browser-globals": "^1.0.10",
"copy-webpack-plugin": "^6.0.3",
"css-loader": "^5.0.0",
"cssnano": "^4.1.10",
@ -67,7 +66,6 @@
"core-js": "^3.6.5",
"date-fns": "^2.16.1",
"epubjs": "^0.3.85",
"pdfjs-dist": "2.5.207",
"fast-text-encoding": "^1.0.3",
"flv.js": "^1.5.0",
"headroom.js": "^0.12.0",
@ -82,7 +80,10 @@
"material-design-icons-iconfont": "^6.1.0",
"native-promise-only": "^0.8.0-a",
"page": "^1.11.6",
"pdfjs-dist": "2.5.207",
"resize-observer-polyfill": "^1.5.1",
"sass": "^1.29.0",
"sass-loader": "^10.0.5",
"screenfull": "^5.0.2",
"sortablejs": "^1.12.0",
"swiper": "^6.3.5",

2
src/components/collectionEditor/collectionEditor.js
View file

@ -11,7 +11,7 @@ import '../../elements/emby-input/emby-input';
import '../../elements/emby-select/emby-select';
import 'material-design-icons-iconfont';
import '../formdialog.css';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';

2
src/components/dialog/dialog.js
View file

@ -8,7 +8,7 @@ import '../../elements/emby-button/emby-button';
import '../../elements/emby-button/paper-icon-button-light';
import '../../elements/emby-input/emby-input';
import '../formdialog.css';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
/* eslint-disable indent */

2
src/components/filtermenu/filtermenu.js
View file

@ -12,7 +12,7 @@ import '../../elements/emby-button/paper-icon-button-light';
import '../../elements/emby-select/emby-select';
import 'material-design-icons-iconfont';
import '../formdialog.css';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
function onSubmit(e) {

2
src/components/guide/guide.js
View file

@ -22,7 +22,7 @@ import '../../elements/emby-button/emby-button';
import '../../elements/emby-button/paper-icon-button-light';
import '../../elements/emby-tabs/emby-tabs';
import '../../elements/emby-scroller/emby-scroller';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import 'webcomponents.js/webcomponents-lite';
import ServerConnections from '../ServerConnections';

2
src/components/itemMediaInfo/itemMediaInfo.js
View file

@ -15,7 +15,7 @@ import '../../elements/emby-button/emby-button';
import '../../elements/emby-button/paper-icon-button-light';
import '../formdialog.css';
import 'material-design-icons-iconfont';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
function setMediaInfo(user, page, item) {

2
src/components/mediaLibraryCreator/mediaLibraryCreator.js
View file

@ -18,7 +18,7 @@ import '../../elements/emby-select/emby-select';
import '../../elements/emby-toggle/emby-toggle';
import '../listview/listview.css';
import '../formdialog.css';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import toast from '../toast/toast';
import alert from '../alert';

2
src/components/mediaLibraryEditor/mediaLibraryEditor.js
View file

@ -16,7 +16,7 @@ import '../listview/listview.css';
import '../../elements/emby-button/paper-icon-button-light';
import '../formdialog.css';
import '../../elements/emby-toggle/emby-toggle';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import toast from '../toast/toast';
import confirm from '../confirm/confirm';

4
src/components/metadataEditor/metadataEditor.js
View file

@ -14,8 +14,8 @@ import '../../elements/emby-textarea/emby-textarea';
import '../../elements/emby-button/emby-button';
import '../../elements/emby-button/paper-icon-button-light';
import '../formdialog.css';
import '../../assets/css/clearbutton.css';
import '../../assets/css/flexstyles.css';
import '../../assets/css/clearbutton.scss';
import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';

2
src/components/recordingcreator/recordingeditor.js
View file

@ -12,7 +12,7 @@ import '../../elements/emby-button/paper-icon-button-light';
import '../formdialog.css';
import './recordingcreator.css';
import 'material-design-icons-iconfont';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
let currentDialog;

2
src/components/recordingcreator/recordingfields.js
View file

@ -7,7 +7,7 @@ import recordingHelper from './recordinghelper';
import '../../elements/emby-button/emby-button';
import '../../elements/emby-button/paper-icon-button-light';
import './recordingfields.css';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';

2
src/components/recordingcreator/seriesrecordingeditor.js
View file

@ -13,7 +13,7 @@ import '../../elements/emby-button/paper-icon-button-light';
import '../formdialog.css';
import './recordingcreator.css';
import 'material-design-icons-iconfont';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
/*eslint prefer-const: "error"*/

2
src/components/search/searchfields.js
View file

@ -4,7 +4,7 @@ import { Events } from 'jellyfin-apiclient';
import browser from '../../scripts/browser';
import AlphaPicker from '../alphaPicker/alphaPicker';
import '../../elements/emby-input/emby-input';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import 'material-design-icons-iconfont';
import './searchfields.css';

2
src/components/sortmenu/sortmenu.js
View file

@ -7,7 +7,7 @@ import '../../elements/emby-button/paper-icon-button-light';
import 'material-design-icons-iconfont';
import '../formdialog.css';
import '../../elements/emby-button/emby-button';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
function onSubmit(e) {
e.preventDefault();

4
src/components/subtitleeditor/subtitleeditor.js
View file

@ -1,4 +1,4 @@
import appHost from '../apphost';
import { appHost } from '../apphost';
import dialogHelper from '../dialogHelper/dialogHelper';
import layoutManager from '../layoutManager';
import globalize from '../../scripts/globalize';
@ -13,7 +13,7 @@ import '../formdialog.css';
import 'material-design-icons-iconfont';
import './subtitleeditor.css';
import '../../elements/emby-button/emby-button';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
import confirm from '../confirm/confirm';

2
src/components/subtitlesettings/subtitlesettings.js
View file

@ -13,7 +13,7 @@ import '../../elements/emby-select/emby-select';
import '../../elements/emby-slider/emby-slider';
import '../../elements/emby-input/emby-input';
import '../../elements/emby-checkbox/emby-checkbox';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import './subtitlesettings.css';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';

2
src/components/tvproviders/schedulesdirect.js
View file

@ -7,7 +7,7 @@ import '../listview/listview.css';
import '../../elements/emby-button/paper-icon-button-light';
import '../../elements/emby-select/emby-select';
import '../../elements/emby-button/emby-button';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import Dashboard from '../../scripts/clientUtils';
import { Events } from 'jellyfin-apiclient';

2
src/components/upnextdialog/upnextdialog.js
View file

@ -8,7 +8,7 @@ import globalize from '../../scripts/globalize';
import itemHelper from '../itemHelper';
import './upnextdialog.css';
import '../../elements/emby-button/emby-button';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
/* eslint-disable indent */

2
src/components/viewSettings/viewSettings.js
View file

@ -9,7 +9,7 @@ import '../../elements/emby-button/paper-icon-button-light';
import '../../elements/emby-select/emby-select';
import 'material-design-icons-iconfont';
import '../formdialog.css';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
function onSubmit(e) {
e.preventDefault();

2
src/controllers/dashboard/dashboard.js
View file

@ -15,7 +15,7 @@ import imageHelper from '../../scripts/imagehelper';
import indicators from '../../components/indicators/indicators';
import '../../components/listview/listview.css';
import '../../elements/emby-button/emby-button';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import '../../elements/emby-itemscontainer/emby-itemscontainer';
import taskButton from '../../scripts/taskbutton';
import Dashboard from '../../scripts/clientUtils';

14
src/controllers/dashboard/devices/devices.js
View file

@ -22,14 +22,12 @@ import confirm from '../../../components/confirm/confirm';
function deleteAllDevices(page) {
const msg = globalize.translate('DeleteDevicesConfirmation');
require(['confirm'], async function (confirm) {
await confirm({
text: msg,
title: globalize.translate('HeaderDeleteDevices'),
confirmText: globalize.translate('ButtonDelete'),
primary: 'delete'
});
confirm({
text: msg,
title: globalize.translate('HeaderDeleteDevices'),
confirmText: globalize.translate('ButtonDelete'),
primary: 'delete'
}).then(async () => {
loading.show();
await Promise.all(
deviceIds.filter(canDelete).map((id) => ApiClient.deleteDevice(id))

2
src/controllers/dashboard/logs.js
View file

@ -2,7 +2,7 @@ import datetime from '../../scripts/datetime';
import loading from '../../components/loading/loading';
import '../../elements/emby-button/emby-button';
import '../../components/listview/listview.css';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
/* eslint-disable indent */

2
src/controllers/dashboard/users/userprofilespage.js
View file

@ -7,7 +7,7 @@ import '../../../elements/emby-button/paper-icon-button-light';
import '../../../components/cardbuilder/card.css';
import '../../../elements/emby-button/emby-button';
import '../../../components/indicators/indicators.css';
import '../../../assets/css/flexstyles.css';
import '../../../assets/css/flexstyles.scss';
import Dashboard from '../../../scripts/clientUtils';
import confirm from '../../../components/confirm/confirm';

2
src/controllers/livetvstatus.js
View file

@ -6,7 +6,7 @@ import layoutManager from '../components/layoutManager';
import loading from '../components/loading/loading';
import browser from '../scripts/browser';
import '../components/listview/listview.css';
import '../assets/css/flexstyles.css';
import '../assets/css/flexstyles.scss';
import '../elements/emby-itemscontainer/emby-itemscontainer';
import '../components/cardbuilder/card.css';
import 'material-design-icons-iconfont';

2
src/controllers/music/musicrecommended.js
View file

@ -13,7 +13,7 @@ import '../../assets/css/scrollstyles.css';
import '../../elements/emby-itemscontainer/emby-itemscontainer';
import '../../elements/emby-tabs/emby-tabs';
import '../../elements/emby-button/emby-button';
import '../../assets/css/flexstyles.css';
import '../../assets/css/flexstyles.scss';
import Dashboard from '../../scripts/clientUtils';
/* eslint-disable indent */

2
src/controllers/session/selectServer/index.js
View file

@ -9,7 +9,7 @@ import actionSheet from '../../../components/actionSheet/actionSheet';
import dom from '../../../scripts/dom';
import browser from '../../../scripts/browser';
import 'material-design-icons-iconfont';
import '../../../assets/css/flexstyles.css';
import '../../../assets/css/flexstyles.scss';
import '../../../elements/emby-scroller/emby-scroller';
import '../../../elements/emby-itemscontainer/emby-itemscontainer';
import '../../../components/cardbuilder/card.css';

21
src/plugins/pdfPlayer/plugin.js
View file

@ -1,12 +1,11 @@
import loading from 'loading';
import keyboardnavigation from 'keyboardnavigation';
import dialogHelper from 'dialogHelper';
import dom from 'dom';
import appRouter from 'appRouter';
import events from 'events';
import 'css!./style';
import 'material-icons';
import 'paper-icon-button-light';
import loading from '../../components/loading/loading';
import keyboardnavigation from '../../scripts/keyboardNavigation';
import dialogHelper from '../../components/dialogHelper/dialogHelper';
import dom from '../../scripts/dom';
import { appRouter } from '../../components/appRouter';
import './style.css';
import '../../elements/emby-button/paper-icon-button-light';
import { Events } from 'jellyfin-apiclient';
export class PdfPlayer {
constructor() {
@ -189,7 +188,7 @@ export class PdfPlayer {
const apiClient = window.connectionManager.getApiClient(serverId);
return new Promise((resolve, reject) => {
import('pdfjs').then(({default: pdfjs}) => {
import('pdfjs-dist').then(({default: pdfjs}) => {
const downloadHref = apiClient.getItemDownloadUrl(item.Id);
this.bindEvents();
@ -266,7 +265,7 @@ export class PdfPlayer {
renderPage(canvas, number) {
this.book.getPage(number).then(page => {
events.trigger(this, 'timeupdate');
Events.trigger(this, 'timeupdate');
const original = page.getViewport({ scale: 1 });
const context = canvas.getContext('2d');

2
src/scripts/libraryMenu.js
View file

@ -14,7 +14,7 @@ import imageHelper from './imagehelper';
import '../elements/emby-button/paper-icon-button-light';
import 'material-design-icons-iconfont';
import '../assets/css/scrollstyles.css';
import '../assets/css/flexstyles.css';
import '../assets/css/flexstyles.scss';
import Dashboard from './clientUtils';
import ServerConnections from '../components/ServerConnections';

4
src/scripts/routes.js
View file

@ -7,10 +7,10 @@ import '../elements/emby-collapse/emby-collapse';
import '../elements/emby-select/emby-select';
import '../elements/emby-checkbox/emby-checkbox';
import '../elements/emby-slider/emby-slider';
import '../assets/css/livetv.css';
import '../assets/css/livetv.scss';
import '../components/listview/listview.css';
import '../assets/css/dashboard.css';
import '../assets/css/detailtable.css';
import '../assets/css/detailtable.scss';
import { appRouter } from '../components/appRouter';
/* eslint-disable indent */

9
src/scripts/site.js
View file

@ -6,8 +6,7 @@ import 'intersection-observer';
import 'classlist.js';
import 'whatwg-fetch';
import 'resize-observer-polyfill';
import 'jellyfin-noto';
import '../assets/css/site.css';
import '../assets/css/site.scss';
import AppInfo from '../components/AppInfo';
import { Events } from 'jellyfin-apiclient';
import ServerConnections from '../components/ServerConnections';
@ -120,10 +119,10 @@ function onGlobalizeInit() {
if (browser.tv && !browser.android) {
console.debug('using system fonts with explicit sizes');
import('../assets/css/fonts.sized.css');
import('../assets/css/fonts.sized.scss');
} else {
console.debug('using default fonts');
import('../assets/css/fonts.css');
import('../assets/css/fonts.scss');
}
import('../assets/css/librarybrowser.css');
@ -173,7 +172,7 @@ function onAppReady() {
console.debug('onAppReady: loading dependencies');
if (browser.iOS) {
import('../assets/css/ios.css');
import('../assets/css/ios.scss');
}
Promise.all([

16
webpack.common.js
View file

@ -56,6 +56,22 @@ module.exports = {
}
}]
},
{
test: /\.s[ac]ss$/i,
use: [
'style-loader',
'css-loader',
{
loader: 'postcss-loader',
options: {
config: {
path: __dirname
}
}
},
'sass-loader'
]
},
{
test: /\.css$/i,
use: [

55
yarn.lock
View file

@ -2547,6 +2547,21 @@ character-reference-invalid@^1.0.0:
resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
"chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.1:
version "3.4.3"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==
dependencies:
anymatch "~3.1.1"
braces "~3.0.2"
glob-parent "~5.1.0"
is-binary-path "~2.1.0"
is-glob "~4.0.1"
normalize-path "~3.0.0"
readdirp "~3.5.0"
optionalDependencies:
fsevents "~2.1.2"
chokidar@^2.0.0, chokidar@^2.1.8:
version "2.1.8"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@ -2566,21 +2581,6 @@ chokidar@^2.0.0, chokidar@^2.1.8:
optionalDependencies:
fsevents "^1.2.7"
chokidar@^3.4.1:
version "3.4.3"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==
dependencies:
anymatch "~3.1.1"
braces "~3.0.2"
glob-parent "~5.1.0"
is-binary-path "~2.1.0"
is-glob "~4.0.1"
normalize-path "~3.0.0"
readdirp "~3.5.0"
optionalDependencies:
fsevents "~2.1.2"
chownr@^1.1.1:
version "1.1.4"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@ -2926,7 +2926,7 @@ config-chain@^1.1.11:
ini "^1.3.4"
proto-list "~1.2.1"
confusing-browser-globals@^1.0.9:
confusing-browser-globals@^1.0.10:
version "1.0.10"
resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz#30d1e7f3d1b882b25ec4933d1d1adac353d20a59"
integrity sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA==
@ -7108,6 +7108,11 @@ kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
klona@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
known-css-properties@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.11.0.tgz#0da784f115ea77c76b81536d7052e90ee6c86a8a"
@ -10797,6 +10802,24 @@ sass-graph@2.2.5:
scss-tokenizer "^0.2.3"
yargs "^13.3.2"
sass-loader@^10.0.5:
version "10.0.5"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.5.tgz#f53505b5ddbedf43797470ceb34066ded82bb769"
integrity sha512-2LqoNPtKkZq/XbXNQ4C64GFEleSEHKv6NPSI+bMC/l+jpEXGJhiRYkAQToO24MR7NU4JRY2RpLpJ/gjo2Uf13w==
dependencies:
klona "^2.0.4"
loader-utils "^2.0.0"
neo-async "^2.6.2"
schema-utils "^3.0.0"
semver "^7.3.2"
sass@^1.29.0:
version "1.29.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.29.0.tgz#ec4e1842c146d8ea9258c28c141b8c2b7c6ab7f1"
integrity sha512-ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==
dependencies:
chokidar ">=2.0.0 <4.0.0"
sax@~1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"