File loader update

.babelrc

@@ -0,0 +1,10 @@
+{
+  "presets": [[
+    "env",
+    {
+      "targets": {
+        "node": "4"
+      }
+    }
+  ]]
+}

lib/loader.js

@@ -3,110 +3,103 @@ var fs = require ("fs");
 var loaderUtils = require ("loader-utils");
 var path = require ("path");
 var tmp = require ("tmp");
-var validateOptions = require ("schema-utils");
+var schemaUtils = require ("schema-utils");
 var schema = require ("./options.json");
 
+/* eslint-disable
+  multiline-ternary,
+*/
+module.exports = function(content) {
+  if (!this.emitFile) throw new Error('SWF Loader\n\nemitFile is required from module system');
+
+  var options = loaderUtils.getOptions(this) || {};
+
+  schemaUtils(schema, options, 'SWF Loader');
+
+  var context = options.context || this.rootContext || this.options && this.options.context;
+
+  var url = loaderUtils.interpolateName(this, options.name, {
+    context,
+    content,
+    regExp: options.regExp
+  });
 
-module.exports = function (content, map) {
-
-	if (!this.emitFile) {
-
-		throw new Error ("SWF Loader\n\nemitFile is required from module system");
-
-	}
-
-	this.cacheable && this.cacheable ();
-	this.value = content;
-
-	var options = loaderUtils.getOptions (this) || {};
-
-	validateOptions (schema, options, "SWF Loader");
-
-	var context = options.context || this.rootContext || this.options && this.options.context
-	var url = loaderUtils.interpolateName (this, options.name, { context, content, regExp: options.regExp });
-	var outputPath = "";
-
-	if (options.outputPath) {
-
-		outputPath = (typeof options.outputPath === "function" ? options.outputPath (url) : options.outputPath);
-
-	}
-
-	var filePath = this.resourcePath;
-
-	if (options.useRelativePath) {
-
-		var issuerContext = (this._module && this._module.issuer && this._module.issuer.context) || context;
-
-		var relativeUrl = issuerContext && path.relative (issuerContext, filePath).split (path.sep).join ('/');
-		var relativePath = relativeUrl && `${path.dirname(relativeUrl)}/`;
-
-		// eslint-disable-next-line no-bitwise
-		if (~relativePath.indexOf ("../")) {
-
-			outputPath = path.posix.join (outputPath, relativePath, url);
-
-		} else {
-
-			outputPath = relativePath + url;
-
-		}
-
-		url = relativePath + url;
-
-	} else if (options.outputPath) {
-
-		outputPath = typeof options.outputPath === "function" ? options.outputPath (url) : options.outputPath + url;
-		url = outputPath;
-
-	} else {
-
-		outputPath = url;
-
-	}
-
-	outputPath = path.basename (outputPath, ".swf") + ".bundle";
-	url = path.basename (url, ".swf") + ".bundle";
-
-	var publicPath = `__webpack_public_path__ + ${JSON.stringify (url)}`;
-
-	if (options.publicPath !== undefined) {
-
-		publicPath = JSON.stringify (typeof options.publicPath === "function" ? options.publicPath (url) : options.publicPath + url);
-
-	}
-
-	if (options.emitFile === undefined || options.emitFile) {
-
-		tmp.setGracefulCleanup ();
-		var tempDirectory = tmp.dirSync ({ postfix: ".bundle" });
-
-		execSync ("openfljs process " + this.resourcePath + " " + tempDirectory.name);
-
-		var walkSync = function (baseDir, dir = "", filelist = []) {
-
-			fs.readdirSync (baseDir).forEach (function (file) {
-
-				filelist = fs.statSync (path.join (baseDir, file)).isDirectory ()
-					? walkSync (path.join (baseDir, file), path.join (dir, file), filelist)
-					: filelist.concat (path.join (dir, file));
-
-			});
-
-			return filelist;
-
-		}
-
-		walkSync (tempDirectory.name).forEach (function (file) {
-
-			this.emitFile (path.join (outputPath, file), fs.readFileSync (path.join (tempDirectory.name, file)));
-
-		}.bind (this));
-
-	}
-
-	return `module.exports = ${publicPath};`;
-
+  var outputPath = url;
+
+  if (options.outputPath) {
+    if (typeof options.outputPath === 'function') {
+      outputPath = options.outputPath(url);
+    } else {
+      outputPath = path.posix.join(options.outputPath, url);
+    }
+  }
+
+  if (options.useRelativePath) {
+    var filePath = this.resourcePath;
+
+    var issuer = options.context ? context : this._module && this._module.issuer && this._module.issuer.context;
+
+    var relativeUrl = issuer && path.relative(issuer, filePath).split(path.sep).join('/');
+
+    var relativePath = relativeUrl && `${path.dirname(relativeUrl)}/`;
+    // eslint-disable-next-line no-bitwise
+    if (~relativePath.indexOf('../')) {
+      outputPath = path.posix.join(outputPath, relativePath, url);
+    } else {
+      outputPath = path.posix.join(relativePath, url);
+    }
+  }
+
+  var outputPathBundle = outputPath.replace(/\.swf$/, '') + '.bundle';
+  var publicPath = `__webpack_public_path__ + ${JSON.stringify(outputPathBundle)}`;
+
+  if (options.publicPath) {
+    if (typeof options.publicPath === 'function') {
+      publicPath = options.publicPath(url);
+    } else if (options.publicPath.endsWith('/')) {
+      publicPath = options.publicPath + url;
+    } else {
+      publicPath = `${options.publicPath}/${url}`;
+    }
+
+    publicPath = publicPath.replace(/\.swf$/, '') + '.bundle';
+    publicPath = JSON.stringify(publicPath);
+  }
+
+  outputPath = outputPath.replace(/\.swf$/, '') + '.bundle';
+
+  if (options.emitFile === undefined || options.emitFile) {
+
+    tmp.setGracefulCleanup ();
+    var tempDirectory = tmp.dirSync ({ postfix: ".bundle" });
+
+    execSync ("openfljs process " + this.resourcePath + " " + tempDirectory.name);
+
+    var walkSync = function (baseDir, dir = "", filelist = []) {
+
+      fs.readdirSync (baseDir).forEach (function (file) {
+
+        filelist = fs.statSync (path.join (baseDir, file)).isDirectory ()
+          ? walkSync (path.join (baseDir, file), path.join (dir, file), filelist)
+          : filelist.concat (path.join (dir, file));
+
+      });
+
+      return filelist;
+
+    }
+
+    walkSync (tempDirectory.name).forEach (function (file) {
+
+      this.emitFile (path.join (outputPath, file), fs.readFileSync (path.join (tempDirectory.name, file)));
+
+    }.bind (this));
+
+  }
+
+  // TODO revert to ES2015 Module export, when new CSS Pipeline is in place
+  return `module.exports = ${publicPath};`;
+
 }
 
 module.exports.raw = true;

lib/options.json

@@ -1,16 +1,19 @@
 {
-	"type": "object",
-	"properties": {
-		"name": {},
-		"regExp": {},
-		"context": {
-			"type": "string"
-		},
-		"publicPath": {},
-		"outputPath": {},
-		"useRelativePath": {
-			"type": "boolean"
-		}
-	},
-	"additionalProperties": true
+  "type": "object",
+  "properties": {
+    "name": {},
+    "regExp": {},
+    "context": {
+      "type": "string"
+    },
+    "publicPath": {},
+    "outputPath": {},
+    "useRelativePath": {
+      "type": "boolean"
+    },
+    "emitFile": {
+      "type": "boolean"
+    }
+  },
+  "additionalProperties": true
 }

package.json

@@ -24,5 +24,16 @@
   "peerDependencies": {
     "openfl": "^7.0.0-beta.7",
     "webpack": "^2.0.0 || ^3.0.0"
+  },
+  "scripts": {
+    "test": "jest"
+  },
+  "devDependencies": {
+    "babel-jest": "^22.4.3",
+    "babel-preset-env": "^1.6.1",
+    "jest": "^22.4.3",
+    "memory-fs": "^0.4.1",
+    "openfl": "^7.1.2",
+    "webpack": "^3.0.0"
   }
 }

