henris - npm Package Compare versions

Comparing version 0.5.1 to 0.5.2-rc1

data/base.json

 {
 	"base": {
 		"prefix": "",
+		"prefix-grid": "",
 		"border-radius": "3px",
@@ -5,0 +6,0 @@ "space": "1rem",

data/button.json

 {
 	"button": {
-		"font-family":
-			"[[RobotoCondensed, Roboto Condensed, Helvetica Neue Condensed, Impact, sans-serif]]",
+		"height": "auto",
+		"width": "auto",
+		"color": "{{color(White}}",
 		"background-color": "{{color(Black)}}",
-		"padding": "{{grid(0 1)}}",
+		"border-color": "{{color(Black)}}",
+		"border-radius": "2px",
+		"border-width": "0",
+		"border-style": "solid",
+		"padding": "0.75em 1.5em",
+		"font-size": "16px",
 		"text-transform": "uppercase",
-		"font-size": "14px",
-		"border-radius": "2px",
+		"text-decoration": "none",
 		"line-height": "1",
-		"font-weight": "{{assets(typography.font-weight.bold)}}"
+		"font-family": "{{assets(typography.fonts.system)}}",
+		"font-weight": "{{assets(typography.font-weight.bold)}}",
+		"cursor": "pointer",
+		"hover-color": "{{color(White}}",
+		"hover-background-color": "{{color(Black)}}",
+		"hover-border-color": "{{color(Black)}}",
+		"hover-border-width": "0",
+		"hover-border-style": "solid",
+		"hover-cursor": "pointer",
+		"focus-color": "{{color(White}}",
+		"focus-background-color": "{{color(Black)}}",
+		"focus-border-color": "{{color(Black)}}",
+		"focus-border-width": "0",
+		"focus-border-style": "solid",
+		"focus-cursor": "pointer",
+		"active-color": "{{color(White}}",
+		"active-background-color": "{{color(Black)}}",
+		"active-border-color": "{{color(Black)}}",
+		"active-border-width": "0",
+		"active-border-style": "solid",
+		"active-cursor": "pointer"
 	}
 }

data/output.json

@@ -36,2 +36,3 @@ {
 			"grid": true,
+			"grid-only": false,
 			"grid-helpers": false,
@@ -38,0 +39,0 @@ "grid-hide-show-classes": true,

package.json

 {
 	"name": "henris",
-	"version": "0.5.1",
+	"version": "0.5.2-rc1",
 	"description": "SCSS framework - by Matise",
@@ -13,11 +13,13 @@ "main": "index.scss",
 		"dev": "npm run settings",
-		"build": "npm run settings && rm -rf dist/**/* && npm run build-dist",
-		"build-dist": "npm run build-default && npm run build-full",
-		"build-default": "node-sass dist-input/default.scss dist/henris.css --output-style nested && node-sass dist-input/default.scss dist/henris.min.css  --output-style compressed",
-		"build-full": "node-sass dist-input/full.scss dist/henris.full.css  --output-style nested && node-sass dist-input/full.scss dist/henris.full.min.css --output-style compressed",
+		"build": "npm run settings && rm -rf dist/**/* && npm run build:dist",
+		"build:dist": "npm run build:default && npm run build:full",
+		"build:default": "node-sass dist-input/default.scss dist/henris.css --output-style nested && node-sass dist-input/default.scss dist/henris.min.css --output-style compressed",
+		"build:full": "node-sass dist-input/full.scss dist/henris.full.css --output-style nested && node-sass dist-input/full.scss dist/henris.full.min.css --output-style compressed",
 		"prepublishOnly": "npm run test && npm run build",
 		"icons": "node scripts/icons.js src/icons dist/fonts",
-		"icons-generator": "icon-font-generator src/icons/_brands/*.svg -o dist",
+		"icons:generate": "icon-font-generator src/icons/_brands/*.svg -o dist",
 		"docs:dev": "vuepress dev docs",
-		"docs:build": "vuepress build docs"
+		"docs:build": "vuepress build docs",
+		"stylelint": "stylelint 'src/scss/**/*.scss'",
+		"stylelint:fix": "stylelint 'src/scss/**/*.scss' --fix"
 	},
@@ -30,20 +32,30 @@ "keywords": [
 	],
-	"author": "Sil van Diepen",
+	"author": {
+		"name": "Sil van Diepen",
+		"company": "Matise",
+		"email": "[e-mail]",
+		"url": "https://www.matise.nl/"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/matiseams/henris.git"
+	},
 	"license": "MIT",
 	"devDependencies": {
-		"autoprefixer": "^8.5.2",
-		"chalk": "^2.4.1",
+		"autoprefixer": "^9.4.4",
+		"chalk": "^2.4.2",
 		"cli-table": "^0.3.1",
-		"file-loader": "^1.1.11",
-		"flat": "^4.0.0",
-		"node-sass": "^4.9.3",
-		"npm": "^6.4.1",
-		"postcss": "^6.0.22",
-		"postcss-loader": "^2.1.1",
-		"request": "^2.87.0",
-		"sass": "^1.14.0",
-		"sass-loader": "^7.0.3",
+		"flat": "^4.1.0",
+		"node-sass": "^4.11.0",
+		"npm": "^6.5.0",
+		"postcss": "^7.0.8",
+		"postcss-loader": "^3.0.0",
+		"request": "^2.88.0",
+		"sass": "^1.16.0",
 		"sass-true": "^4.0.0",
+		"stylelint": "^9.9.0",
+		"stylelint-logical-order": "0.0.4",
+		"stylelint-order": "^2.0.0",
 		"webfonts-generator": "^0.4.0"
 	}
 }

scripts/css-functions.js

@@ -49,3 +49,4 @@ let convert = require("color-convert");
 	}
-	// console.log(data.colors);
+	
+	// console.log(data.color.default);
 	Object.keys(data.color).forEach(function(list) {
@@ -52,0 +53,0 @@ if (list !== "title") {

scripts/json-to-css.js

@@ -6,5 +6,5 @@ const fs = require('fs');
 const functions = require('./css-functions.js');
-var Table = require('cli-table');
+const Table = require('cli-table');
 
-let delimiter = '-',
+const delimiter = '-',
 	sourceFolder = 'data/',
@@ -58,7 +58,30 @@ distFolder = 'src/scss/';
 
+
+
+function isObject(item) {
+  return (item && typeof item === 'object' && !Array.isArray(item));
+}
+
+function mergeDeep(target, ...sources) {
+  if (!sources.length) return target;
+  const source = sources.shift();
+
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) Object.assign(target, { [key]: {} });
+        mergeDeep(target[key], source[key]);
+      } else {
+        Object.assign(target, { [key]: source[key] });
+      }
+    }
+  }
+  return mergeDeep(target, ...sources);
+}
+
+
 // Store the used data before compiling;
 let stored = {};
 getFiles(sourceFolder).forEach((file) => {
-	//	let fileName = file.split('/')[file.split('/').length - 1].replace('.json', '');
-	Object.assign(stored, JSON.parse(fs.readFileSync(file, 'utf8')));
+	stored = mergeDeep({},stored,JSON.parse(fs.readFileSync(file, 'utf8')));
 });
@@ -65,0 +88,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No repository

Supply chain risk

Package does not have a linked source code repository. Without this field, a package will have no reference to the location of the source code use to generate the package.

Found 1 instance in 1 package

Improved metrics

Number of low supply chain risk alerts

5

decreased by-16.67%

Worsened metrics

Total package byte prevSize

630628

decreased by-12.63%

Dev dependency count

15

increased by7.14%

Number of package files

491

decreased by-11.05%

Lines of code

1429

decreased by-20.3%

No dependency changes