From 63e4f69bdcbc56457fb5d1a0cc6a9d10985bf089 Mon Sep 17 00:00:00 2001 From: Jakkkit <52351939+Jakkkit@users.noreply.github.com> Date: Wed, 16 Oct 2019 20:35:20 +0700 Subject: [PATCH] Revert "Adds WASM upload and binding support" --- README.md | 20 -------------------- deploy/lib/singlescript.js | 4 +--- deploy/lib/workerScript.js | 17 +---------------- package-lock.json | 14 +++++++------- package.json | 4 ++-- shared/multiscript.js | 16 +--------------- 6 files changed, 12 insertions(+), 63 deletions(-) diff --git a/README.md b/README.md index 7b8176d..86b0f91 100644 --- a/README.md +++ b/README.md @@ -86,23 +86,3 @@ functions: url: example.com/myfunction method: GET ``` - -### Web Assembly - -The plugin can upload and bind WASM to execute in your worker. The easiest way to do this is to use the --template cloudflare-workers-rust when generating a project. The template includes a Rust create folder setup with wasm-pack, a webpack script for adding the generated javascript into your project, and the yml file settings to upload the wasm file itself. - -```yaml -functions: - myfunction: - name: myfunction - webpack: true - script: handlers/myfunctionhandler - resources: - wasm: - - variable: WASM - filename: rust/pkg/wasm_bg.wasm - events: - - http: - url: example.com/myfunction - method: GET -``` \ No newline at end of file diff --git a/deploy/lib/singlescript.js b/deploy/lib/singlescript.js index 178addd..f24a169 100644 --- a/deploy/lib/singlescript.js +++ b/deploy/lib/singlescript.js @@ -17,7 +17,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ const sdk = require("../../provider/sdk"); -const { generateCode, generateWASM } = require("./workerScript"); +const { generateCode } = require("./workerScript"); const BB = require("bluebird"); const webpack = require("../../utils/webpack"); const cf = require("cloudflare-workers-toolkit"); @@ -82,7 +82,6 @@ module.exports = { accountId: this.provider.config.accountId, zoneId, script: scriptContents, - wasm: generateWASM(functionObject), bindings }); @@ -99,7 +98,6 @@ module.exports = { } return { - namespaceResponse, workerScriptResponse, routesResponse, isMultiScript: false diff --git a/deploy/lib/workerScript.js b/deploy/lib/workerScript.js index 7b3b34a..e46462d 100644 --- a/deploy/lib/workerScript.js +++ b/deploy/lib/workerScript.js @@ -32,21 +32,6 @@ const generateCode = (serverless, functionObject) => { return fs.readFileSync(script).toString(); }; -/** - * Builds the list of wasm objects for script deployment - * @param {} functionObject - */ -const generateWASM = (functionObject) => { - let wasm = []; - if (functionObject && functionObject.resources && functionObject.resources.wasm) { - functionObject.resources.wasm.map((w) => { - wasm.push(w.file); - }) - } - return wasm; -} - module.exports = { - generateCode, - generateWASM + generateCode }; diff --git a/package-lock.json b/package-lock.json index d0878fe..c006df2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "serverless-cloudflare-workers", - "version": "1.2.0", + "version": "1.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -811,9 +811,9 @@ "dev": true }, "cloudflare-workers-toolkit": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/cloudflare-workers-toolkit/-/cloudflare-workers-toolkit-0.1.0.tgz", - "integrity": "sha512-nA7flzutkLXtQ+sgsocr/9JX5QIOocoO6Xlk/O4jnyXGvE+Djy+KpHg/oiVeds7vU5KYfuzVJLy8+JGSGaE87w==", + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/cloudflare-workers-toolkit/-/cloudflare-workers-toolkit-0.0.11.tgz", + "integrity": "sha512-xdBxNMdmOK5Ps9ZTspUbCPzBl86cM/ejvlbbgnJvRvC4pe4CgzhH2KtAnA2WA1y4gIS9kIb1yPkRcdoRwr4jUg==", "requires": { "form-data": "^2.3.3", "node-fetch": "^2.3.0" @@ -2541,9 +2541,9 @@ "dev": true }, "js-yaml": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", - "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", + "version": "3.12.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz", + "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==", "dev": true, "requires": { "argparse": "^1.0.7", diff --git a/package.json b/package.json index b1c0943..a3551d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "serverless-cloudflare-workers", - "version": "1.2.0", + "version": "1.1.1", "description": "serverless cloudflare workers ", "main": "index.js", "scripts": { @@ -22,7 +22,7 @@ ], "dependencies": { "bluebird": "^3.4.7", - "cloudflare-workers-toolkit": "^0.1.0", + "cloudflare-workers-toolkit": "0.0.11", "fs-extra": "^7.0.1", "node-fetch": "^2.3.0", "webpack": "^4.25.1" diff --git a/shared/multiscript.js b/shared/multiscript.js index 5527cb5..fcc9c0f 100644 --- a/shared/multiscript.js +++ b/shared/multiscript.js @@ -17,8 +17,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ const cf = require("cloudflare-workers-toolkit"); -const path = require("path"); -const { generateCode, generateWASM } = require("../deploy/lib/workerScript"); +const { generateCode } = require("../deploy/lib/workerScript"); module.exports = { getRoutes(events) { @@ -56,18 +55,6 @@ module.exports = { bindings = bindings.concat(namespaceBindings); } - if (resources && resources.wasm) { - let wasmBindings = resources.wasm.map(function(wasm) { - return { - name: wasm.variable, - type: 'wasm_module', - part: path.basename(wasm.file, path.extname(wasm.file)) - } - }); - - bindings = bindings.concat(wasmBindings); - } - // Get Environment Variables let envVars = Object.assign({}, provider.environment); envVars = Object.assign(envVars, functionObject.environment); @@ -100,7 +87,6 @@ module.exports = { accountId, name: functionObject.name, script: contents, - wasm: generateWASM(functionObject), bindings })