diff --git a/lib/NsJsonpChunkTemplatePlugin.js b/lib/NsJsonpChunkTemplatePlugin.js index 2661dbb..939ee79 100644 --- a/lib/NsJsonpChunkTemplatePlugin.js +++ b/lib/NsJsonpChunkTemplatePlugin.js @@ -12,7 +12,7 @@ JsonpChunkTemplatePlugin.prototype.apply = function (chunkTemplate) { //JSONP version chunkTemplate.plugin("render", function (modules, chunk) { - var jsonpFunction = this.outputOptions.jsonpFunction; + var jsonpFunction = chunkTemplate.outputOptions.jsonpFunction; var source = new ConcatSource(); source.add(jsonpFunction + "(" + JSON.stringify(chunk.ids) + ","); source.add(modules); @@ -28,7 +28,7 @@ JsonpChunkTemplatePlugin.prototype.apply = function (chunkTemplate) { chunkTemplate.plugin("hash", function (hash) { hash.update("JsonpChunkTemplatePlugin"); hash.update("3"); - hash.update(this.outputOptions.jsonpFunction + ""); - hash.update(this.outputOptions.library + ""); + hash.update(chunkTemplate.outputOptions.jsonpFunction + ""); + hash.update(chunkTemplate.outputOptions.library + ""); }); }; diff --git a/lib/NsJsonpHotUpdateChunkTemplatePlugin.js b/lib/NsJsonpHotUpdateChunkTemplatePlugin.js index 9fd49de..6214c6f 100644 --- a/lib/NsJsonpHotUpdateChunkTemplatePlugin.js +++ b/lib/NsJsonpHotUpdateChunkTemplatePlugin.js @@ -11,7 +11,7 @@ module.exports = NsJsonpHotUpdateChunkTemplatePlugin; //JSONP version NsJsonpHotUpdateChunkTemplatePlugin.prototype.apply = function(hotUpdateChunkTemplate) { hotUpdateChunkTemplate.plugin("render", function(modulesSource, modules, removedModules, hash, id) { - var jsonpFunction = this.outputOptions.hotUpdateFunction; + var jsonpFunction = hotUpdateChunkTemplate.outputOptions.hotUpdateFunction; var source = new ConcatSource(); source.add(jsonpFunction + "(" + JSON.stringify(id) + ","); source.add(modulesSource); @@ -21,7 +21,7 @@ NsJsonpHotUpdateChunkTemplatePlugin.prototype.apply = function(hotUpdateChunkTem hotUpdateChunkTemplate.plugin("hash", function(hash) { hash.update("JsonpHotUpdateChunkTemplatePlugin"); hash.update("3"); - hash.update(this.outputOptions.hotUpdateFunction + ""); - hash.update(this.outputOptions.library + ""); + hash.update(hotUpdateChunkTemplate.outputOptions.hotUpdateFunction + ""); + hash.update(hotUpdateChunkTemplate.outputOptions.library + ""); }); }; diff --git a/lib/NsJsonpMainTemplatePlugin.js b/lib/NsJsonpMainTemplatePlugin.js index 063ec2a..5fe4503 100644 --- a/lib/NsJsonpMainTemplatePlugin.js +++ b/lib/NsJsonpMainTemplatePlugin.js @@ -27,7 +27,7 @@ JsonpMainTemplatePlugin.prototype.apply = function (mainTemplate) { }); mainTemplate.plugin("require-ensure", function (_, chunk, hash) { - var chunkFilename = this.outputOptions.chunkFilename; + var chunkFilename = mainTemplate.outputOptions.chunkFilename; var chunkMaps = chunk.getChunkMaps(); var insertMoreModules = [ "var moreModules = chunk.modules, chunkIds = chunk.ids;", @@ -77,7 +77,7 @@ JsonpMainTemplatePlugin.prototype.apply = function (mainTemplate) { }); mainTemplate.plugin("bootstrap", function (source, chunk, hash) { if (chunk.chunks.length > 0) { - var jsonpFunction = this.outputOptions.jsonpFunction; + var jsonpFunction = mainTemplate.outputOptions.jsonpFunction; return this.asString([ source, "", @@ -123,9 +123,9 @@ JsonpMainTemplatePlugin.prototype.apply = function (mainTemplate) { return source; }); mainTemplate.plugin("hot-bootstrap", function (source, chunk, hash) { - var hotUpdateChunkFilename = this.outputOptions.hotUpdateChunkFilename; - var hotUpdateMainFilename = this.outputOptions.hotUpdateMainFilename; - var hotUpdateFunction = this.outputOptions.hotUpdateFunction; + var hotUpdateChunkFilename = mainTemplate.outputOptions.hotUpdateChunkFilename; + var hotUpdateMainFilename = mainTemplate.outputOptions.hotUpdateMainFilename; + var hotUpdateFunction = mainTemplate.outputOptions.hotUpdateFunction; var currentHotUpdateChunkFilename = this.applyPluginsWaterfall("asset-path", JSON.stringify(hotUpdateChunkFilename), { hash: "\" + " + this.renderCurrentHashCode(hash) + " + \"", hashWithLength: function (length) { @@ -157,9 +157,9 @@ JsonpMainTemplatePlugin.prototype.apply = function (mainTemplate) { mainTemplate.plugin("hash", function (hash) { hash.update("jsonp"); hash.update("4"); - hash.update(this.outputOptions.filename + ""); - hash.update(this.outputOptions.chunkFilename + ""); - hash.update(this.outputOptions.jsonpFunction + ""); - hash.update(this.outputOptions.hotUpdateFunction + ""); + hash.update(mainTemplate.outputOptions.filename + ""); + hash.update(mainTemplate.outputOptions.chunkFilename + ""); + hash.update(mainTemplate.outputOptions.jsonpFunction + ""); + hash.update(mainTemplate.outputOptions.hotUpdateFunction + ""); }); }; diff --git a/lib/NsJsonpTemplatePlugin.js b/lib/NsJsonpTemplatePlugin.js index 0841a3a..8a23c36 100644 --- a/lib/NsJsonpTemplatePlugin.js +++ b/lib/NsJsonpTemplatePlugin.js @@ -10,8 +10,8 @@ function JsonpTemplatePlugin() {} module.exports = JsonpTemplatePlugin; JsonpTemplatePlugin.prototype.apply = function(compiler) { compiler.plugin("this-compilation", function(compilation) { - compilation.mainTemplate.apply(new NsJsonpMainTemplatePlugin()); - compilation.chunkTemplate.apply(new NsJsonpChunkTemplatePlugin()); - compilation.hotUpdateChunkTemplate.apply(new NsJsonpHotUpdateChunkTemplatePlugin()); + compilation.mainTemplate.apply(new NsJsonpMainTemplatePlugin(compilation.mainTemplate)); + compilation.chunkTemplate.apply(new NsJsonpChunkTemplatePlugin(compilation.chunkTemplate)); + compilation.hotUpdateChunkTemplate.apply(new NsJsonpHotUpdateChunkTemplatePlugin(compilation.hotUpdateChunkTemplate)); }); }; diff --git a/package.json b/package.json index f0edec1..fac3ecf 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "nativescript-vue-target", - "version": "0.1.0", + "version": "0.2.0", "description": "Webpack target for NativeScript-Vue", "main": "index.js", "peerDependencies": { - "webpack": "3.x" + "webpack": "3.x || 4.x" }, "repository": { "type": "git",