Merge branch 'next'

jaredpalmer · Apr 25, 2020 · c3422de · c3422de
2 parents ecd1ee4 + bd78149
commit c3422de
Show file tree

Hide file tree

Showing 27 changed files with 425 additions and 112 deletions.
diff --git a/lerna.json b/lerna.json
@@ -17,7 +17,7 @@
       "npmClient": "npm",
       "allowBranch": [
         "master",
-        "canary"
+        "next"
       ],
       "registry": "https://registry.npmjs.org/"
     }
@@ -34,5 +34,5 @@
     },
     "cacheDir": ".changelog"
   },
-  "version": "3.1.0-canary.6"
+  "version": "3.1.0-canary.9"
 }
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
   },
   "devDependencies": {
     "eslint": "^6.8.0",
+    "got": "^11.0.2",
     "husky": "^4.2.3",
     "jest": "^25.1.0",
     "lerna": "^3.20.2",

diff --git a/packages/babel-preset-razzle/package.json b/packages/babel-preset-razzle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-razzle",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "description": "Babel presets for Razzle",
   "main": "index.js",
   "author": "jaredpalmer",

diff --git a/packages/create-razzle-app/package.json b/packages/create-razzle-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-razzle-app",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "description": "CLI tool to bootstrap Razzle applications with no configuration",
   "main": "index.js",
   "license": "MIT",

diff --git a/packages/razzle-dev-utils/package.json b/packages/razzle-dev-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "razzle-dev-utils",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "description": "Utilities and helpers for Razzle",
   "author": "Jared Palmer <jared@palmer.net>",
   "repository": "git@github.com:jaredpalmer/razzle.git",

diff --git a/packages/razzle-dev-utils/printErrors.js b/packages/razzle-dev-utils/printErrors.js
@@ -8,11 +8,16 @@ const chalk = require('chalk');
  * @param {string} summary Summary of error
  * @param {Array<Error>} errors Array of Errors
  */
-function printErrors(summary, errors) {
+function printErrors(summary, errors, verbose) {
   console.log(chalk.red(summary));
   console.log();
   errors.forEach(err => {
-    console.log(err.message || err);
+    if (verbose) {
+      console.log(err);
+    }
+    else {
+      console.log(err.message || err);
+    }
     console.log();
   });
 }

diff --git a/packages/razzle-plugin-css/package.json b/packages/razzle-plugin-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "razzle-plugin-css",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "main": "index.js",
   "license": "MIT"
 }
diff --git a/packages/razzle-plugin-elm/package.json b/packages/razzle-plugin-elm/package.json
@@ -1,11 +1,11 @@
 {
   "name": "razzle-plugin-elm",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "elm-hot-loader": "^0.5.4",
     "elm-webpack-loader": "4.5.0",
-    "razzle-dev-utils": "^3.1.0-canary.1"
+    "razzle-dev-utils": "^3.1.0-canary.9"
   }
 }
diff --git a/packages/razzle-plugin-eslint/package.json b/packages/razzle-plugin-eslint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "razzle-plugin-eslint",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {

diff --git a/packages/razzle-plugin-inferno/package.json b/packages/razzle-plugin-inferno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "razzle-plugin-inferno",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "main": "index.js",
   "license": "MIT"
 }
diff --git a/packages/razzle-plugin-less/package.json b/packages/razzle-plugin-less/package.json
@@ -1,6 +1,6 @@
 {
   "name": "razzle-plugin-less",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "main": "index.js",
   "license": "MIT"
 }
diff --git a/packages/razzle-plugin-mdx/package.json b/packages/razzle-plugin-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "razzle-plugin-mdx",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "description": "Use mdx with Razzle",
   "main": "index.js",
   "repository": "git@github.com:jaredpalmer/razzle.git",
@@ -14,6 +14,6 @@
     "@mdx-js/mdx": "^0.15.0-0"
   },
   "devDependencies": {
-    "razzle": "^3.1.0-canary.1"
+    "razzle": "^3.1.0-canary.9"
   }
 }
diff --git a/packages/razzle-plugin-php/package.json b/packages/razzle-plugin-php/package.json
@@ -1,10 +1,10 @@
 {
   "name": "razzle-plugin-php",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "babel-preset-php": "^1.2.0",
-    "razzle-dev-utils": "^3.1.0-canary.1"
+    "razzle-dev-utils": "^3.1.0-canary.9"
   }
 }
diff --git a/packages/razzle-plugin-preact/package.json b/packages/razzle-plugin-preact/package.json
@@ -1,6 +1,6 @@
 {
   "name": "razzle-plugin-preact",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "main": "index.js",
   "license": "MIT"
 }
diff --git a/packages/razzle-plugin-react/package.json b/packages/razzle-plugin-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "razzle-plugin-react",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "main": "index.js",
   "license": "MIT"
 }
