move relay example to apollo; update postcss

Author: ChristopherBiscardi

examples/relay/.babelrc renamed to examples/apollo/.babelrc

@@ -1,5 +1,5 @@
 module.exports = {
-  "scaffolding": "@sa-labs/leo-scaffolding-relay",
+  "scaffolding": "@sa-labs/leo-scaffolding-apollo",
   "plugins": [
     "@sa-labs/leo-plugin-blogpost",
     "@sa-labs/leo-plugin-markdown",

examples/relay/leo.config.js renamed to examples/apollo/leo.config.js

@@ -16,7 +16,7 @@
     "@sa-labs/leo-plugin-images": "file:../../packages/leo-plugin-images",
     "@sa-labs/leo-plugin-markdown": "file:../../packages/leo-plugin-markdown",
     "@sa-labs/leo-plugin-postcss": "file:../../packages/leo-plugin-postcss",
-    "@sa-labs/leo-scaffolding-relay": "file:../../packages/leo-scaffolding-relay",
+    "@sa-labs/leo-scaffolding-apollo": "file:../../packages/leo-scaffolding-apollo",
     "frontmatter-loader": "0.0.1"
   }
 }

examples/relay/package.json renamed to examples/apollo/package.json

@@ -3,51 +3,50 @@ var path = require('path');
 
 module.exports = function configure(config) {
 
-  config.loader('css', {
+  // Project's CSS. Run CSS in modules mode with postcss
+  config.module.rules.push({
     test: /\.css$/,
-    loader: ExtractTextPlugin.extract('style', 'css-loader?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss-loader')
+    exclude: /node_modules/,
+    loader: ExtractTextPlugin.extract({
+      fallbackLoader: 'style-loader',
+      loader: 'css-loader?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss-loader'
+    })
   });
 
-
   // Project's global css. Run PostCSS but not modules mode.
-  config.loader('global-css', {
+  config.module.rules.push({
     test: /\.global\.css$/,
-    loader: ExtractTextPlugin.extract('style-loader', 'css-loader?importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss-loader')
+    loader: ExtractTextPlugin.extract({
+      fallbackLoader: 'style-loader',
+      loader: 'css-loader?importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss-loader'
+    })
   });
 
   // Third Party CSS. From node_modules. Don't process, just load.
-  config.loader('third-party-css', {
+  config.module.rules.push({
     test: /\.css$/,
     include: /node_modules/,
-    loader: ExtractTextPlugin.extract('style-loader', 'css-loader')
+    loader: ExtractTextPlugin.extract({
+      fallbackLoader: 'style-loader',
+      loader: 'css-loader'
+    })
   });
 
-  config.plugin('extract-css',
-    ExtractTextPlugin, ['styles.[contenthash].css', {
-      allChunks: true
-    }]);
-
-  config.merge({
-    postcss: [
-      require('postcss-brand-colors'),
-      require('postcss-modular-scale'),
-      require('postcss-responsive-type'),
-      require('postcss-cssnext')({
-        browsers: 'last 2 versions'
-      }),
-      require('lost')({
-        flexbox: 'flex'
-      }),
-      require('postcss-font-magician')({
-        hosted: path.resolve(process.cwd(), './fonts')
-      }),
-      // require('list-selectors').plugin(function(selectorList) {
-      //   console.log(selectorList)
-      // }),
-      require('immutable-css'),
-      require('postcss-browser-reporter')
-    ]
+  const extract = new ExtractTextPlugin({
+    filename: 'styles.[contenthash].css',
+    allChunks: true
   });
+  if(config.plugins) {
+    config.plugins.push(extract);
+  } else {
+    config.plugins = [extract];
+  }
+
+  /* config.plugins.push(new webpack.LoaderOptionsPlugin({
+     options: {
+     context: __dirname
+     }
+     })); */
 
   return config;
 }

examples/relay/routes.js renamed to examples/apollo/routes.js

@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "css-loader": "^0.23.0",
-    "extract-text-webpack-plugin": "^1.0.1",
+    "extract-text-webpack-plugin": "^2.0.0-beta.4",
     "immutable-css": "^1.0.1",
     "list-selectors": "^2.0.0",
     "lost": "^7.1.0",
@@ -29,7 +29,7 @@
     "postcss-cssstats": "^1.0.0",
     "postcss-font-magician": "^1.4.0",
     "postcss-import": "^7.1.3",
-    "postcss-loader": "^0.8.0",
+    "postcss-loader": "^1.2.0",
     "postcss-modular-scale": "^2.5.1",
     "postcss-nested": "^1.0.0",
     "postcss-responsive-type": "^0.3.2",