Skip to content

Commit

Permalink
Update dependencies (#674)
Browse files Browse the repository at this point in the history
  • Loading branch information
maxcell authored Jul 7, 2022
1 parent f67ab45 commit be22c5f
Show file tree
Hide file tree
Showing 69 changed files with 4,263 additions and 6,632 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ dist/
site/data/webpack.json
/npm-debug.log
yarn-error.log
.netlify/
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12
16
4 changes: 2 additions & 2 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build.environment]
YARN_VERSION = "1.12.1"
NPM_VERSION = "6.4.1"
NETLIFY_USE_YARN = "true"
YARN_VERSION = "1.22.17"

[build]
command = "yarn build"
Expand Down
84 changes: 42 additions & 42 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,48 +22,48 @@
"author": "",
"license": "MIT",
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/plugin-proposal-object-rest-spread": "^7.11.0",
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
"@babel/preset-env": "^7.11.5",
"@babel/preset-react": "^7.10.4",
"@babel/register": "^7.11.5",
"assets-webpack-plugin": "^3.9.7",
"babel-eslint": "^10.0.1",
"babel-loader": "^8.0.4",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.0.0",
"cross-env": "^7.0.0",
"css-loader": "^3.1.0",
"date-fns": "^1.30.1",
"eslint": "^6.1.0",
"eslint-plugin-import": "^2.18.2",
"exports-loader": "^0.7.0",
"fancy-log": "^1.3.2",
"file-loader": "^4.1.0",
"html-webpack-plugin": "^3.2.0",
"hugo-bin": "^0.73.0",
"imports-loader": "^0.8.0",
"mini-css-extract-plugin": "^0.12.0",
"netlify-cms-app": "^2.15.27",
"node-sass": "^4.10.0",
"@babel/core": "^7.16.0",
"@babel/eslint-parser": "^7.16.3",
"@babel/preset-env": "^7.16.0",
"@babel/register": "^7.16.0",
"assets-webpack-plugin": "^7.1.1",
"autoprefixer": "^10.4.7",
"babel-loader": "^8.2.3",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^9.1.0",
"cross-env": "^7.0.3",
"css-loader": "^6.5.1",
"css-minimizer-webpack-plugin": "^4.0.0",
"eslint": "^8.2.0",
"eslint-plugin-import": "^2.26.0",
"exports-loader": "^3.1.0",
"file-loader": "^6.2.0",
"html-webpack-plugin": "^5.5.0",
"hugo-bin": "^0.77.2",
"imports-loader": "^3.1.1",
"mini-css-extract-plugin": "^2.4.4",
"npm-run-all": "^4.1.5",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"plugin-error": "^1.0.1",
"postcss-import": "^12.0.1",
"postcss-loader": "^3.0.0",
"postcss-preset-env": "^6.3.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"rimraf": "^3.0.0",
"sass-loader": "^8.0.0",
"style-loader": "^1.0.0",
"terser-webpack-plugin": "^2.0.0",
"to-string-loader": "^1.1.5",
"url-loader": "^2.1.0",
"webpack": "^4.37.0",
"webpack-cli": "^3.1.2",
"webpack-dev-server": "^3.1.10",
"webpack-merge": "^4.1.4"
"postcss": "^8.3.11",
"postcss-custom-media": "^8.0.2",
"postcss-import": "^14.0.2",
"postcss-loader": "^6.2.0",
"postcss-preset-env": "^7.7.2",
"sass": "^1.53.0",
"sass-loader": "^12.3.0",
"style-loader": "^3.3.1",
"terser-webpack-plugin": "^5.2.5",
"webpack": "^5.64.1",
"webpack-cli": "^4.9.1",
"webpack-dev-server": "^4.5.0",
"webpack-merge": "^5.8.0"
},
"dependencies": {
"@babel/preset-react": "^7.17.12",
"date-fns": "^2.28.0",
"immutable": "^4.1.0",
"netlify-cms-app": "^2.15.72",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"to-string-loader": "^1.2.0"
}
}
14 changes: 7 additions & 7 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
plugins: {
"postcss-import": {},
"postcss-preset-env": {
plugins: [
["postcss-import",{}],
["postcss-preset-env",{
browsers: "last 2 versions"
},
"postcss-custom-media": {},
autoprefixer: {}
}
}],
["postcss-custom-media",{}],
["autoprefixer",{}]
]
};
Empty file added site/.hugo_build.lock
Empty file.
1 change: 1 addition & 0 deletions site/static/admin/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
backend:
name: git-gateway
branch: main