test/__snapshots__/loader.test.js.snap

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Loader Defaults 1`] = `"module.exports = __webpack_public_path__ + \\"9baf1f9461ece62ac1a2ae67730b00c8.bundle\\";"`;

test/fixtures/fixture.js

@@ -0,0 +1,4 @@
+/* eslint-disable */
+import swf from './layout.swf';
+
+export default swf;

test/helpers/compiler.js

@@ -0,0 +1,68 @@
+/* eslint-disable
+  import/order,
+  multiline-ternary,
+  no-param-reassign,
+*/
+//import del from 'del';
+import path from 'path';
+import webpack from 'webpack';
+import MemoryFS from 'memory-fs';
+
+const module = (config) => {
+  return {
+    rules: config.rules || config.loader
+      ? [
+        {
+          test: config.loader.test || /\.swf$/,
+          use: {
+            loader: path.resolve(__dirname, '../../lib/loader.js'),
+            options: config.loader.options || {},
+          },
+        },
+      ]
+      : [],
+  };
+};
+
+const plugins = config => ([
+  new webpack.optimize.CommonsChunkPlugin({
+    name: ['runtime'],
+    minChunks: Infinity,
+  }),
+].concat(config.plugins || []));
+
+const output = (config) => {
+  return {
+    path: path.resolve(
+      __dirname,
+      `../outputs/${config.output ? config.output : ''}`,
+    ),
+    filename: '[name].bundle.js',
+  };
+};
+
+export default function (fixture, config, options) {
+  // webpack Config
+  config = {
+    devtool: config.devtool || 'sourcemap',
+    context: path.resolve(__dirname, '..', 'fixtures'),
+    entry: `./${fixture}`,
+    output: output(config),
+    module: module(config),
+    plugins: plugins(config),
+  };
+  // Compiler Options
+  options = Object.assign({ output: false }, options);
+
+  if (options.output) del.sync(config.output.path);
+
+  const compiler = webpack(config);
+
+  if (!options.output) compiler.outputFileSystem = new MemoryFS();
+
+  return new Promise((resolve, reject) => compiler.run((err, stats) => {
+    if (err) reject(err);
+
+    resolve(stats);
+  }));
+}

test/loader.test.js

@@ -0,0 +1,21 @@
+/* eslint-disable
+  prefer-destructuring,
+*/
+import webpack from './helpers/compiler';
+
+describe('Loader', () => {
+  test('Defaults', async () => {
+    const config = {
+      loader: {
+        test: /\.swf$/,
+        options: {},
+      },
+    };
+
+    const stats = await webpack('fixture.js', config);
+
+    const { source } = stats.toJson().modules[1];
+
+    expect(source).toMatchSnapshot();
+  });
+});