Merge pull request #133 from geotrev/develop

Release: 4.5.0

Author: geotrev

.circleci/config.yml

@@ -8,21 +8,20 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/node:9.8.0
+      - image: circleci/node:10.16.0
 
     working_directory: ~/undernet
-
     steps:
       - checkout
       - restore_cache:
           keys:
             - v1-dependencies-{{ checksum "package.json" }}
             - v1-dependencies-
 
-      - run: npm install
+      - run: yarn install && yarn js:build
       - save_cache:
           paths:
             - node_modules
           key: v1-dependencies-{{ checksum "package.json" }}
 
-      - run: npm test
+      - run: yarn test

.gitignore

@@ -2,6 +2,8 @@
 yarn-error.log*
 npm-error.log*
 
+/js/esm/
+/js/cjs/
 /build/
 /node_modules/
 

.npmignore

@@ -1,19 +1,21 @@
 .DS_store
+yarn-error.log*
 npm-error.log*
 
-/.circleci/
 /.sass-cache/
+/.circleci/
+/app/
+/bin/
 /build/
 /config/
-/dist/undernet.css.zip
-/dist/undernet.js.zip
-/dist/undernet.modules.js.zip
-/dist/undernet.scss.zip
-/docs/
+/js/test/
+/dist/*.zip
+/node_modules/
 /public/
-/src/
 
-.sass-cache
+.browserslistrc
+.eslintignore
+.eslintrc.js
 .prettierrc
 babel.config.js
 netlify.toml

ROADMAP.md

@@ -124,7 +124,7 @@ exports[`<SideNav /> matches snapshot 1`] = `
               className="version-text has-no-padding has-gray800-text xsmall-12 columns"
             >
               Version 
-              4.4.1
+              4.5.0
             </p>
             <div
               className="accordion-row"

app/components/SideNav/__snapshots__/SideNav.spec.js.snap

@@ -7,17 +7,17 @@ The quickest way to use Undernet is to link the bundled js and minified css usin
 ```html
 <link
   rel="stylesheet"
-  href="https://cdn.jsdelivr.net/npm/undernet@4.4.1/dist/undernet.min.css"
-  integrity="sha256-KAkOhhbOk89pSIdeP0FSuYDVBy6vldISb+BKlNr+wbs="
+  href="https://cdn.jsdelivr.net/npm/undernet@4.5.0/dist/undernet.min.css"
+  integrity="sha256-lpQ4AF+Mzlonw6AIGEURg3/TuNGRwNqzoL2KHub8YEU="
   crossorigin="anonymous"
 />
 ```
 
 ```html
 <script
   type="text/javascript"
-  src="https://cdn.jsdelivr.net/npm/undernet@4.4.1/dist/undernet.bundle.min.js"
-  integrity="sha256-bsY+VnWNN4w3Up6W+HKi4nyIovEO9CW+zkrlW4JwD2g="
+  src="https://cdn.jsdelivr.net/npm/undernet@4.5.0/dist/undernet.bundle.min.js"
+  integrity="sha256-8CZr3jilCWu7b4gpoLsTFVjMxmVv98h9m4U2BheNIgw="
   crossorigin="anonymous"
 ></script>
 <script type="text/javascript">
@@ -27,14 +27,14 @@ The quickest way to use Undernet is to link the bundled js and minified css usin
 
 ## Minified & Compiled
 
-Grab compiled assets if you need them statically.
+Use these assets if you need static instances of the CDN bundled files.
 
 - CSS: [Download](https://github.com/geotrev/undernet/raw/master/dist/undernet.css.zip)
 - JS: [Download](https://github.com/geotrev/undernet/raw/master/dist/undernet.js.zip)
 
 ## Uncompiled & Unminified
 
-Going this route allows for far more customization. These should also grant better debugging during development.
+Going this route allows for far more customization. Use this option if you intend to remove or customize your build by removing components and features you don't need.
 
 - SCSS: [Download](https://github.com/geotrev/undernet/raw/master/dist/undernet.scss.zip)
 - JS: [Download](https://github.com/geotrev/undernet/raw/master/dist/undernet.modules.js.zip)

app/docs/download.md

@@ -217,7 +217,7 @@ exports[`<Docs /> renders 1`] = `
                     className="version-text has-no-padding has-gray800-text xsmall-12 columns"
                   >
                     Version 
-                    4.4.1
+                    4.5.0
                   </p>
                   <div
                     className="accordion-row xsmall-12 columns has-no-padding"

app/pages/Docs/__snapshots__/Docs.spec.js.snap

@@ -7,7 +7,9 @@ let plugins = [
 
 module.exports = api => {
   const test = api.env("test")
-  const dist = api.env("dist")
+  const cjs = api.env("cjs")
+  const esm = api.env("esm")
+  const rollup = api.env("rollup")
 
   if (test) {
     presets = ["@babel/preset-react", ["@babel/preset-env", { targets: { node: "current" } }]]
@@ -16,9 +18,12 @@ module.exports = api => {
       "dynamic-import-node",
       ["babel-plugin-webpack-aliases", { config: "config/webpack.dev.js" }],
     ]
-  } else if (dist) {
+  } else if (cjs || rollup) {
     presets = ["@babel/preset-env"]
     plugins = []
+  } else if (esm) {
+    presets = [["@babel/preset-env", { modules: false }]]
+    plugins = []
   }
 
   return { plugins, presets }

babel.config.js

@@ -8,7 +8,7 @@ const Hashes = require("jshashes")
 
 const distJsFilePath = path.resolve(__dirname, "../dist/undernet.bundle.min.js")
 const distCssFilePath = path.resolve(__dirname, "../dist/undernet.min.css")
-const downloadArticleFilePath = path.resolve(__dirname, "../site/docs/download.md")
+const downloadArticleFilePath = path.resolve(__dirname, "../app/docs/download.md")
 const readFormat = "utf-8"
 
 // update hashes in docs/download.md
@@ -39,11 +39,11 @@ function getNewIntroductionArticle() {
   return downloadArticleFile.replace(currentJsHash, newJsHash).replace(currentCssHash, newCssHash)
 }
 
-fs.writeFileSync("site/docs/download.md", getNewIntroductionArticle(), readFormat)
+fs.writeFileSync("app/docs/download.md", getNewIntroductionArticle(), readFormat)
 console.log(`
 #========================================#
 
--> New content hashes created! They're used in site/docs/download.md.
+-> New content hashes created! They're used in app/docs/download.md.
    - CSS: ${newCssHash}
    - JS: ${newJsHash}
 `)

bin/create-hashes.js

@@ -9,7 +9,7 @@ const packageFilePath = path.resolve(__dirname, "../package.json")
 const pkg = require(packageFilePath)
 
 const undernetScssFilePath = path.resolve(__dirname, "../scss/undernet.scss")
-const downloadArticleFilePath = path.resolve(__dirname, "../site/docs/download.md")
+const downloadArticleFilePath = path.resolve(__dirname, "../app/docs/download.md")
 const readFormat = "utf-8"
 
 const versionRegEx = /[0-9]\.[0-9]\.[0-9]/g
@@ -21,7 +21,7 @@ function setNewScssVersion() {
   return undernetScssFile.replace(versionRegEx, pkg.version)
 }
 
-// get update for site/docs/download.md
+// get update for app/docs/download.md
 
 function setNewDlArticleVersion() {
   const downloadArticleFile = fs.readFileSync(downloadArticleFilePath, readFormat)
@@ -34,4 +34,4 @@ fs.writeFileSync(undernetScssFilePath, setNewScssVersion(), readFormat)
 console.log(`-> scss/undernet.scss version updated to ${pkg.version}!`)
 
 fs.writeFileSync(downloadArticleFilePath, setNewDlArticleVersion(), readFormat)
-console.log(`-> site/docs/download.md version updated to ${pkg.version}!`)
+console.log(`-> app/docs/download.md version updated to ${pkg.version}!`)