Reorganize all build related files into a more or less sensible folder structure.

build-config/entrypoints/css-app.js

@@ -0,0 +1 @@
+import '../../css/uhr.css';

build-config/entrypoints/css-black.js

@@ -0,0 +1 @@
+import '../../css/uhr-black.css';

build-config/entrypoints/css-blue.js

@@ -0,0 +1 @@
+import '../../css/uhr-blue.css';

build-config/entrypoints/css-green.js

@@ -0,0 +1 @@
+import '../../css/uhr-green.css';

build-config/entrypoints/css-pink.js

@@ -0,0 +1 @@
+import '../../css/uhr-pink.css';

build-config/entrypoints/css-red.js

@@ -0,0 +1 @@
+import '../../css/uhr-red.css';

build-config/entrypoints/css-white.js

@@ -0,0 +1 @@
+import '../../css/uhr-white.css';

build-config/entrypoints/css-yellow.js

@@ -0,0 +1 @@
+import '../../css/uhr-yellow.css';

build-config/entrypoints/js-app.js

@@ -0,0 +1 @@
+import '../../src/uhr';

build-config/entrypoints/js-base.js

@@ -0,0 +1,2 @@
+import '../../src/uhr';
+import '../../src/uhr-de_CH';

build-config/entrypoints/js-baselangs.js

@@ -0,0 +1,9 @@
+import '../../src/uhr-de';
+import '../../src/uhr-de_CH_genau';
+import '../../src/uhr-dk';
+import '../../src/uhr-en';
+import '../../src/uhr-es';
+import '../../src/uhr-fr';
+import '../../src/uhr-it';
+import '../../src/uhr-nl';
+import '../../src/uhr-pt';

build-config/entrypoints/js-complete.js

@@ -0,0 +1,11 @@
+import '../../src/uhr';
+import '../../src/uhr-de';
+import '../../src/uhr-de_CH';
+import '../../src/uhr-de_CH_genau';
+import '../../src/uhr-dk';
+import '../../src/uhr-en';
+import '../../src/uhr-es';
+import '../../src/uhr-fr';
+import '../../src/uhr-it';
+import '../../src/uhr-nl';
+import '../../src/uhr-pt';

build-config/entrypoints/js-langs.js

@@ -0,0 +1,10 @@
+import '../../src/uhr-de';
+import '../../src/uhr-de_CH';
+import '../../src/uhr-de_CH_genau';
+import '../../src/uhr-dk';
+import '../../src/uhr-en';
+import '../../src/uhr-es';
+import '../../src/uhr-fr';
+import '../../src/uhr-it';
+import '../../src/uhr-nl';
+import '../../src/uhr-pt';

build-config/entrypoints/js-libs.js

@@ -0,0 +1,3 @@
+import 'jquery';
+import 'jquery-ui';
+import 'jquery.cookie';

build-config/rollup.config.css-app.js

