Merge 4354c40 into d8e987b

heyjul3s · Feb 17, 2021 · d9730dc · d9730dc
2 parents d8e987b + 4354c40
commit d9730dc
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 111 deletions.
diff --git a/.yarnrc b/.yarnrc
@@ -1 +1 @@
-1.22.10
+1.19.0
diff --git a/package.json b/package.json
@@ -28,24 +28,24 @@
     "react-dom": ">=17.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.13",
+    "@babel/core": "^7.12.16",
     "@babel/plugin-proposal-class-properties": "^7.12.13",
     "@babel/plugin-transform-runtime": "^7.12.15",
-    "@babel/preset-typescript": "^7.12.13",
-    "@storybook/addon-actions": "^6.1.17",
-    "@storybook/addon-essentials": "^6.1.17",
-    "@storybook/addon-links": "^6.1.17",
-    "@storybook/addon-storyshots": "^6.1.17",
-    "@storybook/react": "^6.1.17",
+    "@babel/preset-typescript": "^7.12.16",
+    "@storybook/addon-actions": "^6.1.18",
+    "@storybook/addon-essentials": "^6.1.18",
+    "@storybook/addon-links": "^6.1.18",
+    "@storybook/addon-storyshots": "^6.1.18",
+    "@storybook/react": "^6.1.18",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/react": "^11.2.5",
     "@types/jest": "^26.0.20",
-    "@typescript-eslint/eslint-plugin": "^4.15.0",
-    "@typescript-eslint/parser": "^4.15.0",
+    "@typescript-eslint/eslint-plugin": "^4.15.1",
+    "@typescript-eslint/parser": "^4.15.1",
     "babel-jest": "^26.6.3",
     "babel-loader": "^8.2.2",
     "coveralls": "^3.1.0",
-    "eslint": "^7.19.0",
+    "eslint": "^7.20.0",
     "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-react": "^7.22.0",
@@ -56,8 +56,8 @@
     "lerna": "^3.22.1",
     "react-is": "^17.0.1",
     "rimraf": "^3.0.2",
-    "ts-jest": "^26.5.0",
-    "typescript": "^4.1.3"
+    "ts-jest": "^26.5.1",
+    "typescript": "^4.1.5"
   },
   "dependencies": {
     "@changesets/cli": "^2.14.1"

diff --git a/packages/artifak/CHANGELOG.md b/packages/artifak/CHANGELOG.md
@@ -1,44 +1,11 @@
 # artifak
 
-## 2.1.1
-
-### Patch Changes
-
-- 6f08e4c: New hexToRGB, hexToRGBA, pxToEm and pxToRem utilities
-- Updated dependencies [6f08e4c]
-  - @artifak/block@1.1.6
-  - @artifak/component-generator@2.0.3
-  - @artifak/flex@1.1.9
-  - @artifak/grid@1.1.6
-  - @artifak/hextorgb@1.0.1
-  - @artifak/hextorgba@1.0.1
-  - @artifak/imagery@1.0.8
-  - @artifak/media@1.0.4
-  - @artifak/pxtoem@1.0.1
-  - @artifak/pxtorem@1.0.1
-  - @artifak/typography@2.0.1
-  - @artifak/usematchmedia@1.0.3
-  - @artifak/usewindowsize@1.0.3
-
 ## 2.1.0
 
 ### Minor Changes
 
-- Added new hexToRGB, hexToRGBA, pxToEm and pxToRem utilities
-
-### Patch Changes
-
-- update Media typings: extractByRegex to return RegExpMatchArray or string array
-- update typings for FlexCol
-- update typings for Generator
-- Updated dependencies [undefined]
-  - @artifak/component-generator@2.0.2
-  - @artifak/flex@1.1.8
-  - @artifak/hextorgb@1.0.0
-  - @artifak/hextorgba@1.0.0
-  - @artifak/media@1.0.3
-  - @artifak/pxtoem@1.0.0
-  - @artifak/pxtorem@1.0.0
+- New hexToRGB, hexToRGBA, pxToEm and pxToRem utilities
+- Typings update for Media, Flex and Generator
 
 ## 2.0.2
 

diff --git a/packages/artifak/package.json b/packages/artifak/package.json
@@ -1,6 +1,6 @@
 {
   "name": "artifak",
-  "version": "2.1.1",
+  "version": "2.1.0",
   "description": "A set of React UI primitives to help you build your component UI system",
   "author": "Julian Low",
   "homepage": "https://github.com/heyjul3s/artifak#readme",
@@ -43,7 +43,6 @@
     "url": "https://github.com/heyjul3s/artifak/issues"
   },
   "dependencies": {
-    "@artifak/block": "^1.1.5",
     "@artifak/component-generator": "^2.0.1",
     "@artifak/flex": "^1.1.7",
     "@artifak/fluidsizing": "^1.0.1",
@@ -59,6 +58,6 @@
     "@artifak/usewindowsize": "^1.0.2"
   },
   "devDependencies": {
-    "@artifak/bundler": "^1.1.3"
+    "@artifak/bundler": "^1.1.4"
   }
 }
