-
-
Notifications
You must be signed in to change notification settings - Fork 291
Don't fail the build when wasm modules are used. #410
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
ba2f0fd
417fdc6
1c16d9b
0e03f7b
5cb01b5
ea905a5
f9cbd3a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| { | ||
| "parser": "babel-eslint", | ||
| "parserOptions": { | ||
| "ecmaVersion": 5, | ||
| "sourceType": "script" | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,14 @@ var compare = require('./compare'); | |
| var webpackMajorVersion = require('webpack/package.json').version.split('.')[0]; | ||
|
|
||
| module.exports = function(OfflinePluginOptions, testFlags) { | ||
| testFlags = testFlags || {}; | ||
|
|
||
| if (testFlags.minimumWebpackMajorVersion && | ||
| parseInt(webpackMajorVersion, 10) < testFlags.minimumWebpackMajorVersion) { | ||
| throw new Error('unsupported webpack version'); | ||
| } | ||
| delete testFlags.minimumWebpackMajorVersion; | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How come you are deleting this? If set, would you not expect it to be present further down the execution flow? Maybe I am missunderstanding something :) |
||
|
|
||
| var testDir = process.cwd(); | ||
| var outputPath = path.join(testDir, '__output'); | ||
|
|
||
|
|
@@ -17,7 +25,7 @@ module.exports = function(OfflinePluginOptions, testFlags) { | |
| noVersionDump: true, | ||
| appCacheEnabled: true, | ||
| pluginVersion: '999.999.999' | ||
| }, testFlags || {}); | ||
| }, testFlags); | ||
|
|
||
| var config = { | ||
| bail: true, | ||
|
|
@@ -48,6 +56,7 @@ module.exports = function(OfflinePluginOptions, testFlags) { | |
|
|
||
| if (webpackMajorVersion === '4') { | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should probably use |
||
| config.mode = 'none'; | ||
| config.resolve.extensions.push('.wasm'); | ||
| } | ||
|
|
||
| return config; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| (window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[ | ||
| /* 0 */, | ||
| /* 1 */ | ||
| /***/ (function(module, exports, __webpack_require__) { | ||
|
|
||
| "use strict"; | ||
| // Instantiate WebAssembly module | ||
| var wasmExports = __webpack_require__.w[module.i]; | ||
| __webpack_require__.r(exports); | ||
| // export exports from WebAssembly module | ||
| for(var name in wasmExports) if(name != "__webpack_init__") exports[name] = wasmExports[name]; | ||
| // exec imports from WebAssembly module (for esm order) | ||
|
|
||
|
|
||
| // exec wasm module | ||
| wasmExports["__webpack_init__"]() | ||
|
|
||
| /***/ }) | ||
| ]]); |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| CACHE MANIFEST | ||
| #ver:622bdcdcc724adbaffb1363104430c4bbc05c36a | ||
|
|
||
| CACHE: | ||
| ../external.js | ||
| ../1.js | ||
| ../3dd30cc556661df8973b.module.wasm | ||
|
|
||
| NETWORK: | ||
| * |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| <!doctype html> | ||
| <html manifest="manifest.appcache"><meta charset="utf-8"></html> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,256 @@ | ||
| /******/ (function(modules) { // webpackBootstrap | ||
| /******/ // install a JSONP callback for chunk loading | ||
| /******/ function webpackJsonpCallback(data) { | ||
| /******/ var chunkIds = data[0]; | ||
| /******/ var moreModules = data[1]; | ||
| /******/ | ||
| /******/ | ||
| /******/ // add "moreModules" to the modules object, | ||
| /******/ // then flag all "chunkIds" as loaded and fire callback | ||
| /******/ var moduleId, chunkId, i = 0, resolves = []; | ||
| /******/ for(;i < chunkIds.length; i++) { | ||
| /******/ chunkId = chunkIds[i]; | ||
| /******/ if(installedChunks[chunkId]) { | ||
| /******/ resolves.push(installedChunks[chunkId][0]); | ||
| /******/ } | ||
| /******/ installedChunks[chunkId] = 0; | ||
| /******/ } | ||
| /******/ for(moduleId in moreModules) { | ||
| /******/ if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) { | ||
| /******/ modules[moduleId] = moreModules[moduleId]; | ||
| /******/ } | ||
| /******/ } | ||
| /******/ if(parentJsonpFunction) parentJsonpFunction(data); | ||
| /******/ | ||
| /******/ while(resolves.length) { | ||
| /******/ resolves.shift()(); | ||
| /******/ } | ||
| /******/ | ||
| /******/ }; | ||
| /******/ | ||
| /******/ | ||
| /******/ // The module cache | ||
| /******/ var installedModules = {}; | ||
| /******/ | ||
| /******/ // object to store loaded and loading chunks | ||
| /******/ // undefined = chunk not loaded, null = chunk preloaded/prefetched | ||
| /******/ // Promise = chunk loading, 0 = chunk loaded | ||
| /******/ var installedChunks = { | ||
| /******/ 0: 0 | ||
| /******/ }; | ||
| /******/ | ||
| /******/ | ||
| /******/ | ||
| /******/ // script path function | ||
| /******/ function jsonpScriptSrc(chunkId) { | ||
| /******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + ".js" | ||
| /******/ } | ||
| /******/ | ||
| /******/ // object to store loaded and loading wasm modules | ||
| /******/ var installedWasmModules = {}; | ||
| /******/ | ||
| /******/ function promiseResolve() { return Promise.resolve(); } | ||
| /******/ | ||
| /******/ var wasmImportObjects = { | ||
| /******/ 1: function() { | ||
| /******/ return { | ||
| /******/ | ||
| /******/ }; | ||
| /******/ }, | ||
| /******/ }; | ||
| /******/ | ||
| /******/ // The require function | ||
| /******/ function __webpack_require__(moduleId) { | ||
| /******/ | ||
| /******/ // Check if module is in cache | ||
| /******/ if(installedModules[moduleId]) { | ||
| /******/ return installedModules[moduleId].exports; | ||
| /******/ } | ||
| /******/ // Create a new module (and put it into the cache) | ||
| /******/ var module = installedModules[moduleId] = { | ||
| /******/ i: moduleId, | ||
| /******/ l: false, | ||
| /******/ exports: {} | ||
| /******/ }; | ||
| /******/ | ||
| /******/ // Execute the module function | ||
| /******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); | ||
| /******/ | ||
| /******/ // Flag the module as loaded | ||
| /******/ module.l = true; | ||
| /******/ | ||
| /******/ // Return the exports of the module | ||
| /******/ return module.exports; | ||
| /******/ } | ||
| /******/ | ||
| /******/ // This file contains only the entry chunk. | ||
| /******/ // The chunk loading function for additional chunks | ||
| /******/ __webpack_require__.e = function requireEnsure(chunkId) { | ||
| /******/ var promises = []; | ||
| /******/ | ||
| /******/ | ||
| /******/ // JSONP chunk loading for javascript | ||
| /******/ | ||
| /******/ var installedChunkData = installedChunks[chunkId]; | ||
| /******/ if(installedChunkData !== 0) { // 0 means "already installed". | ||
| /******/ | ||
| /******/ // a Promise means "currently loading". | ||
| /******/ if(installedChunkData) { | ||
| /******/ promises.push(installedChunkData[2]); | ||
| /******/ } else { | ||
| /******/ // setup Promise in chunk cache | ||
| /******/ var promise = new Promise(function(resolve, reject) { | ||
| /******/ installedChunkData = installedChunks[chunkId] = [resolve, reject]; | ||
| /******/ }); | ||
| /******/ promises.push(installedChunkData[2] = promise); | ||
| /******/ | ||
| /******/ // start chunk loading | ||
| /******/ var head = document.getElementsByTagName('head')[0]; | ||
| /******/ var script = document.createElement('script'); | ||
| /******/ var onScriptComplete; | ||
| /******/ | ||
| /******/ script.charset = 'utf-8'; | ||
| /******/ script.timeout = 120; | ||
| /******/ if (__webpack_require__.nc) { | ||
| /******/ script.setAttribute("nonce", __webpack_require__.nc); | ||
| /******/ } | ||
| /******/ script.src = jsonpScriptSrc(chunkId); | ||
| /******/ | ||
| /******/ onScriptComplete = function (event) { | ||
| /******/ // avoid mem leaks in IE. | ||
| /******/ script.onerror = script.onload = null; | ||
| /******/ clearTimeout(timeout); | ||
| /******/ var chunk = installedChunks[chunkId]; | ||
| /******/ if(chunk !== 0) { | ||
| /******/ if(chunk) { | ||
| /******/ var errorType = event && (event.type === 'load' ? 'missing' : event.type); | ||
| /******/ var realSrc = event && event.target && event.target.src; | ||
| /******/ var error = new Error('Loading chunk ' + chunkId + ' failed.\n(' + errorType + ': ' + realSrc + ')'); | ||
| /******/ error.type = errorType; | ||
| /******/ error.request = realSrc; | ||
| /******/ chunk[1](error); | ||
| /******/ } | ||
| /******/ installedChunks[chunkId] = undefined; | ||
| /******/ } | ||
| /******/ }; | ||
| /******/ var timeout = setTimeout(function(){ | ||
| /******/ onScriptComplete({ type: 'timeout', target: script }); | ||
| /******/ }, 120000); | ||
| /******/ script.onerror = script.onload = onScriptComplete; | ||
| /******/ head.appendChild(script); | ||
| /******/ } | ||
| /******/ } | ||
| /******/ | ||
| /******/ // Fetch + compile chunk loading for webassembly | ||
| /******/ | ||
| /******/ var wasmModules = {"1":[1]}[chunkId] || []; | ||
| /******/ | ||
| /******/ wasmModules.forEach(function(wasmModuleId) { | ||
| /******/ var installedWasmModuleData = installedWasmModules[wasmModuleId]; | ||
| /******/ | ||
| /******/ // a Promise means "currently loading" or "already loaded". | ||
| /******/ if(installedWasmModuleData) | ||
| /******/ promises.push(installedWasmModuleData); | ||
| /******/ else { | ||
| /******/ var importObject = wasmImportObjects[wasmModuleId](); | ||
| /******/ var req = fetch(__webpack_require__.p + "" + {"1":"3dd30cc556661df8973b"}[wasmModuleId] + ".module.wasm"); | ||
| /******/ var promise; | ||
| /******/ if(importObject instanceof Promise && typeof WebAssembly.compileStreaming === 'function') { | ||
| /******/ promise = Promise.all([WebAssembly.compileStreaming(req), importObject]).then(function(items) { | ||
| /******/ return WebAssembly.instantiate(items[0], items[1]); | ||
| /******/ }); | ||
| /******/ } else if(typeof WebAssembly.instantiateStreaming === 'function') { | ||
| /******/ promise = WebAssembly.instantiateStreaming(req, importObject); | ||
| /******/ } else { | ||
| /******/ var bytesPromise = req.then(function(x) { return x.arrayBuffer(); }); | ||
| /******/ promise = bytesPromise.then(function(bytes) { | ||
| /******/ return WebAssembly.instantiate(bytes, importObject); | ||
| /******/ }); | ||
| /******/ } | ||
| /******/ promises.push(installedWasmModules[wasmModuleId] = promise.then(function(res) { | ||
| /******/ return __webpack_require__.w[wasmModuleId] = (res.instance || res).exports; | ||
| /******/ })); | ||
| /******/ } | ||
| /******/ }); | ||
| /******/ return Promise.all(promises); | ||
| /******/ }; | ||
| /******/ | ||
| /******/ // expose the modules object (__webpack_modules__) | ||
| /******/ __webpack_require__.m = modules; | ||
| /******/ | ||
| /******/ // expose the module cache | ||
| /******/ __webpack_require__.c = installedModules; | ||
| /******/ | ||
| /******/ // define getter function for harmony exports | ||
| /******/ __webpack_require__.d = function(exports, name, getter) { | ||
| /******/ if(!__webpack_require__.o(exports, name)) { | ||
| /******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); | ||
| /******/ } | ||
| /******/ }; | ||
| /******/ | ||
| /******/ // define __esModule on exports | ||
| /******/ __webpack_require__.r = function(exports) { | ||
| /******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { | ||
| /******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); | ||
| /******/ } | ||
| /******/ Object.defineProperty(exports, '__esModule', { value: true }); | ||
| /******/ }; | ||
| /******/ | ||
| /******/ // create a fake namespace object | ||
| /******/ // mode & 1: value is a module id, require it | ||
| /******/ // mode & 2: merge all properties of value into the ns | ||
| /******/ // mode & 4: return value when already ns object | ||
| /******/ // mode & 8|1: behave like require | ||
| /******/ __webpack_require__.t = function(value, mode) { | ||
| /******/ if(mode & 1) value = __webpack_require__(value); | ||
| /******/ if(mode & 8) return value; | ||
| /******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; | ||
| /******/ var ns = Object.create(null); | ||
| /******/ __webpack_require__.r(ns); | ||
| /******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); | ||
| /******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); | ||
| /******/ return ns; | ||
| /******/ }; | ||
| /******/ | ||
| /******/ // getDefaultExport function for compatibility with non-harmony modules | ||
| /******/ __webpack_require__.n = function(module) { | ||
| /******/ var getter = module && module.__esModule ? | ||
| /******/ function getDefault() { return module['default']; } : | ||
| /******/ function getModuleExports() { return module; }; | ||
| /******/ __webpack_require__.d(getter, 'a', getter); | ||
| /******/ return getter; | ||
| /******/ }; | ||
| /******/ | ||
| /******/ // Object.prototype.hasOwnProperty.call | ||
| /******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; | ||
| /******/ | ||
| /******/ // __webpack_public_path__ | ||
| /******/ __webpack_require__.p = ""; | ||
| /******/ | ||
| /******/ // on error function for async loading | ||
| /******/ __webpack_require__.oe = function(err) { console.error(err); throw err; }; | ||
| /******/ | ||
| /******/ // object with all WebAssembly.instance exports | ||
| /******/ __webpack_require__.w = {}; | ||
| /******/ | ||
| /******/ var jsonpArray = window["webpackJsonp"] = window["webpackJsonp"] || []; | ||
| /******/ var oldJsonpFunction = jsonpArray.push.bind(jsonpArray); | ||
| /******/ jsonpArray.push = webpackJsonpCallback; | ||
| /******/ jsonpArray = jsonpArray.slice(); | ||
| /******/ for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]); | ||
| /******/ var parentJsonpFunction = oldJsonpFunction; | ||
| /******/ | ||
| /******/ | ||
| /******/ // Load entry module and return exports | ||
| /******/ return __webpack_require__(__webpack_require__.s = 0); | ||
| /******/ }) | ||
| /************************************************************************/ | ||
| /******/ ([ | ||
| /* 0 */ | ||
| /***/ (function(module, exports, __webpack_require__) { | ||
|
|
||
| __webpack_require__.e(/* import() */ 1).then(__webpack_require__.bind(null, 1)); | ||
|
|
||
|
|
||
| /***/ }) | ||
| /******/ ]); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you know of any other situation that could cause source to be an
ArrayBuffer? (It shouldn't matter though, since the same logic should apply.)