@@ -3,7 +3,7 @@ import postcss from "postcss";
 import cssnano from "cssnano";
 
 export default {
-    input: 'build-configs/css-app.js',
+    input: 'build-config/entrypoints/css-app.js',
     plugins: [cssbundle({
         transform: code => postcss([cssnano]).process(code),
         output: 'dist/uhr.min.css'

build-config/rollup.config.css-black.js

@@ -3,7 +3,7 @@ import postcss from 'postcss';
 import cssnano from 'cssnano';
 
 export default {
-    input: 'build-configs/css-black.js',
+    input: 'build-config/entrypoints/css-black.js',
     plugins: [cssbundle({
         transform: code => postcss([cssnano]).process(code),
         output: 'dist/uhr-black.min.css'

build-config/rollup.config.css-blue.js

@@ -3,7 +3,7 @@ import postcss from 'postcss';
 import cssnano from 'cssnano';
 
 export default {
-    input: 'build-configs/css-blue.js',
+    input: 'build-config/entrypoints/css-blue.js',
     plugins: [cssbundle({
         transform: code => postcss([cssnano]).process(code),
         output: 'dist/uhr-blue.min.css'

build-config/rollup.config.css-green.js

@@ -3,7 +3,7 @@ import postcss from 'postcss';
 import cssnano from 'cssnano';
 
 export default {
-    input: 'build-configs/css-green.js',
+    input: 'build-config/entrypoints/css-green.js',
     plugins: [cssbundle({
         transform: code => postcss([cssnano]).process(code),
         output: 'dist/uhr-green.min.css'

build-config/rollup.config.css-pink.js

@@ -3,7 +3,7 @@ import postcss from 'postcss';
 import cssnano from 'cssnano';
 
 export default {
-    input: 'build-configs/css-pink.js',
+    input: 'build-config/entrypoints/css-pink.js',
     plugins: [cssbundle({
         transform: code => postcss([cssnano]).process(code),
         output: 'dist/uhr-pink.min.css'

build-config/rollup.config.css-red.js

@@ -3,7 +3,7 @@ import postcss from 'postcss';
 import cssnano from 'cssnano';
 
 export default {
-    input: 'build-configs/css-red.js',
+    input: 'build-config/entrypoints/css-red.js',
     plugins: [cssbundle({
         transform: code => postcss([cssnano]).process(code),
         output: 'dist/uhr-red.min.css'

build-config/rollup.config.css-white.js

@@ -3,7 +3,7 @@ import postcss from 'postcss';
 import cssnano from 'cssnano';
 
 export default {
-    input: 'build-configs/css-white.js',
+    input: 'build-config/entrypoints/css-white.js',
     plugins: [cssbundle({
         transform: code => postcss([cssnano]).process(code),
         output: 'dist/uhr-white.min.css'

build-config/rollup.config.css-yellow.js

@@ -3,7 +3,7 @@ import postcss from 'postcss';
 import cssnano from 'cssnano';
 
 export default {
-    input: 'build-configs/css-yellow.js',
+    input: 'build-config/entrypoints/css-yellow.js',
     plugins: [cssbundle({
         transform: code => postcss([cssnano]).process(code),
         output: 'dist/uhr-yellow.min.css'

build-config/rollup.config.js-app.js

@@ -6,7 +6,7 @@ export default {
         'jquery-ui',
         'jquery.cookie'
     ],
-    input: 'build-configs/js-app.js',
+    input: 'build-config/entrypoints/js-app.js',
     output: [
         {
             dir: 'dist',

build-config/rollup.config.js-base.js

@@ -6,7 +6,7 @@ export default {
         'jquery-ui',
         'jquery.cookie'
     ],
-    input: 'build-configs/js-base.js',
+    input: 'build-config/entrypoints/js-base.js',
     output: [
         {
             dir: 'dist',

build-config/rollup.config.js-baselangs.js

@@ -6,7 +6,7 @@ export default {
         'jquery-ui',
         'jquery.cookie'
     ],
-    input: 'build-configs/js-baselangs.js',
+    input: 'build-config/entrypoints/js-baselangs.js',
     output: [
         {
             dir: 'dist',

build-config/rollup.config.js-complete.js

@@ -6,7 +6,7 @@ export default {
         'jquery-ui',
         'jquery.cookie'
     ],
-    input: 'build-configs/js-complete.js',
+    input: 'build-config/entrypoints/js-complete.js',
     output: [
         {
             dir: 'dist',

build-config/rollup.config.js-langs.js

@@ -6,7 +6,7 @@ export default {
         'jquery-ui',
         'jquery.cookie'
     ],
-    input: 'build-configs/js-langs.js',
+    input: 'build-config/entrypoints/js-langs.js',
     output: [
         {
             dir: 'dist',

build-config/rollup.config.js-libs.js

@@ -2,7 +2,7 @@ import {terser} from 'rollup-plugin-terser';
 import {nodeResolve} from '@rollup/plugin-node-resolve';
 
 export default {
-    input: 'build-configs/js-libs.js',
+    input: 'build-config/entrypoints/js-libs.js',
     output: [
         {
             dir: 'dist',

build-configs/css-app.js

@@ -1 +0,0 @@
-import '../css/uhr.css';

build-configs/css-black.js

@@ -1 +0,0 @@
-import '../css/uhr-black.css';

build-configs/css-blue.js

@@ -1 +0,0 @@
-import '../css/uhr-blue.css';

build-configs/css-green.js

@@ -1 +0,0 @@
-import '../css/uhr-green.css';

build-configs/css-pink.js

@@ -1 +0,0 @@
-import '../css/uhr-pink.css';

build-configs/css-red.js

@@ -1 +0,0 @@
-import '../css/uhr-red.css';

build-configs/css-white.js

@@ -1 +0,0 @@
-import '../css/uhr-white.css';

build-configs/css-yellow.js

@@ -1 +0,0 @@
-import '../css/uhr-yellow.css';

build-configs/js-app.js

@@ -1 +0,0 @@
-import "../src/uhr"

build-configs/js-base.js

@@ -1,2 +0,0 @@
-import "../src/uhr"
-import "../src/uhr-de_CH"

build-configs/js-baselangs.js

@@ -1,9 +0,0 @@
-import "../src/uhr-de"
-import "../src/uhr-de_CH_genau"
-import "../src/uhr-dk"
-import "../src/uhr-en"
-import "../src/uhr-es"
-import "../src/uhr-fr"
-import "../src/uhr-it"
-import "../src/uhr-nl"
-import "../src/uhr-pt"

build-configs/js-complete.js

@@ -1,11 +0,0 @@
-import "../src/uhr"
-import "../src/uhr-de"
-import "../src/uhr-de_CH"
-import "../src/uhr-de_CH_genau"
-import "../src/uhr-dk"
-import "../src/uhr-en"
-import "../src/uhr-es"
-import "../src/uhr-fr"
-import "../src/uhr-it"
-import "../src/uhr-nl"
-import "../src/uhr-pt"

build-configs/js-langs.js

@@ -1,10 +0,0 @@
-import "../src/uhr-de"
-import "../src/uhr-de_CH"
-import "../src/uhr-de_CH_genau"
-import "../src/uhr-dk"
-import "../src/uhr-en"
-import "../src/uhr-es"
-import "../src/uhr-fr"
-import "../src/uhr-it"
-import "../src/uhr-nl"
-import "../src/uhr-pt"

build-configs/js-libs.js

@@ -1,3 +0,0 @@
-import "jquery"
-import "jquery-ui"
-import "jquery.cookie"

dist/libs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 /*!
- * jQuery JavaScript Library v3.5.0
+ * jQuery JavaScript Library v3.5.1
  * https://jquery.com/
  *
  * Includes Sizzle.js
@@ -11,7 +11,7 @@
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2020-04-10T15:07Z
+ * Date: 2020-05-04T22:49Z
  */
 ( function( global, factory ) {
 
@@ -141,7 +141,7 @@ function toType( obj ) {
 
 
 var
-	version = "3.5.0",
+	version = "3.5.1",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -4237,7 +4237,7 @@ Data.prototype = {
 
 		// If not, create one
 		if ( !value ) {
-			value = Object.create( null );
+			value = {};
 
 			// We can accept data for non-element nodes in modern browsers,
 			// but we should not, see #8335.

package-lock.json

@@ -3168,6 +3168,15 @@
             "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
             "dev": true
         },
+        "rimraf": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "dev": true,
+            "requires": {
+                "glob": "^7.1.3"
+            }
+        },
         "rollup": {
             "version": "2.39.1",
             "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.39.1.tgz",

package.json

@@ -10,20 +10,20 @@
         "prebuild": "npm run clean",
         "build": "npm-run-all --parallel rollup:js:* rollup:css:*",
         "clean": "rimraf dist",
-        "rollup:js:app": "rollup --config rollup.config-app.js",
+        "rollup:js:app": "rollup --config build-config/rollup.config.js-app.js",
-        "rollup:js:base": "rollup --config rollup.config-base.js",
+        "rollup:js:base": "rollup --config build-config/rollup.config.js-base.js",
-        "rollup:js:baselangs": "rollup --config rollup.config-baselangs.js",
+        "rollup:js:baselangs": "rollup --config build-config/rollup.config.js-baselangs.js",
-        "rollup:js:complete": "rollup --config rollup.config-complete.js",
+        "rollup:js:complete": "rollup --config build-config/rollup.config.js-complete.js",
-        "rollup:js:langs": "rollup --config rollup.config-langs.js",
+        "rollup:js:langs": "rollup --config build-config/rollup.config.js-langs.js",
-        "rollup:js:libs": "rollup --config rollup.config-libs.js",
+        "rollup:js:libs": "rollup --config build-config/rollup.config.js-libs.js",
-        "rollup:css:app": "rollup --config rollup.config-css-app.js",
+        "rollup:css:app": "rollup --config build-config/rollup.config.css-app.js",
-        "rollup:css:black": "rollup --config rollup.config-css-black.js",
+        "rollup:css:black": "rollup --config build-config/rollup.config.css-black.js",
-        "rollup:css:blue": "rollup --config rollup.config-css-blue.js",
+        "rollup:css:blue": "rollup --config build-config/rollup.config.css-blue.js",
-        "rollup:css:green": "rollup --config rollup.config-css-green.js",
+        "rollup:css:green": "rollup --config build-config/rollup.config.css-green.js",
-        "rollup:css:pink": "rollup --config rollup.config-css-pink.js",
+        "rollup:css:pink": "rollup --config build-config/rollup.config.css-pink.js",
-        "rollup:css:red": "rollup --config rollup.config-css-red.js",
+        "rollup:css:red": "rollup --config build-config/rollup.config.css-red.js",
-        "rollup:css:white": "rollup --config rollup.config-css-white.js",
+        "rollup:css:white": "rollup --config build-config/rollup.config.css-white.js",
-        "rollup:css:yellow": "rollup --config rollup.config-css-yellow.js"
+        "rollup:css:yellow": "rollup --config build-config/rollup.config.css-yellow.js"
     },
     "homepage": "http://bärneruhr.ch/",
     "author": {
@@ -55,6 +55,7 @@
         "npm-run-all": "^4.1.5",
         "phantomjs-prebuilt": "2.1.16",
         "postcss": "^8.2.6",
+        "rimraf": "^3.0.2",
         "rollup": "^2.39.1",
         "rollup-plugin-css-bundle": "^1.0.4",
         "rollup-plugin-terser": "^7.0.2"