feat(url): add assets support (url/experimental)

michael-ciniawsky · michael-ciniawsky · commit 4c900d841715 · 2018-03-03T08:42:46.000+01:00
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -9,6 +9,9 @@ const OptionsApply = require("./OptionsApply");
 const JavascriptModulesPlugin = require("./JavascriptModulesPlugin");
 const JsonModulesPlugin = require("./JsonModulesPlugin");
 const WebAssemblyModulesPlugin = require("./WebAssemblyModulesPlugin");
+// URL
+const URLModulesPlugin = require("./url/URLModulesPlugin");
+const URLDependencyPlugin = require("./url/URLDependency");
 
 const LoaderTargetPlugin = require("./LoaderTargetPlugin");
 const FunctionModulePlugin = require("./FunctionModulePlugin");
@@ -270,6 +273,9 @@ class WebpackOptionsApply extends OptionsApply {
 		new JavascriptModulesPlugin().apply(compiler);
 		new JsonModulesPlugin().apply(compiler);
 		new WebAssemblyModulesPlugin().apply(compiler);
+		// URL
+		new URLModulesPlugin().apply(compiler);
+		new URLDependencyPlugin().apply(compiler);
 
 		new EntryOptionPlugin().apply(compiler);
 		compiler.hooks.entryOption.call(options.context, options.entry);
diff --git a/lib/url/URLDependency.js b/lib/url/URLDependency.js
@@ -0,0 +1,25 @@
+const {
+	URLDependency
+} = require('./dependencies');
+
+class URLDependencyPlugin {
+	constructor(options) {
+		this.plugin = {
+			name: "URLDependencyPlugin"
+		};
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const { plugin } = this;
+		const { compilation } = compiler.hooks
+
+		compilation.tap(plugin, (compilation, { normalModuleFactory }) => {
+			const { dependencyFactories } = compilation;
+
+			dependencyFactories.set(URLDependency, normalModuleFactory);
+		});
+	}
+}
+
+module.exports = URLDependencyPlugin;
diff --git a/lib/url/URLGenerator.js b/lib/url/URLGenerator.js
@@ -0,0 +1,7 @@
+class URLGenerator {
+	generate(module) {
+		return module.originalSource();
+	}
+}
+
+module.exports = URLGenerator;
diff --git a/lib/url/URLModulesPlugin.js b/lib/url/URLModulesPlugin.js
@@ -0,0 +1,30 @@
+const URLParser = require('./URLParser');
+const URLGenerator = require('./URLGenerator');
+
+class URLModulesPlugin {
+	constructor() {
+		this.plugin = {
+			name: "URLModulesPlugin"
+		}
+	}
+
+	apply(compiler) {
+		const { plugin } = this;
+		const { compilation } = compiler.hooks;
+
+		compilation.tap(plugin, (compilation, { normalModuleFactory }) => {
+			const { moduleTemplates } = compilation.hooks;
+			const { createParser, createGenerator } = normalModuleFactory.hooks;
+
+			createParser.for('url/experimental').tap(plugin, () => {
+				return new URLParser();
+			})
+
+			createGenerator.for('url/experimental').tap(plugin, () => {
+				return new URLGenerator();
+			});
+		});
+	}
+}
+
+module.exports = URLModulesPlugin;
diff --git a/lib/url/URLParser.js b/lib/url/URLParser.js
@@ -0,0 +1,32 @@
+const path = require('path');
+const { RawSource } = require('webpack-sources');
+
+class URLParser {
+	constructor (options = {}) {
+		this.options = options
+	}
+
+	parse(source, state) {
+		const { module } = state;
+
+		if (typeof source === 'string') {
+			source = Buffer.from(source);
+		}
+
+		const file = path.relative(module.context, module.request);
+
+		source = new RawSource(source);
+
+		state.module._source = new RawSource(
+			`export default '${module.rawRequest}'`
+		);
+
+		state.module.buildInfo.assets = {
+			[file]: source
+		};
+
+		return state;
+	}
+}
+
+module.exports = URLParser;
diff --git a/lib/url/URLTemplate.js b/lib/url/URLTemplate.js
@@ -0,0 +1,29 @@
+const { RawSource } = require('webpack-sources');
+
+class URLModulesTemplatePlugin {
+	constructor () {
+		this.plugin = "URLModulesTemplatePlugin";
+	}
+
+	apply(moduleTemplate) {
+		const { plugin } = this;
+		const { content, hash } = moduleTemplate.hooks;
+
+		content.tap(plugin, (source, module, { chunk }) => {
+			if (module.type && module.type.startsWith('url')) {
+				const url = new RawSource(source);
+
+				return url;
+			} else {
+				return source;
+			}
+		})
+
+		hash.tap(plugin, (hash) => {
+			hash.update(plugin);
+			hash.update('1');
+		})
+	}
+}
+
+module.exports = URLModulesTemplatePlugin;
diff --git a/lib/url/dependencies/URLDependency.js b/lib/url/dependencies/URLDependency.js
@@ -0,0 +1,26 @@
+const ModuleDependency = require('../../dependencies/ModuleDependency')
+
+class URLDependency extends ModuleDependency {
+	constructor(request, name) {
+		super(request);
+
+		this.name = name;
+	}
+
+	get type() {
+		return 'asset url';
+	}
+
+	getReference() {
+		if (!this.module) {
+			return null;
+		}
+
+		return {
+			module: this.module,
+			importedNames: [ this.name ]
+		};
+	}
+}
+
+module.exports = URLDependency;
diff --git a/lib/url/dependencies/index.js b/lib/url/dependencies/index.js
@@ -0,0 +1,5 @@
+const URLDependency = require('./URLDependency');
+
+module.exports = {
+	URLDependency
+};
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -947,6 +947,7 @@
             "javascript/dynamic",
             "javascript/esm",
             "json",
+            "url/experimental",
             "webassembly/experimental"
           ]
         },

Original file line number	Diff line number	Diff line change
`@@ -947,6 +947,7 @@`
`947`	`947`	`"javascript/dynamic",`
`948`	`948`	`"javascript/esm",`
`949`	`949`	`"json",`
	`950`	`+ "url/experimental",`
`950`	`951`	`"webassembly/experimental"`
`951`	`952`	`]`
`952`	`953`	`},`