feat: upgrade normalize.css to 8.0.1

sergeysova · Nov 13, 2018 · 96489e9 · 96489e9
1 parent 1a9db45
commit 96489e9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/bin/fetch.js b/bin/fetch.js
@@ -8,7 +8,7 @@ const normalizePackage = JSON.parse(fs.readFileSync('./node_modules/normalize.cs
 const normalizeMain = path.join('./node_modules/normalize.css', normalizePackage.main)
 const normalizeContent = fs.readFileSync(normalizeMain, 'utf8')
 
-const cleanedContent = normalizeContent.replace(cleanRegexp, '').replace(/^\s*\n/gm, '')
+const cleanedContent = normalizeContent.replace(cleanRegexp, '').replace(/^\s*\n/gm, '').replace(/\s+$/gm, '')
 
 const resultContent = `
 import { css, createGlobalStyle } from 'styled-components'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "@babel/core": "^7.1.2",
     "@babel/preset-env": "^7.1.5",
     "babel-plugin-styled-components": "^1.8.0",
-    "normalize.css": "^8.0.0",
+    "normalize.css": "^8.0.1",
     "react": "^16.6.3",
     "react-dom": "^16.6.3",
     "styled-components": "^4.1.1"

diff --git a/src/index.js b/src/index.js
@@ -1,11 +1,6 @@
 
 import { css, createGlobalStyle } from 'styled-components'
 
-/**
- * @deprecated
- */
-export const version = '8.0.2'
-
 export const normalize = css`
 html {
   line-height: 1.15;
@@ -14,6 +9,9 @@ html {
 body {
   margin: 0;
 }
+main {
+  display: block;
+}
 h1 {
   font-size: 2em;
   margin: 0.67em 0;
@@ -150,11 +148,8 @@ template {
 [hidden] {
   display: none;
 }
-
 `
 
-export const Normalize = createGlobalStyle
-  ? createGlobalStyle`${normalize}`
-  : () => null
+export const Normalize = createGlobalStyle`${normalize}`
 
 export default normalize