",
"license": "MIT",
@@ -9,98 +9,55 @@
"url": "https://github.com/danhead/windycoys"
},
"scripts": {
- "build": "run-s images css:compile js:compile",
- "css": "run-p -c css:*",
- "css:compile": "postcss -o theme/style.css css/index.css",
- "css:lint": "stylelint css/*.css",
- "images": "node build/imagemin.js",
- "jest": "jest",
- "jest:watch": "jest --watch",
- "js": "run-s js:*",
- "js:compile": "rollup --config rollup.config.js",
- "js:lint": "eslint build js",
- "serve": "node build/serve.js",
- "start": "run-p watch serve",
- "test": "run-s css:lint js:lint jest",
+ "browser-sync": "docker build -t windycoys-browser-sync browser-sync",
+ "build": "run-p build:*",
+ "build:css": "cross-env NODE_ENV=production postcss src/index.css -o dist/style.css",
+ "build:files": "copyfiles -u 1 'src/**/*.{json,php,jpg,png,gif}' dist",
+ "build:ts": "cross-env NODE_ENV=production webpack",
+ "lint": "run-p lint:*",
+ "lint:eslint": "eslint src --ext .ts",
+ "postinstall": "run-p browser-sync",
+ "serve": "docker-compose -f build/docker-compose.dev.yml up --force-recreate 2>/dev/null",
+ "start": "run-p serve watch",
+ "test": "jest",
"watch": "run-p watch:*",
- "watch:css": "nodemon -q --watch css -e css --exec npm run css",
- "watch:images": "nodemon -q --watch images -e png,jpg,gif --exec npm run images",
- "watch:js": "nodemon -q --watch js -e js --exec npm run js"
- },
- "dependencies": {
- "@babel/cli": "^7.14.8",
- "@babel/core": "^7.10.3",
- "@babel/preset-env": "^7.10.3",
- "babel-core": "^7.0.0-bridge.0",
- "babel-jest": "^26.1.0",
- "browser-sync": "^2.27.5",
- "cssnano": "^4.1.10",
- "docker-compose": "^0.12.0",
- "eslint": "^5.16.0",
- "eslint-config-airbnb-base": "^13.2.0",
- "eslint-config-prettier": "^4.3.0",
- "eslint-plugin-import": "^2.21.2",
- "eslint-plugin-prettier": "^3.1.4",
- "husky": "^1.3.1",
- "imagemin": "^6.1.0",
- "imagemin-gifsicle": "^6.0.1",
- "imagemin-jpegtran": "^6.0.0",
- "imagemin-pngquant": "^7.0.0",
- "jest": "^26.1.0",
- "lint-staged": "^8.2.1",
- "mysql": "^2.18.1",
- "nodemon": "^2.0.4",
- "npm-run-all": "^4.1.5",
- "postcss-banner": "^3.0.2",
- "postcss-cli": "^7.1.1",
- "postcss-import": "^12.0.1",
- "postcss-normalize": "^7.0.1",
- "postcss-preset-env": "^6.7.0",
- "prettier": "^1.19.1",
- "rollup": "^1.32.1",
- "rollup-plugin-babel": "^4.4.0",
- "rollup-plugin-uglify": "^6.0.4",
- "stylelint": "^13.6.1",
- "stylelint-config-prettier": "^5.3.0",
- "stylelint-config-standard": "^18.3.0",
- "stylelint-prettier": "^1.1.2"
- },
- "husky": {
- "hooks": {
- "pre-commit": "lint-staged"
- }
- },
- "lint-staged": {
- "build/*.js": [
- "eslint --fix",
- "prettier --write",
- "git add"
- ],
- "css/*.css": [
- "stylelint --fix",
- "prettier --write",
- "git add"
- ],
- "js/*.js": [
- "eslint --fix",
- "prettier --write",
- "jest",
- "git add"
- ]
+ "watch:css": "postcss src/index.css -o dist/styles.css -w",
+ "watch:ts": "webpack -w",
+ "watch:files": "copy-and-watch --watch 'src/**/*.{json,php,jpg,png,gif}' dist/"
},
"browserslist": [
"last 1 version",
"not dead",
"> 2% in GB"
],
- "jest": {
- "testURL": "http://localhost:3000",
- "collectCoverage": true,
- "collectCoverageFrom": [
- "js/**/*.js"
- ],
- "roots": [
- "js"
- ]
+ "devDependencies": {
+ "@prettier/plugin-php": "^0.19.3",
+ "@types/jest": "^27.5.2",
+ "@types/jsdom": "^16.2.15",
+ "@typescript-eslint/eslint-plugin": "^5.15.0",
+ "@typescript-eslint/parser": "^5.15.0",
+ "eslint": "^8.11.0",
+ "eslint-config-prettier": "^8.5.0",
+ "jest": "^27.5.1",
+ "jsdom": "^19.0.0",
+ "prettier": "^2.8.3",
+ "ts-jest": "^27.1.3"
+ },
+ "dependencies": {
+ "copy-and-watch": "^0.1.6",
+ "copyfiles": "^2.4.1",
+ "cross-env": "^7.0.3",
+ "cssnano": "^5.1.14",
+ "npm-run-all": "^4.1.5",
+ "postcss": "^8.4.21",
+ "postcss-banner": "^4.0.1",
+ "postcss-cli": "^9.1.0",
+ "postcss-import": "^14.1.0",
+ "postcss-preset-env": "^7.8.3",
+ "rimraf": "^3.0.2",
+ "ts-loader": "^9.4.2",
+ "typescript": "^4.9.4",
+ "webpack": "^5.75.0",
+ "webpack-cli": "^4.10.0"
}
}
diff --git a/postcss.config.js b/postcss.config.js
index 51139ce..970a30a 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,6 +1,6 @@
-const { resolve } = require('path');
+const { resolve } = require("path");
-const pkg = require(resolve(__dirname, 'package.json'));
+const pkg = require(resolve(__dirname, "package.json"));
const year = new Date().getFullYear();
const banner = `Theme Name: WindyCOYS
@@ -13,22 +13,15 @@ Copyright: (c) ${year} ${pkg.author}
License: MIT
License URI: https://choosealicense.com/licenses/mit/`;
-
-module.exports = ctx => ({
- map: ctx.env !== 'production',
+module.exports = (ctx) => ({
+ map: ctx.env !== "production",
plugins: {
- 'postcss-import': {},
- 'postcss-normalize': {},
- 'postcss-preset-env': {
- stage: 0,
- features: {
- 'custom-properties': {
- preserve: false,
- },
- },
+ "postcss-import": true,
+ "postcss-preset-env": {
+ "custom-media-queries": true,
},
- cssnano: ctx.env === 'production' ? {} : false,
- 'postcss-banner': {
+ cssnano: ctx.env === "production" ? {} : false,
+ "postcss-banner": {
banner,
important: true,
},
diff --git a/rollup.config.js b/rollup.config.js
deleted file mode 100644
index 81d5284..0000000
--- a/rollup.config.js
+++ /dev/null
@@ -1,41 +0,0 @@
-const { resolve } = require('path');
-const { uglify } = require('rollup-plugin-uglify');
-const babel = require('rollup-plugin-babel');
-const pkg = require('./package.json');
-
-const year = new Date().getFullYear();
-
-const production = process.env.NODE_ENV === 'production';
-
-const banner = `/**!
- * Theme Name: WindyCOYS
-* Theme URI: https://github.com/danhead/windycoys/
- * Author: ${pkg.author}
- * Author URI: https://danielhead.com
- * Description: Theme for windycoys.com
- * Version: ${pkg.version}
- * Copyright: (c) ${year} ${pkg.author}
- * License: MIT
- * License URI: https://choosealicense.com/licenses/mit/
- */`;
-
-module.exports = {
- input: resolve(__dirname, 'js/index.js'),
- output: {
- file: resolve(__dirname, 'theme/bundle.js'),
- format: 'umd',
- name: 'windy',
- sourcemap: !production && 'inline',
- banner,
- },
- plugins: [
- babel({
- exclude: 'node_modules/**',
- }),
- production && uglify({
- output: {
- preamble: banner,
- },
- }),
- ].filter(Boolean),
-};
diff --git a/theme/404.php b/src/404.php
similarity index 100%
rename from theme/404.php
rename to src/404.php
diff --git a/theme/classes/walker.comments.php b/src/classes/walker.comments.php
similarity index 94%
rename from theme/classes/walker.comments.php
rename to src/classes/walker.comments.php
index 9a72106..c3ab211 100644
--- a/theme/classes/walker.comments.php
+++ b/src/classes/walker.comments.php
@@ -35,7 +35,7 @@ class Windycoys_Walker_Comments extends Walker_Comment {
$reply_link
);
$output .= '';
+ $output .= '';
$output .= '';
$output .= '';
$output .= '';
diff --git a/theme/classes/walker.navigation.php b/src/classes/walker.navigation.php
similarity index 100%
rename from theme/classes/walker.navigation.php
rename to src/classes/walker.navigation.php
diff --git a/src/comments.php b/src/comments.php
new file mode 100644
index 0000000..151558d
--- /dev/null
+++ b/src/comments.php
@@ -0,0 +1,50 @@
+ 'comment-respond__form',
+ "class_submit" => 'comment-respond__submit',
+ "comment_field" => '',
+ "logged_in_as" => '',
+ "title_reply_before" => '',
+ "fields" => array(
+ "author" => '',
+ "email" => '',
+ "url" => '',
+ "cookies" => '',
+ ),
+);
+?>
+
diff --git a/css/archive.css b/src/css/archive.css
similarity index 100%
rename from css/archive.css
rename to src/css/archive.css
diff --git a/css/article.css b/src/css/article.css
similarity index 100%
rename from css/article.css
rename to src/css/article.css
diff --git a/css/avatar.css b/src/css/avatar.css
similarity index 100%
rename from css/avatar.css
rename to src/css/avatar.css
diff --git a/css/base.css b/src/css/base.css
similarity index 100%
rename from css/base.css
rename to src/css/base.css
diff --git a/css/comment-respond.css b/src/css/comment-respond.css
similarity index 100%
rename from css/comment-respond.css
rename to src/css/comment-respond.css
diff --git a/css/comment.css b/src/css/comment.css
similarity index 100%
rename from css/comment.css
rename to src/css/comment.css
diff --git a/css/comments.css b/src/css/comments.css
similarity index 100%
rename from css/comments.css
rename to src/css/comments.css
diff --git a/css/content.css b/src/css/content.css
similarity index 100%
rename from css/content.css
rename to src/css/content.css
diff --git a/css/excerpt.css b/src/css/excerpt.css
similarity index 100%
rename from css/excerpt.css
rename to src/css/excerpt.css
diff --git a/css/footer.css b/src/css/footer.css
similarity index 100%
rename from css/footer.css
rename to src/css/footer.css
diff --git a/css/icon.css b/src/css/icon.css
similarity index 100%
rename from css/icon.css
rename to src/css/icon.css
diff --git a/css/index.css b/src/css/index.css
similarity index 98%
rename from css/index.css
rename to src/css/index.css
index 14e3535..28f5b71 100644
--- a/css/index.css
+++ b/src/css/index.css
@@ -1,38 +1,27 @@
-@import "normalize";
@import "base";
-@import "page";
-@import "nav";
-@import "menu";
-@import "logo";
-@import "social";
-@import "icon";
-@import "metadata";
-@import "search";
-@import "article";
-@import "content";
-@import "footer";
-@import "comments";
-@import "comment";
-@import "comment-respond";
-@import "avatar";
-@import "link";
-@import "pagination";
-@import "title";
@import "archive";
+@import "article";
+@import "avatar";
+@import "comment-respond";
+@import "comment";
+@import "comments";
+@import "content";
@import "excerpt";
+@import "footer";
+@import "icon";
+@import "link";
+@import "logo";
+@import "menu";
+@import "metadata";
+@import "nav";
+@import "page";
+@import "pagination";
+@import "search";
@import "silhouette";
+@import "social";
+@import "title";
-:root {
- --color-black: #000;
- --color-near-black: #333;
- --color-dark-blue: #201f42;
- --color-light-blue: #1574d2;
- --color-pale-blue: #e9f4ff;
- --color-grey: #757575;
- --color-light-grey: #e0e0e0;
- --color-facebook: #3e5a98;
- --color-twitter: #1da1f2;
- --color-rss: #ee802f;
+body {
--space-xxs: 0.25rem;
--space-xs: 0.5rem;
--space-sm: 1rem;
@@ -66,6 +55,19 @@
--transition-sl: 0.6s;
--heading-font-family: "Raleway", sans-serif;
--body-font-family: "Open Sans", sans-serif;
+}
+
+.theme-light {
+ --color-black: #000;
+ --color-near-black: #333;
+ --color-dark-blue: #201f42;
+ --color-light-blue: #1574d2;
+ --color-pale-blue: #e9f4ff;
+ --color-grey: #757575;
+ --color-light-grey: #e0e0e0;
+ --color-facebook: #3e5a98;
+ --color-twitter: #1da1f2;
+ --color-rss: #ee802f;
--link-focus: 0 0.1rem 0 0 var(--color-light-blue);
--image-focus: 0 0 0 0.2rem #fff, 0 0 0 0.4rem var(--color-light-blue);
--bullet-size: 0.45rem;
diff --git a/css/link.css b/src/css/link.css
similarity index 100%
rename from css/link.css
rename to src/css/link.css
diff --git a/css/logo.css b/src/css/logo.css
similarity index 100%
rename from css/logo.css
rename to src/css/logo.css
diff --git a/css/menu.css b/src/css/menu.css
similarity index 100%
rename from css/menu.css
rename to src/css/menu.css
diff --git a/css/metadata.css b/src/css/metadata.css
similarity index 100%
rename from css/metadata.css
rename to src/css/metadata.css
diff --git a/css/nav.css b/src/css/nav.css
similarity index 100%
rename from css/nav.css
rename to src/css/nav.css
diff --git a/css/page.css b/src/css/page.css
similarity index 100%
rename from css/page.css
rename to src/css/page.css
diff --git a/css/pagination.css b/src/css/pagination.css
similarity index 100%
rename from css/pagination.css
rename to src/css/pagination.css
diff --git a/css/search.css b/src/css/search.css
similarity index 100%
rename from css/search.css
rename to src/css/search.css
diff --git a/css/silhouette.css b/src/css/silhouette.css
similarity index 100%
rename from css/silhouette.css
rename to src/css/silhouette.css
diff --git a/css/social.css b/src/css/social.css
similarity index 100%
rename from css/social.css
rename to src/css/social.css
diff --git a/src/css/theme.css b/src/css/theme.css
new file mode 100644
index 0000000..e69de29
diff --git a/css/title.css b/src/css/title.css
similarity index 100%
rename from css/title.css
rename to src/css/title.css
diff --git a/theme/footer.php b/src/footer.php
similarity index 100%
rename from theme/footer.php
rename to src/footer.php
diff --git a/theme/front-page.php b/src/front-page.php
similarity index 84%
rename from theme/front-page.php
rename to src/front-page.php
index 001e8ac..e1a90dd 100644
--- a/theme/front-page.php
+++ b/src/front-page.php
@@ -8,7 +8,7 @@
- 
-
-