fix(sw): do not create empty SW when disabled

fixes: #78

Author: emilkarl

lib/broccoli-workbox.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 /* eslint-disable no-sync */
 const glob = require('glob');
 const fs = require('fs');
@@ -34,29 +35,46 @@ function BroccoliWorkbox(inputNodes, config) {
 	this.workboxOptions = config.workboxOptions;
 }
 
+BroccoliWorkbox.prototype.removeServiceWorker = function(filePath) {
+	if (fs.existsSync(filePath)) {
+		debug(yellow('Addon disabled. Service worker exist, remove it'));
+		fs.unlinkSync(filePath);
+	}
+};
+
 BroccoliWorkbox.prototype.build = function() {
 	const workboxOptions = Object.assign({}, this.workboxOptions);
 	const directory = this.inputPaths[0];
 
+	workboxOptions.swDest = path.join(directory, workboxOptions.swDest);
+
 	if (!this.options.enabled) {
-		debug(yellow('Addon disabled. Generating empty service worker...'));
-		workboxOptions.globPatterns = [];
-		workboxOptions.runtimeCaching = [];
+		debug(yellow('Addon disabled. Disable and remove service worker...'));
+		this.removeServiceWorker(workboxOptions.swDest);
+		return false;
 	}
 
-	workboxOptions.globDirectory = path.join(directory, workboxOptions.globDirectory);
-	workboxOptions.swDest = path.join(directory, workboxOptions.swDest);
+	workboxOptions.globDirectory = path.join(
+		directory,
+		workboxOptions.globDirectory
+	);
 
 	let cleanPromise = Promise.resolve();
-	const workboxDirectory = path.join(directory, `workbox-v${workboxBuildPkg.version}`);
+	const workboxDirectory = path.join(
+		directory,
+		`workbox-v${workboxBuildPkg.version}`
+	);
 
 	// Remove workbox libraries directory to prevent exception on recopying it.
-	if (!workboxOptions.importWorkboxFromCDN && fs.existsSync(workboxDirectory)) {
+	if (
+		!workboxOptions.importWorkboxFromCDN &&
+		fs.existsSync(workboxDirectory)
+	) {
 		cleanPromise = cleanDir(workboxDirectory);
 	}
-	const filesToIncludeInSW = glob.sync('assets/service-workers/*.js',
-		{ cwd: workboxOptions.globDirectory }
-	);
+	const filesToIncludeInSW = glob.sync('assets/service-workers/*.js', {
+		cwd: workboxOptions.globDirectory
+	});
 
 	workboxOptions.importScripts = filesToIncludeInSW;
 

node-tests/index.js

@@ -38,6 +38,10 @@ function assertFileExists(filePath) {
 	assert.ok(fs.existsSync(filePath), `${filePath} exists`);
 }
 
+function assertFileDoesNotExist(filePath) {
+	assert.isNotOk(fs.existsSync(filePath), `${filePath} does not exist`);
+}
+
 function assertContains(filePath, regexp) {
 	const fileContent = fs.readFileSync(filePath, 'utf8');
 
@@ -91,23 +95,40 @@ describe('Addon is enabled for production build', function() {
 describe('Addon is disabled for development', function() {
 	this.timeout(TEST_TIMEOUT);
 
-	context('Precaches nothing and register serviceworker', () => {
+	context('Precaches nothing and does not register serviceworker', () => {
 		before(() => {
 			mockConfig();
-			return runEmberCommand(fixturePath, 'build');
+			// eslint-disable-next-line max-nested-callbacks
+			return runEmberCommand(fixturePath, 'build --prod').then(() => runEmberCommand(fixturePath, 'build'));
 		});
 
 		after(() => {
 			restoreConfig();
 			return cleanup(fixturePath);
 		});
 
-		it('produces a sw.js file', () => {
-			assertFileExists(outputSWPath);
+		it('does not produce a sw.js file', () => {
+			assertFileDoesNotExist(outputSWPath);
+		});
+	});
+
+	context('Addon was enabled before and then disabled', () => {
+		before(() => {
+			mockConfig();
+			return runEmberCommand(fixturePath, 'build --prod');
+		});
+
+		after(() => {
+			restoreConfig();
+			return cleanup(fixturePath);
 		});
 
-		it('precaches nothing', () => {
-			assertContains(outputSWPath, /precacheManifest\s\=\s\[\]/);
+		it('removes sw.js file', () => {
+			assertFileExists(outputSWPath);
+			// eslint-disable-next-line max-nested-callbacks
+			runEmberCommand(fixturePath, 'build').finally(() => {
+				assertFileDoesNotExist(outputSWPath);
+			});
 		});
 	});
 });