manuel/uhr
1
0
Fork 0
Code Issues 5 Pull requests Releases Wiki Activity

feature/3-migrate-from-grunt-to-webpack #13

Merged
manuel merged 9 commits from feature/3-migrate-from-grunt-to-webpack into develop 2021-02-24 17:01:20 +01:00
Conversation 0 Commits 9 Files changed 52 +90 -80
46 changed files with 90 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a45d25ded6 - Show all commits

1
build-config/entrypoints/css-app.js Normal file
View file

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

1
build-config/entrypoints/css-black.js Normal file
View file

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

1
build-config/entrypoints/css-blue.js Normal file
View file

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

1
build-config/entrypoints/css-green.js Normal file
View file

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

1
build-config/entrypoints/css-pink.js Normal file
View file

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

1
build-config/entrypoints/css-red.js Normal file
View file

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

1
build-config/entrypoints/css-white.js Normal file
View file

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

1
build-config/entrypoints/css-yellow.js Normal file
View file

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

1
build-config/entrypoints/js-app.js Normal file
View file

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

2
build-config/entrypoints/js-base.js Normal file
View file

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

9
build-config/entrypoints/js-baselangs.js Normal file
View file

@ -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';

11
build-config/entrypoints/js-complete.js Normal file
View file

@ -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';

10
build-config/entrypoints/js-langs.js Normal file
View file

@ -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';

3
build-config/entrypoints/js-libs.js Normal file
View file

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

2
rollup.config-css-app.js → build-config/rollup.config.css-app.js
View file

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

2
rollup.config-css-black.js → build-config/rollup.config.css-black.js
View file

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

2
rollup.config-css-blue.js → build-config/rollup.config.css-blue.js
View file

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

2
rollup.config-css-green.js → build-config/rollup.config.css-green.js
View file

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

2
rollup.config-css-pink.js → build-config/rollup.config.css-pink.js
View file

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

2
rollup.config-css-red.js → build-config/rollup.config.css-red.js
View file

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

2
rollup.config-css-white.js → build-config/rollup.config.css-white.js
View file

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

2
rollup.config-css-yellow.js → build-config/rollup.config.css-yellow.js
View file

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

2
rollup.config-app.js → build-config/rollup.config.js-app.js
View file

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

2
rollup.config-base.js → build-config/rollup.config.js-base.js
View file

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

2
rollup.config-baselangs.js → build-config/rollup.config.js-baselangs.js
View file

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

2
rollup.config-complete.js → build-config/rollup.config.js-complete.js
View file

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

2
rollup.config-langs.js → build-config/rollup.config.js-langs.js
View file

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

2
rollup.config-libs.js → build-config/rollup.config.js-libs.js
View file

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

1
build-configs/css-app.js
View file

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

1
build-configs/css-black.js
View file

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

1
build-configs/css-blue.js
View file

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

1
build-configs/css-green.js
View file

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

1
build-configs/css-pink.js
View file

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

1
build-configs/css-red.js
View file

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

1
build-configs/css-white.js
View file

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

1
build-configs/css-yellow.js
View file

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

1
build-configs/js-app.js
View file

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

2
build-configs/js-base.js
View file

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

9
build-configs/js-baselangs.js
View file

@ -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"

11
build-configs/js-complete.js
View file

@ -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"

10
build-configs/js-langs.js
View file

@ -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"

3
build-configs/js-libs.js
View file

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

8
dist/libs.js vendored
View file

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

8
dist/libs.min.js vendored
View file

File diff suppressed because one or more lines are too long

9
package-lock.json generated
View file

@ -3168,6 +3168,15 @@
"integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=", "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
"dev": true "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": { "rollup": {
"version": "2.39.1", "version": "2.39.1",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.39.1.tgz", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.39.1.tgz",

29
package.json
View file

@ -10,20 +10,20 @@
"prebuild": "npm run clean", "prebuild": "npm run clean",
"build": "npm-run-all --parallel rollup:js:* rollup:css:*", "build": "npm-run-all --parallel rollup:js:* rollup:css:*",
"clean": "rimraf dist", "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/", "homepage": "http://bärneruhr.ch/",
"author": { "author": {
@ -55,6 +55,7 @@
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"phantomjs-prebuilt": "2.1.16", "phantomjs-prebuilt": "2.1.16",
"postcss": "^8.2.6", "postcss": "^8.2.6",
"rimraf": "^3.0.2",
"rollup": "^2.39.1", "rollup": "^2.39.1",
"rollup-plugin-css-bundle": "^1.0.4", "rollup-plugin-css-bundle": "^1.0.4",
"rollup-plugin-terser": "^7.0.2" "rollup-plugin-terser": "^7.0.2"