For upgrades
[wolnelektury.git] / src / wolnelektury / settings / static.py
index e91c742..9c2960f 100644 (file)
@@ -1,5 +1,5 @@
-# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #
 from os import path
 from .paths import VAR_DIR
@@ -21,7 +21,7 @@ IMAGE_DIR = 'book/pictures/'
 
 PIPELINE = {
     'STYLESHEETS': {
-        '2022': {
+        'main': {
             'source_filenames': [
                 'contrib/jquery-ui-1.13.1.custom/jquery-ui.css',
                 'css/jquery.countdown.css',
@@ -29,17 +29,22 @@ PIPELINE = {
                 '2022/styles/main.scss',
                 '2022/more.scss',
                 'chunks/edit.scss',
+
+                'scss/text.scss',
+                '2022/styles/reader_player.scss',
             ],
-            'output_filename': 'css/compressed/2022.css',
+            'output_filename': 'css/compressed/main.css',
         },
         'book_text': {
             'source_filenames': [
                 'css/import/gelasio.css',
+
                 'scss/book_text.scss',
                 'css/new.book.css',
-                'annoy/banner.scss',
-                'annoy/book_text.scss',
-                '2022/styles/reader_player.scss',
+
+                'annoy/banner.scss',  # ?
+                'annoy/book_text.scss',  # ?
+                '2022/styles/reader_player.scss',  # ?
 
                 'css/master.picture.css',
             ],
@@ -51,20 +56,32 @@ PIPELINE = {
         },
     },
     'JAVASCRIPT': {
-        '2022': {
+        'main': {
             'source_filenames': [
                 '2022/scripts/vendor.js',
                 'contrib/jquery-ui-1.13.1.custom/jquery-ui.js',
+                #'js/contrib/jquery.scrollto.js',
 
                 'js/search.js',
-                'js/2022.js',
-                '2022/book/filter.js',
+                'js/header.js',
+                'book/filter.js',
                 'chunks/edit.js',
                 '2022/scripts/modernizr.js',
-                '2021/scripts/main.js',
+                'js/main.js',
 
                 'js/contrib/jquery.cycle2.min.js',
                 'sponsors/js/sponsors.js',
+                'annoy/banner.js',
+                'js/book_text/info.js',
+                'js/book_text/menu.js',
+                'js/book_text/note.js',
+                'js/book_text/references.js',
+                'js/book_text/settings.js',
+                'js/book_text/toc.js',
+                'js/book_text/progress.js',
+
+                'js/book_text/pbox.js',
+                'js/book_text/pbox-items.js',
 
                 'js/contrib/jquery.countdown.js', 'js/contrib/jquery.countdown-pl.js',
                 'js/contrib/jquery.countdown-de.js', 'js/contrib/jquery.countdown-uk.js',
@@ -73,20 +90,23 @@ PIPELINE = {
                 'pdcounter/pdcounter.js',
 
             ],
-            'output_filename': 'js/2022.min.js'
+            'output_filename': 'js/compressed/main.min.js'
         },
-        '2022_player': {
+        'player': {
             'source_filenames': [
                 'js/contrib/jplayer/jquery.jplayer.min.js',
                 'js/contrib/jplayer/jplayer.playlist.min.js',
-                'player/2022_player.js',
+                'player/player.js',
             ],
-            'output_filename': 'js/2022_player.min.js',
+            'output_filename': 'js/compressed/player.min.js',
         },
         'book_text': {
             'source_filenames': [
                 'js/contrib/jquery.form.js',
                 'js/contrib/jquery.jqmodal.js',
+
+                'js/contrib/jquery.scrollto.js',
+
                 'js/book_text/info.js',
                 'js/book_text/menu.js',
                 'js/book_text/note.js',
@@ -114,18 +134,18 @@ PIPELINE = {
             'output_filename': 'js/widget.min.js',
         },
     },
-    'CSS_COMPRESSOR': None,
     'JS_COMPRESSOR': 'pipeline.compressors.jsmin.JSMinCompressor',
-    'COMPILERS': (
-        'libsasscompiler.LibSassCompiler',
-    )
+    'COMPILERS': ('pipeline.compilers.sass.SASSCompiler',),
+    'SASS_BINARY': '/opt/dart-sass/sass',
+    'SASS_ARGUMENTS': '--embed-source-map --embed-sources',
+    # Compress CSSwith a second run of dart-sass.
+    'CSS_COMPRESSOR': 'pipeline.compressors.cssmin.CSSMinCompressor',
+    'CSSMIN_BINARY': '/opt/dart-sass/sass',
+    'CSSMIN_ARGUMENTS': '--stdin --style=compressed --no-source-map',
 }
 
 STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineManifestStorage'
 
-# PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
-# PIPELINE_PYSCSS_ARGUMENTS = ''
-
 
 STATICFILES_FINDERS = [
     'django.contrib.staticfiles.finders.FileSystemFinder',