diff --git a/packages/bundler/CHANGELOG.md b/packages/bundler/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @artifak/bundler
 
+## 1.1.4
+
+### Patch Changes
+
+- Dependency updates
+
 ## 1.1.3
 
 ### Patch Changes

diff --git a/packages/bundler/package.json b/packages/bundler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@artifak/bundler",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Artifak package bundler",
   "author": "Julian Low",
   "homepage": "https://github.com/heyjul3s/artifak#readme",
@@ -27,12 +27,12 @@
     "url": "https://github.com/heyjul3s/artifak/issues"
   },
   "dependencies": {
-    "@rollup/plugin-commonjs": "^17.0.0",
-    "@rollup/plugin-node-resolve": "^11.0.0",
-    "rollup": "^2.34.2",
+    "@rollup/plugin-commonjs": "^17.1.0",
+    "@rollup/plugin-node-resolve": "^11.2.0",
+    "rollup": "^2.39.0",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.29.0",
-    "typescript": "^4.1.2",
+    "typescript": "^4.1.5",
     "typescript-plugin-styled-components": "^1.4.4"
   }
 }
diff --git a/packages/hextorgb/CHANGELOG.md b/packages/hextorgb/CHANGELOG.md
@@ -4,8 +4,4 @@
 
 ### Patch Changes
 
-- 6f08e4c: New hexToRGB utilities
-
-## 1.0.0
-
-- Added new hexToRGB utility function.
+- New hexToRGB utilities
diff --git a/packages/hextorgb/package.json b/packages/hextorgb/package.json
@@ -38,6 +38,6 @@
   },
   "homepage": "https://github.com/heyjul3s/artifak#readme",
   "devDependencies": {
-    "@artifak/bundler": "^1.1.3"
+    "@artifak/bundler": "^1.1.4"
   }
 }
diff --git a/packages/hextorgba/CHANGELOG.md b/packages/hextorgba/CHANGELOG.md
@@ -4,10 +4,6 @@
 
 ### Patch Changes
 
-- 6f08e4c: New hexToRGBA utilities
-- Updated dependencies [6f08e4c]
+- New hexToRGBA utilities
+- Updated dependencies [undefined]
   - @artifak/hextorgb@1.0.1
-
-## 1.0.0
-
-- Added new hexToRGBA utility function.
diff --git a/packages/hextorgba/README.md b/packages/hextorgba/README.md
@@ -7,13 +7,13 @@ A utility function to convert hexadecimal colour values to RGBA string.
 ### Yarn
 
 ```sh
-yarn add @artifak/hextorgb
+yarn add @artifak/hextorgba
 ```
 
 ### NPM
 
 ```sh
-npm install @artifak/hextorgb
+npm install @artifak/hextorgba
 ```
 
 ## Usage

diff --git a/packages/hextorgba/package.json b/packages/hextorgba/package.json
@@ -38,7 +38,7 @@
   },
   "homepage": "https://github.com/heyjul3s/artifak#readme",
   "devDependencies": {
-    "@artifak/bundler": "^1.1.3"
+    "@artifak/bundler": "^1.1.4"
   },
   "dependencies": {
     "@artifak/hextorgb": "^1.0.1"

diff --git a/packages/pxtoem/CHANGELOG.md b/packages/pxtoem/CHANGELOG.md
@@ -4,8 +4,4 @@
 
 ### Patch Changes
 
-- 6f08e4c: New pxToEm utilities
-
-## 1.0.0
-
-- Added new pxToEm utility function
+- New pxToEm utilities
diff --git a/packages/pxtoem/package.json b/packages/pxtoem/package.json
@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/heyjul3s/artifak#readme",
   "devDependencies": {
-    "@artifak/bundler": "^1.1.3"
+    "@artifak/bundler": "^1.1.4"
   },
   "dependencies": {
     "@annexe/isstring": "^0.1.0"

diff --git a/packages/pxtorem/CHANGELOG.md b/packages/pxtorem/CHANGELOG.md
@@ -4,10 +4,6 @@
 
 ### Patch Changes
 
-- 6f08e4c: New pxToRem utilities
-- Updated dependencies [6f08e4c]
+- New pxToRem utilities
+- Updated dependencies [undefined]
   - @artifak/pxtoem@1.0.1
-
-## 1.0.0
-
-- Added pxToRem utility functionn
diff --git a/packages/pxtorem/package.json b/packages/pxtorem/package.json
@@ -40,6 +40,6 @@
     "@artifak/pxtoem": "^1.0.1"
   },
   "devDependencies": {
-    "@artifak/bundler": "^1.1.3"
+    "@artifak/bundler": "^1.1.4"
   }
 }