Merge pull request #1 from parcel-bundler/master

1/31 changes.
parcel-bundler · Jan 30, 2019 · 1cde90f · 1cde90f · sainthkh · Jan 30, 2019
2 parents 647f82d + 0ada4d6
commit 1cde90f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/packages/core/integration-tests/test/html.js b/packages/core/integration-tests/test/html.js
@@ -280,16 +280,20 @@ describe('html', function() {
   });
 
   it('should minify HTML in production mode', async function() {
-    await bundle(path.join(__dirname, '/integration/htmlnano/index.html'), {
+    let inputFile = path.join(__dirname, '/integration/htmlnano/index.html');
+    await bundle(inputFile, {
       production: true
     });
 
-    let html = await fs.readFile(
-      path.join(__dirname, '/dist/index.html'),
-      'utf8'
-    );
+    let inputSize = (await fs.stat(inputFile)).size;
+
+    let outputFile = path.join(__dirname, '/dist/index.html');
+    let outputSize = (await fs.stat(outputFile)).size;
+
+    assert(inputSize > outputSize);
+
+    let html = await fs.readFile(outputFile, 'utf8');
     assert(html.includes('Other page'));
-    assert(!html.includes('\n'));
   });
 
   it('should read .htmlnanorc and minify HTML in production mode', async function() {
@@ -326,19 +330,23 @@ describe('html', function() {
   });
 
   it('should not minify default values inside HTML in production mode', async function() {
-    await bundle(
-      path.join(__dirname, '/integration/htmlnano-defaults-form/index.html'),
-      {
-        production: true
-      }
+    let inputFile = path.join(
+      __dirname,
+      '/integration/htmlnano-defaults-form/index.html'
     );
+    await bundle(inputFile, {
+      production: true
+    });
 
-    let html = await fs.readFile(
-      path.join(__dirname, '/dist/index.html'),
-      'utf8'
-    );
+    let inputSize = (await fs.stat(inputFile)).size;
+
+    let outputFile = path.join(__dirname, '/dist/index.html');
+    let outputSize = (await fs.stat(outputFile)).size;
+
+    assert(inputSize > outputSize);
+
+    let html = await fs.readFile(outputFile, 'utf8');
     assert(html.includes('<input type="text">'));
-    assert(!html.includes('\n'));
   });
 
   it('should not prepend the public path to assets with remote URLs', async function() {

diff --git a/packages/core/parcel-bundler/src/assets/PugAsset.js b/packages/core/parcel-bundler/src/assets/PugAsset.js
@@ -18,7 +18,7 @@ class PugAsset extends Asset {
       compileDebug: false,
       filename: this.name,
       basedir: path.dirname(this.name),
-      pretty: !this.options.minify,
+      pretty: config.pretty || false,
       templateName: path.basename(this.basename, path.extname(this.basename)),
       filters: config.filters,
       filterOptions: config.filterOptions,

diff --git a/packages/core/parcel-bundler/test/sourcemaps.js b/packages/core/parcel-bundler/test/sourcemaps.js
@@ -1,5 +1,4 @@
 const assert = require('assert');
-const fs = require('@parcel/fs');
 const SourceMap = require('../src/SourceMap');
 
 describe('sourcemaps', function() {