merg upstream

This commit is contained in:
Kevin Jahns 2020-03-20 20:17:42 +01:00
commit c5662675d7
3 changed files with 18 additions and 20 deletions

32
package-lock.json generated
View file

@ -1,6 +1,6 @@
{ {
"name": "y-webrtc", "name": "y-webrtc",
"version": "10.1.1", "version": "10.1.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -111,9 +111,9 @@
} }
}, },
"acorn": { "acorn": {
"version": "6.1.1", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
"integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
"dev": true "dev": true
}, },
"acorn-jsx": { "acorn-jsx": {
@ -874,6 +874,14 @@
"acorn": "^6.0.2", "acorn": "^6.0.2",
"acorn-jsx": "^5.0.0", "acorn-jsx": "^5.0.0",
"eslint-visitor-keys": "^1.0.0" "eslint-visitor-keys": "^1.0.0"
},
"dependencies": {
"acorn": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
"integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
"dev": true
}
} }
}, },
"esprima": { "esprima": {
@ -1366,11 +1374,11 @@
} }
}, },
"lib0": { "lib0": {
"version": "0.2.12", "version": "0.2.15",
"resolved": "https://registry.npmjs.org/lib0/-/lib0-0.2.12.tgz", "resolved": "https://registry.npmjs.org/lib0/-/lib0-0.2.15.tgz",
"integrity": "sha512-ileLyIMsWqcpyFLP6WMIgD6C7rkwrdYjH6CCFvAnqOhnGcyAl8LmLkiryVNmKW0sLRw/gLcB47LGXJDw0tDlkg==", "integrity": "sha512-wLwuTNNgtC7EQH0b3w4iqpts69TRFVur74Wta7jwgS2w+r/vPLuGcsBA16VoPgBYME7oxDSjEesJw9p/gHmFEg==",
"requires": { "requires": {
"isomorphic.js": "^0.1.1" "isomorphic.js": "^0.1.3"
} }
}, },
"load-json-file": { "load-json-file": {
@ -1887,14 +1895,6 @@
"@types/estree": "*", "@types/estree": "*",
"@types/node": "*", "@types/node": "*",
"acorn": "^7.1.0" "acorn": "^7.1.0"
},
"dependencies": {
"acorn": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
"integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
"dev": true
}
} }
}, },
"rollup-cli": { "rollup-cli": {

View file

@ -1,6 +1,6 @@
{ {
"name": "y-webrtc", "name": "y-webrtc",
"version": "10.1.1", "version": "10.1.2",
"description": "WebRTC provider for Yjs", "description": "WebRTC provider for Yjs",
"main": "./dist/y-webrtc.cjs", "main": "./dist/y-webrtc.cjs",
"module": "./src/y-webrtc.js", "module": "./src/y-webrtc.js",
@ -65,6 +65,6 @@
"ws": "^7.2.0" "ws": "^7.2.0"
}, },
"engines": { "engines": {
"node": "10.x" "node": ">=10"
} }
} }

View file

@ -38,8 +38,6 @@
"moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
"baseUrl": "./", /* Base directory to resolve non-absolute module names. */ "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
"paths": { "paths": {
"yjs": ["../yjs/src/index.js"],
"lib0/*": ["../lib0/*"],
"y-protocols/*": ["../y-protocols/*"] "y-protocols/*": ["../y-protocols/*"]
}, },
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */