refactor: upgrade normalize, remove bower, remove old ie hacks (#790)

Author: redonkulus

.bowerrc

@@ -1,6 +1,5 @@
 .DS_Store
 artifacts/
-bower_components/
 build/
 coverage/
 node_modules/

.gitignore

@@ -1,7 +1,5 @@
 .*
 artifacts/
-bower_components/
-bower.json
 CONTRIBUTING.md
 Gruntfile.js
 node_modules/

.npmignore

@@ -6,19 +6,6 @@ grunt.initConfig({
 
     nick : 'pure',
     pkg  : grunt.file.readJSON('package.json'),
-    bower: grunt.file.readJSON('bower.json'),
-
-    // -- bower.json Config ---------------------------------------------------------
-
-    bower_json: {
-        release: {
-            values: {
-                main: 'pure.css'
-            },
-
-            dest: 'build/'
-        }
-    },
 
     // -- Clean Config ---------------------------------------------------------
 
@@ -50,7 +37,7 @@ grunt.initConfig({
         build: {
             files: [
                 {'build/base.css': [
-                    'bower_components/normalize-css/normalize.css',
+                    'node_modules/normalize.css/normalize.css',
                     'build/base.css'
                 ]},
 
@@ -168,7 +155,7 @@ grunt.initConfig({
             options: {
                 banner: [
                     '/*!',
-                    'normalize.css v<%= bower.devDependencies["normalize-css"] %> | MIT License | git.io/normalize',
+                    'normalize.css v<%= pkg.devDependencies["normalize-css"] %> | MIT License | git.io/normalize',
                     'Copyright (c) Nicolas Gallagher and Jonathan Neal',
                     '*/\n'
                 ].join('\n')
@@ -221,18 +208,6 @@ grunt.initConfig({
         }
     },
 
-    // -- Strip Media Queries Config -------------------------------------------
-
-    stripmq: {
-        all: {
-            files: {
-                //follows the pattern 'destination': ['source']
-                'build/grids-responsive-old-ie.css':
-                    ['build/grids-responsive.css']
-            }
-        }
-    },
-
     // -- CSS Selectors Config -------------------------------------------------
 
     css_selectors: {
@@ -273,19 +248,16 @@ grunt.loadNpmTasks('grunt-contrib-watch');
 grunt.loadNpmTasks('grunt-css-selectors');
 grunt.loadNpmTasks('grunt-postcss');
 grunt.loadNpmTasks('grunt-pure-grids');
-grunt.loadNpmTasks('grunt-stripmq');
 
 // Local tasks.
 grunt.loadTasks('tasks/');
 
-grunt.registerTask('default', ['import', 'test', 'build']);
-grunt.registerTask('import', ['bower_install']);
+grunt.registerTask('default', ['test', 'build']);
 grunt.registerTask('test', ['csslint']);
 grunt.registerTask('build', [
     'clean:build',
     'copy:build',
     'pure_grids',
-    'stripmq',
     'concat:build',
     'clean:build_res',
     'css_selectors:base',
@@ -302,7 +274,6 @@ grunt.registerTask('release', [
     'default',
     'clean:release',
     'copy:release',
-    'bower_json:release',
     'compress:release'
 ]);
 

Gruntfile.js

@@ -20,20 +20,13 @@ A set of small, responsive CSS modules that you can use in every web project.
 
 Note: You can [customize which Pure modules you need][customize].
 
-**Install with Bower:**
-
-```shell
-$ bower install --save pure
-```
-
 **Install with NPM:**
 
 ```shell
 $ npm install purecss
 ```
 
 [Pure]: http://purecss.io/
-[Bower]: http://bower.io/
 [Build Status]: https://travis-ci.org/pure-css/pure
 [customize]: http://purecss.io/customize/
 
@@ -80,13 +73,7 @@ You can include the Pure CSS file in your project by fetching it from unpkg:
 <link rel="stylesheet" href="https://unpkg.com/purecss@1.0.1/build/pure-min.css" integrity="sha384-nn4HPE8lTHyVtfCBi5yW9d20FjT8BJwUXyWZT9InLYax14RDjBj46LmSztkmNP9w" crossorigin="anonymous">
 ```
 
-You can also install Pure using [Bower][], using the following command:
-
-```shell
-$ bower install --save pure
-```
-
-Or you can install Pure using NPM:
+You can also install Pure using NPM:
 
 ```shell
 $ npm install purecss

README.md

@@ -9,10 +9,6 @@ For all of these steps, replace `1.0.0` with the correct version!
 This assumes the following repo's are cloned and `npm` installed:
 
 - https://github.com/pure-css/pure
-- https://github.com/pure-css/pure-site
-- https://github.com/pure-css/pure-release
-
-You will also need `bower` installed globally.
 
 ## First, check everything
 
@@ -31,7 +27,6 @@ You will also need `bower` installed globally.
 
 - [ ] **Review all src/.../tests/manual/ files in target environments, including:**
 
-    - [ ] IE 10
     - [ ] IE 11
     - [ ] Edge
     - [ ] Chrome
@@ -43,7 +38,6 @@ You will also need `bower` installed globally.
 
 - [ ] **Review pure-site in target environments with [Pure served locally](https://github.com/pure-css/pure-site/blob/master/README.md#running-with-pure-served-locally)**
 
-    - [ ] IE 10
     - [ ] IE 11
     - [ ] Edge
     - [ ] Chrome
@@ -67,7 +61,6 @@ You will also need `bower` installed globally.
 
     It should have already been determined whether this is a minor or patch version release. Update Pure's version number to the new version in the following places. You'll likely be dropping a "-pre" suffix which was in place during the last development cycle. Do not use a "v" in the version (e.g., 1.0.0):
 
-    - [ ] bower.json
     - [ ] package.json
     - [ ] HISTORY.md (Update "NEXT")
     - [ ] README.md (x2 CDN URLs)
@@ -82,15 +75,6 @@ You will also need `bower` installed globally.
 
     **Note:** If the build fails it's for a good reason, most likely because there's code which is not passing CSSLint. We should always fix these issues and never force a release.
 
-### Pure-release repo
-
-- [ ] **Update the pure-release repo**
-
-    This repo is used by Bower. It must be updated and released (and hence tagged).
-
-    - [ ] **Drop the Readme, History, and all build/*.css files into the pure-release repo**
-    - [ ] **Commit and push the changes to the pure-release repo**
-    - [ ] **git tag vX.X.X** and push to origin
 
 ## Publish pure to NPM
 
@@ -108,56 +92,10 @@ Verify via https://unpkg.com/purecss@VERSION
 - [ ] **Draft a new release on [GitHub](https://github.com/pure-css/pure/releases) for all three repos,** using "v" in the version number (e.g., v1.0.0). Drafts are invisible to the public. Once these are published, the repos will be visible, and they will be tagged. **Don't publish them just yet.**
 
     - [ ] **pure**
-    - [ ] **pure-release**
-    - [ ] **pure-site** (**Note:** pure-site has its own version number)
-
-## Publishing the pure-site
-
-**NOTE: The pure-site is currently hosted on Now.sh.**
-
-Let's review where we're at:
-
-* All the repos are checked and ready.
-* The build files are on the CDN.
-* We're ready to publish release notes and tag our repos by publishing the draft releases using GitHub.
-* Then we'll build the pure-site and check it.
-* Then we can deploy the pure-site to where the public can see it.
-
-- [ ] **Update Pure Version in pure-css/pure-site**
-
-    Bump the version number to the new Pure version in package.json.
-
-- [ ] **Commit those changes**
-
-- [ ] **Publish pure-release**
-
-    From the [pure-release repo](https://github.com/pure-css/pure-release/releases), publish the release you drafted earlier. Otherwise Bower won't be able to take advantage of the version number you just updated, because pure-release won't yet have the tag.
-
-- [ ] **Git push changes to pure-css/pure-site#master**
-
-    The local changes that were done to update the website for the release needs to be pushed back up to pure-css/pure-site#master on GitHub.com:
-
-    ```
-    $ git push upstream master
-    ```
-
-- [ ] **Test pure-site on Now host**
-
-    ```
-    $ now .
-    ```
-
-- [ ] **Publish pure-site release** If everything is looking good, you can publish the [release of pure-site](https://github.com/pure-css/pure-site/releases) on GitHub.
-
-## Promote pure-site to Now alias
-
-    ```
-    $ now alias set <new pure deployment> purecss.io
-    ```
 
 ## Formally publish Pure
 
-Now all our files are out there, the pure-release release is published, the pure-site release is published, and everything is looking good.
+Now all our files are out there and everything is looking good.
 
 - [ ] **Publish pure**
 
@@ -170,4 +108,4 @@ Now all our files are out there, the pure-release release is published, the pure
 
 ## Mark repo as pre-release
 
-- [ ] We should mark the version number of the project (in package.json and bower.json) as 0.6.1-pre for clarity, so there's no mistaking the leading edge of the project from the last release. Commit those changes and push to master.
+- [ ] We should mark the version number of the project (in package.json) as 0.6.1-pre for clarity, so there's no mistaking the leading edge of the project from the last release. Commit those changes and push to master.

RELEASE.md

@@ -1,6 +1,6 @@
 {
   "name": "purecss",
-  "version": "1.0.1",
+  "version": "2.0.0-rc.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/pure-css/pure.git"
@@ -15,7 +15,6 @@
   "files": "build/",
   "devDependencies": {
     "autoprefixer": "^9.6.1",
-    "bower": "^1.8.2",
     "grunt": "^1.0.1",
     "grunt-cli": "^1.2.0",
     "grunt-contrib-clean": "^2.0.0",
@@ -27,8 +26,8 @@
     "grunt-contrib-watch": "^1.0.0",
     "grunt-css-selectors": "^1.1.0",
     "grunt-postcss": "^0.9.0",
-    "grunt-pure-grids": "^1.0.0",
-    "grunt-stripmq": "0.0.6",
+    "grunt-pure-grids": "^2.0.0",
+    "normalize.css": "^8.0.1",
     "tap": "^14.4.1"
   },
   "description": "Pure is a ridiculously tiny CSS library you can use to start any web project.",

bower.json

@@ -4,6 +4,9 @@
 # Production
 /build
 
+# Ignore manually copied pure files to static/css folder
+/static/css/pure
+
 # Generated files
 .docusaurus
 .cache-loader

package.json

@@ -30,4 +30,11 @@ This command generates static content into the `build` directory and can be serv
 $ GIT_USER=<Your GitHub username> USE_SSH=true npm run deploy
 ```
 
-If you are using GitHub pages for hosting, this command is a convenient way to build the website and push to the `gh-pages` branch.
+The site is hosted on [Vercel](https://vercel.com/) and will automatically deploy when commits are merged to `master`.
+
+### Including Pure
+
+We want to use the locally built version of Pure so that the [layout examples](https://purecss.io/layouts/) are always using the `master` version, previously they had used a hardcoded CDN link.
+
+To get Docusaurus to register the css as `static`, they have to exist in the `static/` directory before the site is built. Therefore, we copy the Pure `build/` in manually and `.gitignore` them. Once Docusaurus builds, they resolve as proper CSS files.
+