diff --git a/packages/razzle-plugin-scss/index.js b/packages/razzle-plugin-scss/index.js
@@ -126,8 +126,9 @@ module.exports = (
       use: isServer
         ? [
             {
-              loader: require.resolve('css-loader/locals'),
+              loader: require.resolve('css-loader'),
               options: Object.assign({}, options.css[constantEnv], {
+                onlyLocals: true,
                 modules: true,
                 localIdentName: '[name]__[local]___[hash:base64:5]',
               }),

diff --git a/packages/razzle-plugin-scss/package.json b/packages/razzle-plugin-scss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "razzle-plugin-scss",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "description": "Use SCSS/SASS with Razzle",
   "main": "index.js",
   "repository": "git@github.com:jaredpalmer/razzle.git",
@@ -20,6 +20,6 @@
   },
   "devDependencies": {
     "jest": "^23.1.0",
-    "razzle": "^3.1.0-canary.1"
+    "razzle": "^3.1.0-canary.9"
   }
 }
diff --git a/packages/razzle-plugin-typescript/package.json b/packages/razzle-plugin-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "razzle-plugin-typescript",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "description": "Use TypeScript with Razzle",
   "main": "index.js",
   "repository": "git@github.com:jaredpalmer/razzle.git",
@@ -14,7 +14,7 @@
     "ts-loader": "^5.2.1"
   },
   "devDependencies": {
-    "razzle": "^3.1.0-canary.1"
+    "razzle": "^3.1.0-canary.9"
   },
   "peerDependencies": {
     "typescript": ">=2.4.1"

diff --git a/packages/razzle-plugin-vue/package.json b/packages/razzle-plugin-vue/package.json
@@ -1,11 +1,11 @@
 {
   "name": "razzle-plugin-vue",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "css-loader": "^0.28.11",
-    "razzle-dev-utils": "^3.1.0-canary.1",
+    "razzle-dev-utils": "^3.1.0-canary.9",
     "vue": "^2.5.16",
     "vue-loader": "^15.2.4",
     "vue-style-loader": "^4.1.0",

diff --git a/packages/razzle/config/razzleDevServer.js b/packages/razzle/config/razzleDevServer.js
@@ -0,0 +1,23 @@
+#! /usr/bin/env node
+'use strict';
+
+const devServer = require('webpack-dev-server');
+
+class razzleDevServer extends devServer {
+
+  constructor(compiler, options = {}, _log) {
+    const verbose = options.verbose || false;
+    delete options['verbose'];
+    super(compiler, options, _log);
+    this.verbose = verbose;
+  }
+
+  showStatus() {
+    if (this.verbose) {
+      super.showStatus();
+    }
+  }
+
+}
+
+module.exports = razzleDevServer;
diff --git a/packages/razzle/package.json b/packages/razzle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "razzle",
-  "version": "3.1.0-canary.1",
+  "version": "3.1.0-canary.9",
   "description": "Create server-rendered universal JavaScript applications with no configuration",
   "repository": "git@github.com:jaredpalmer/razzle.git",
   "author": "Jared Palmer <jared@palmer.net>",
@@ -33,7 +33,7 @@
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^24.9.0",
     "babel-loader": "^8.0.6",
-    "babel-preset-razzle": "^3.1.0-canary.1",
+    "babel-preset-razzle": "^3.1.0-canary.9",
     "chalk": "^3.0.0",
     "css-loader": "^3.4.2",
     "dotenv": "8.2.0",
@@ -49,7 +49,7 @@
     "postcss-loader": "^3.0.0",
     "postcss-preset-env": "^6.7.0",
     "postcss-safe-parser": "^4.0.2",
-    "razzle-dev-utils": "^3.1.0-canary.1",
+    "razzle-dev-utils": "^3.1.0-canary.9",
     "react-dev-utils": "^10.2.0",
     "react-error-overlay": "^6.0.6",
     "sade": "^1.4.2",

diff --git a/packages/razzle/scripts/start.js b/packages/razzle/scripts/start.js
@@ -7,7 +7,7 @@ const mri = require('mri');
 const webpack = require('webpack');
 const paths = require('../config/paths');
 const createConfig = require('../config/createConfig');
-const devServer = require('webpack-dev-server');
+const devServer = require('../config/razzleDevServer');
 const printErrors = require('razzle-dev-utils/printErrors');
 const clearConsole = require('react-dev-utils/clearConsole');
 const logger = require('razzle-dev-utils/logger');
@@ -29,6 +29,8 @@ process.env.INSPECT = cliArgs.inspect || '';
 // Capture the type (isomorphic or single-page) as an environment variable
 process.env.BUILD_TYPE = cliArgs.type;
 
+const verbose = cliArgs.verbose || false;
+
 const clientOnly = cliArgs.type === 'spa';
 
 function main() {
@@ -116,7 +118,9 @@ function main() {
 
   // Create a new instance of Webpack-dev-server for our client assets.
   // This will actually run on a different port than the users app.
-  const clientDevServer = new devServer(clientCompiler, clientConfig.devServer);
+  const clientDevServer = new devServer(clientCompiler,
+    Object.assign(clientConfig.devServer, { verbose: verbose }));
+
   // Start Webpack-dev-server
   clientDevServer.listen(port, err => {
     if (err) {
@@ -131,7 +135,7 @@ function compile(config) {
   try {
     compiler = webpack(config);
   } catch (e) {
-    printErrors('Failed to compile.', [e]);
+    printErrors('Failed to compile.', [e], verbose);
     process.exit(1);
   }
   return compiler;