From fdcc060861da2607a202e3c82d966e7946cc60b7 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 5 Jan 2021 13:40:49 +0200 Subject: [PATCH] feature(package) socket.io v3.0.5 (socketio/socket.io#3720) --- .putout.json | 4 ---- json/modules.json | 2 +- package.json | 33 +++++++++++++++++++++++--------- server/distribute/import.spec.js | 8 ++++---- test/server/console.js | 2 +- 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/.putout.json b/.putout.json index 5d6c3f53f8..fa1a31edba 100644 --- a/.putout.json +++ b/.putout.json @@ -4,7 +4,6 @@ }, "ignore": [ "fixture*", - "dist*", "app.json", "fontello.json" ], @@ -12,9 +11,6 @@ "*.md": { "convert-commonjs-to-esm": "on" }, - "{import.spec.js,console.js}": { - "remove-skip": "off" - }, ".webpack": { "webpack": "on" }, diff --git a/json/modules.json b/json/modules.json index d8df33c948..44bed072f1 100644 --- a/json/modules.json +++ b/json/modules.json @@ -21,7 +21,7 @@ ], "remote": [{ "name": "socket", - "version": "2.2.0", + "version": "3.0.5", "local": "/socket.io/socket.io.js", "remote": "https://cdnjs.cloudflare.com/ajax/libs/socket.io/{{ version }}/socket.io.js" }], diff --git a/package.json b/package.json index 87480ecf3a..dbfb6968f3 100644 --- a/package.json +++ b/package.json @@ -45,41 +45,57 @@ "build:start:dev": "madrun build:start:dev", "lint:all": "madrun lint:all", "lint": "madrun lint", - "lint:css": "madrun lint:css", "spell": "madrun spell", "fix:lint": "madrun fix:lint", - "lint:progress": "madrun lint:progress", + "lint:stream": "madrun lint:stream", + "test:base": "madrun test:base", "test": "madrun test", "test:client": "madrun test:client", "test:server": "madrun test:server", "wisdom": "madrun wisdom", "wisdom:type": "madrun wisdom:type", - "docker:pull:node": "madrun docker:pull:node", + "docker:pull": "madrun docker:pull", "docker:pull:alpine": "madrun docker:pull:alpine", + "docker:pull:arm32": "madrun docker:pull:arm32", + "docker:pull:arm64": "madrun docker:pull:arm64", "docker:push": "madrun docker:push", "docker:push:latest": "madrun docker:push:latest", "docker:push:alpine": "madrun docker:push:alpine", "docker:push:alpine:latest": "madrun docker:push:alpine:latest", + "docker:push:arm32": "madrun docker:push:arm32", + "docker:push:arm32:latest": "madrun docker:push:arm32:latest", + "docker:push:arm64": "madrun docker:push:arm64", + "docker:push:arm64:latest": "madrun docker:push:arm64:latest", "docker:build": "madrun docker:build", "docker:build:alpine": "madrun docker:build:alpine", + "docker:build:arm32": "madrun docker:build:arm32", + "docker:build:arm64": "madrun docker:build:arm64", + "docker:manifest:create": "madrun docker:manifest:create", + "docker:manifest:push": "madrun docker:manifest:push", "docker": "madrun docker", "docker-ci": "madrun docker-ci", "docker-login": "madrun docker-login", + "docker:x64": "madrun docker:x64", "docker:alpine": "madrun docker:alpine", + "docker:manifest": "madrun docker:manifest", "docker:tag": "madrun docker:tag", "docker:tag:alpine": "madrun docker:tag:alpine", + "docker:tag:arm32": "madrun docker:tag:arm32", + "docker:tag:arm64": "madrun docker:tag:arm64", "docker:rm:version": "madrun docker:rm:version", "docker:rm:latest": "madrun docker:rm:latest", "docker:rm:alpine": "madrun docker:rm:alpine", "docker:rm:latest-alpine": "madrun docker:rm:latest-alpine", + "docker:rm:arm32": "madrun docker:rm:arm32", + "docker:rm:latest-arm32": "madrun docker:rm:latest-arm32", + "docker:rm:arm64": "madrun docker:rm:arm64", + "docker:rm:latest-arm64": "madrun docker:rm:latest-arm64", "docker:rm-old": "madrun docker:rm-old", "coverage": "madrun coverage", "report": "madrun report", "6to5": "madrun 6to5", "6to5:client": "madrun 6to5:client", "6to5:client:dev": "madrun 6to5:client:dev", - "pre6to5:client": "madrun pre6to5:client", - "pre6to5:client:dev": "madrun pre6to5:client:dev", "watch:client": "madrun watch:client", "watch:client:dev": "madrun watch:client:dev", "watch:server": "madrun watch:server", @@ -91,8 +107,7 @@ "build": "madrun build", "build:client": "madrun build:client", "build:client:dev": "madrun build:client:dev", - "heroku-postbuild": "madrun heroku-postbuild", - "putout": "madrun putout" + "heroku-postbuild": "madrun heroku-postbuild" }, "directories": { "man": "man" @@ -147,8 +162,8 @@ "restbox": "^2.0.0", "shortdate": "^2.0.0", "simport": "^1.0.1", - "socket.io": "^3.0.1", - "socket.io-client": "^3.0.1", + "socket.io": "^3.0.5", + "socket.io-client": "^3.0.5", "squad": "^3.0.0", "table": "^6.0.1", "thread-it": "^1.1.0", diff --git a/server/distribute/import.spec.js b/server/distribute/import.spec.js index f891f411a7..2ec2fce055 100644 --- a/server/distribute/import.spec.js +++ b/server/distribute/import.spec.js @@ -147,7 +147,7 @@ test('distribute: import: received: no name', async (t) => { t.end(); }); -test.skip('distribute: import: error', async (t) => { +test('distribute: import: error', async (t) => { const configManager = createConfigManager(); const {done} = await connect({ configManager, @@ -171,7 +171,7 @@ test.skip('distribute: import: error', async (t) => { t.end(); }); -test.skip('distribute: import: config:change: no export', async (t) => { +test('distribute: import: config:change: no export', async (t) => { const configManager = createConfigManager(); const {done} = await connect({ configManager, @@ -237,7 +237,7 @@ test('distribute: import: env', async (t) => { const result = configManagerImport('editor'); const expected = 'deepword'; - t.equal(expected, result); + t.equal(result, expected); t.end(); }); @@ -281,6 +281,6 @@ test('distribute: import: no env', async (t) => { const result = configManagerImport('editor'); const expected = 'edward'; - t.equal(expected, result); + t.equal(result, expected); t.end(); }); diff --git a/test/server/console.js b/test/server/console.js index 95d6bc7ce0..d467918d85 100644 --- a/test/server/console.js +++ b/test/server/console.js @@ -30,7 +30,7 @@ test('cloudcmd: console: enabled', async (t) => { }); // need options to close socket faster -test.skip('cloudcmd: console: disabled', async (t) => { +test('cloudcmd: console: disabled', async (t) => { const config = { console: false, };