media_folder: "site/static/img" # Folder where user uploaded files should go
public_folder: "img"
Expand Down
4 changes: 2 additions & 2 deletions src/cms.html → site/static/admin/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
Expand All @@ -9,6 +9,6 @@
<script src="https://identity-js.netlify.com/v1/netlify-identity-widget.js"></script>
</head>
<body>
<script src="<%= htmlWebpackPlugin.files.chunks.cms.entry %>"></script>
<script src="https://unpkg.com/netlify-cms@^2.0.0/dist/netlify-cms.js"></script>
</body>
</html>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/css/imports/_forms.css → src/css/imports/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ input, textarea {
position: relative;
transition: var(--hover-transition);
z-index: 2;
&:focus {
:focus {
background-color: var(--white);
}
&:focus + label {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
87 changes: 0 additions & 87 deletions src/css/main.css

This file was deleted.

87 changes: 87 additions & 0 deletions src/css/main.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*! TACHYONS v4.5.5 | http://tachyons.io */

/*
*
* ________ ______
* ___ __/_____ _________ /______ ______________________
* __ / _ __ `/ ___/_ __ \_ / / / __ \_ __ \_ ___/
* _ / / /_/ // /__ _ / / / /_/ // /_/ / / / /(__ )
* /_/ \__,_/ \___/ /_/ /_/_\__, / \____//_/ /_//____/
* /____/
*
* TABLE OF CONTENTS
*
* 1. External Library Includes
* - Reset.css | http://meyerweb.com/eric/tools/css/reset/
* 2. Tachyons Modules
* 3. Variables
* - Media Queries
* - Colors
* 4. Debugging
* - Debug all
* - Debug children
*
*/


/* External Library Includes */
@use './imports/_reset';

/* Modules */
@use './imports/_box-sizing';
@use './imports/_images';
@use './imports/_background-size';
@use './imports/_background-position';
@use './imports/_outlines';
@use './imports/_borders';
@use './imports/_border-radius';
@use './imports/_border-style';
@use './imports/_border-widths';
@use './imports/_border-colors';
@use './imports/_code';
@use './imports/_coordinates';
@use './imports/_clears';
@use './imports/_display';
@use './imports/_flexbox';
@use './imports/_floats';
@use './imports/_font-style';
@use './imports/_font-weight';
@use './imports/_forms';
@use './imports/_heights';
@use './imports/_line-height';
@use './imports/_links';
@use './imports/_lists';
@use './imports/_max-widths';
@use './imports/_widths';
@use './imports/_overflow';
@use './imports/_position';
@use './imports/_opacity';
@use './imports/_spacing';
@use './imports/_text-decoration';
@use './imports/_text-align';
@use './imports/_text-transform';
@use './imports/_type-scale';
@use './imports/_typography';
@use './imports/_utilities';
@use './imports/_visibility';
@use './imports/_white-space';
@use './imports/_vertical-align';
@use './imports/_states';
@use './imports/_z-index';
@use './imports/_styles';
@use './imports/_buttons';
@use './imports/_svg';
@use './imports/_cms';

/* Variables */
/* Importing here will allow you to override any variables in the modules */
@use './imports/_colors';
@use './imports/_media-queries';
@use './imports/_variables';

/* Debugging */
@use './imports/_debug-children';
@use './imports/_debug-grid';

/* Uncomment out the line below to help debug layout issues */
/*@use './imports/_debug';*/
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// JS Goes here - ES6 supported

import "./css/main.css";
import "./css/main.scss";

// Say hello
console.log("🦊 Hello! Edit me in src/index.js");
2 changes: 1 addition & 1 deletion src/js/cms.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import CMS from "netlify-cms-app";

// Import main site styles as a string to inject into the CMS preview pane
import styles from "!to-string-loader!css-loader!postcss-loader!sass-loader!../css/main.css";
import styles from "!to-string-loader!css-loader!postcss-loader!sass-loader!../css/main.scss";

import HomePreview from "./cms-preview-templates/home";
import PostPreview from "./cms-preview-templates/post";
Expand Down
Loading

0 comments on commit be22c5f

Please sign in to comment.