Prepare for centralised deployment

This commit is contained in:
Florine W. Dekker 2021-04-15 19:02:49 +02:00
parent 79b68fdb2c
commit 7b7934dba1
Signed by: FWDekker
GPG Key ID: B1B567AF58D6EE0F
6 changed files with 28 additions and 26 deletions

View File

@ -6,6 +6,13 @@ module.exports = grunt => {
clean: {
default: ["dist/"],
},
cssmin: {
target: {
files: {
"dist/bundle.css": "src/main/css/main.css",
},
},
},
focus: {
dev: {
include: ["css", "js"],
@ -13,26 +20,22 @@ module.exports = grunt => {
},
webpack: {
options: {
entry: "./src/main/js/Template.js",
entry: "./src/main/js/main.js",
module: {
rules: [
{
test: /\.js$/i,
exclude: /node_modules/,
},
{
test: /\.css$/i,
use: ["style-loader", "css-loader"],
},
],
},
resolve: {
extensions: [".js", ".css"],
extensions: [".js"],
},
output: {
library: "fwdekker-template",
libraryTarget: "umd",
filename: "index.js",
filename: "bundle.js",
path: path.resolve(__dirname, "dist"),
}
},
@ -47,7 +50,7 @@ module.exports = grunt => {
watch: {
css: {
files: ["src/main/**/*.css"],
tasks: ["webpack:dev"],
tasks: ["cssmin"],
},
js: {
files: ["src/main/**/*.js"],
@ -57,13 +60,14 @@ module.exports = grunt => {
});
grunt.loadNpmTasks("grunt-contrib-clean");
grunt.loadNpmTasks("grunt-contrib-cssmin");
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("grunt-focus");
grunt.loadNpmTasks("grunt-webpack");
grunt.registerTask("dev", ["webpack:dev"]);
grunt.registerTask("dev", ["webpack:dev", "cssmin"]);
grunt.registerTask("dev:server", ["dev", "focus:dev"]);
grunt.registerTask("deploy", ["webpack:deploy"]);
grunt.registerTask("deploy", ["webpack:deploy", "cssmin"]);
grunt.registerTask("default", ["dev"]);
};

BIN
package-lock.json generated

Binary file not shown.

View File

@ -1,6 +1,6 @@
{
"name": "@fwdekker/template",
"version": "0.0.27",
"version": "1.0.0",
"description": "The base template for pages on fwdekker.com.",
"author": "Felix W. Dekker (https://fwdekker.com)",
"license": "MIT",
@ -12,9 +12,10 @@
"bugs": {
"url": "https://git.fwdekker.com/FWDekker/fwdekker-template/issues"
},
"browser": "dist/index.js",
"browser": "bundle.js",
"files": [
"dist/index.js"
"dist/bundle.js",
"dist/bundle.css"
],
"scripts": {
"clean": "grunt clean",
@ -24,18 +25,19 @@
"prepare": "grunt clean deploy"
},
"dependencies": {
"milligram": "^1.4.1"
"milligram": "^1.4.1",
"normalize.css": "^8.0.1"
},
"devDependencies": {
"css-loader": "^5.2.1",
"grunt": "^1.3.0",
"grunt-cli": "^1.4.2",
"grunt-contrib-clean": "^2.0.0",
"grunt-contrib-cssmin": "^4.0.0",
"grunt-contrib-sass": "^2.0.0",
"grunt-contrib-watch": "^1.1.0",
"grunt-focus": "^1.0.0",
"grunt-webpack": "^4.0.2",
"style-loader": "^2.0.0",
"webpack": "^5.32.0",
"webpack": "^5.33.2",
"webpack-cli": "^4.6.0"
}
}

5
src/main/css/main.css Normal file
View File

@ -0,0 +1,5 @@
@import "../../../node_modules/normalize.css/normalize.css";
@import "../../../node_modules/milligram/dist/milligram.css";
@import "common.css";
@import "nav.css";
@import "overrides.css";

View File

@ -1,2 +0,0 @@
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:0.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace, monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace, monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-0.25em}sup{top:-0.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type="button"],[type="reset"],[type="submit"],button{-webkit-appearance:button}[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:0.35em 0.75em 0.625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none}

View File

@ -1,10 +1,3 @@
import "../css/normalize.css";
import "milligram/dist/milligram.min.css";
import "../css/common.css";
import "../css/nav.css";
import "../css/overrides.css";
/**
* Converts the given string to an HTML element.
*