Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
52ee0f9a
Commit
52ee0f9a
authored
Sep 02, 2020
by
Ben Wheeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated package-lock
parent
8d1fd0a9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
47 additions
and
503 deletions
+47
-503
package-lock.json
package-lock.json
+47
-503
No files found.
package-lock.json
View file @
52ee0f9a
...
@@ -4,50 +4,37 @@
...
@@ -4,50 +4,37 @@
"lockfileVersion"
:
1
,
"lockfileVersion"
:
1
,
"requires"
:
true
,
"requires"
:
true
,
"dependencies"
:
{
"dependencies"
:
{
<<<<<<<
HEAD
"@babel/cli"
:
{
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/cli/-/cli-7.11.5.tgz"
,
"integrity"
:
"sha512-0umMDxxdEZ98EMZtS9Wgnaf4NdgqBcQHaGYaMfAmP+ZicVglZ2+QZwoHNacfnUq4hCmC1V7Ap5Phq7FInpWrWg=="
,
=======
"@babel/code-frame"
:
{
"@babel/code-frame"
:
{
"version"
:
"7.0.0"
,
"version"
:
"7.0.0"
,
"resolved"
:
"https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz"
,
"integrity"
:
"sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="
,
"integrity"
:
"sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="
,
>>>>>>>
Bring
in
video
motion
fix
"dev"
:
true
,
"dev"
:
true
,
"requires"
:
{
"requires"
:
{
"@babel/highlight"
:
"^7.0.0"
"@babel/highlight"
:
"^7.0.0"
}
}
},
},
"@babel/core"
:
{
"@babel/core"
:
{
"version"
:
"7.11.
4
"
,
"version"
:
"7.11.
5
"
,
"resolved"
:
"https://registry.npmjs.org/@babel/core/-/core-7.11.
4
.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/core/-/core-7.11.
5
.tgz"
,
"integrity"
:
"sha512-
5deljj5HlqRXN+5oJTY7Zs37iH3z3b++KjiKtIsJy1NrjOOVSEaJHEetLBhyu0aQOSNNZ/0IuEAan9GzRuDXHg
=="
,
"integrity"
:
"sha512-
fsEANVOcZHzrsV6dMVWqpSeXClq3lNbYrfFGme6DE25FQWe7pyeYpXyx9guqUnpy466JLzZ8z4uwSr2iv60V5Q
=="
,
"dev"
:
true
,
"dev"
:
true
,
"requires"
:
{
"requires"
:
{
"@babel/code-frame"
:
"^7.10.4"
,
"@babel/code-frame"
:
"^7.10.4"
,
"@babel/generator"
:
"^7.11.
4
"
,
"@babel/generator"
:
"^7.11.
5
"
,
"@babel/helper-module-transforms"
:
"^7.11.0"
,
"@babel/helper-module-transforms"
:
"^7.11.0"
,
"@babel/helpers"
:
"^7.10.4"
,
"@babel/helpers"
:
"^7.10.4"
,
"@babel/parser"
:
"^7.11.
4
"
,
"@babel/parser"
:
"^7.11.
5
"
,
"@babel/template"
:
"^7.10.4"
,
"@babel/template"
:
"^7.10.4"
,
"@babel/traverse"
:
"^7.11.
0
"
,
"@babel/traverse"
:
"^7.11.
5
"
,
"@babel/types"
:
"^7.11.
0
"
,
"@babel/types"
:
"^7.11.
5
"
,
"convert-source-map"
:
"^1.7.0"
,
"convert-source-map"
:
"^1.7.0"
,
"debug"
:
"^4.1.0"
,
"debug"
:
"^4.1.0"
,
"gensync"
:
"^1.0.0-beta.1"
,
"gensync"
:
"^1.0.0-beta.1"
,
"json5"
:
"^2.1.2"
,
"json5"
:
"^2.1.2"
,
"lodash"
:
"^4.17.19"
,
"lodash"
:
"^4.17.19"
,
<<<<<<<
HEAD
"make-dir"
:
"^2.1.0"
,
"slash"
:
"^2.0.0"
,
"source-map"
:
"^0.6.1"
=======
"resolve"
:
"^1.3.2"
,
"resolve"
:
"^1.3.2"
,
"semver"
:
"^5.4.1"
,
"semver"
:
"^5.4.1"
,
"source-map"
:
"^0.5.0"
"source-map"
:
"^0.6.1"
>>>>>>>
Bring
in
video
motion
fix
},
},
"dependencies"
:
{
"dependencies"
:
{
"@babel/code-frame"
:
{
"@babel/code-frame"
:
{
...
@@ -60,14 +47,14 @@
...
@@ -60,14 +47,14 @@
}
}
},
},
"@babel/generator"
:
{
"@babel/generator"
:
{
"version"
:
"7.11.
4
"
,
"version"
:
"7.11.
5
"
,
"resolved"
:
"https://registry.npmjs.org/@babel/generator/-/generator-7.11.
4
.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/generator/-/generator-7.11.
5
.tgz"
,
"integrity"
:
"sha512-
Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1
g=="
,
"integrity"
:
"sha512-
9UqHWJ4IwRTy4l0o8gq2ef8ws8UPzvtMkVKjTLAiRmza9p9V6Z+OfuNd9fB1j5Q67F+dVJtPC2sZXI8NM9br4
g=="
,
"dev"
:
true
,
"dev"
:
true
,
"requires"
:
{
"requires"
:
{
"@babel/types"
:
"^7.11.
0
"
,
"@babel/types"
:
"^7.11.
5
"
,
"jsesc"
:
"^2.5.1"
,
"jsesc"
:
"^2.5.1"
,
"source-map"
:
"^0.
5.0
"
"source-map"
:
"^0.
6.1
"
}
}
},
},
"@babel/helper-function-name"
:
{
"@babel/helper-function-name"
:
{
...
@@ -111,9 +98,9 @@
...
@@ -111,9 +98,9 @@
}
}
},
},
"@babel/parser"
:
{
"@babel/parser"
:
{
"version"
:
"7.11.
4
"
,
"version"
:
"7.11.
5
"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.
4
.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.
5
.tgz"
,
"integrity"
:
"sha512-
MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA
=="
,
"integrity"
:
"sha512-
X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q
=="
,
"dev"
:
true
"dev"
:
true
},
},
"@babel/template"
:
{
"@babel/template"
:
{
...
@@ -128,26 +115,26 @@
...
@@ -128,26 +115,26 @@
}
}
},
},
"@babel/traverse"
:
{
"@babel/traverse"
:
{
"version"
:
"7.11.
0
"
,
"version"
:
"7.11.
5
"
,
"resolved"
:
"https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.
0
.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.
5
.tgz"
,
"integrity"
:
"sha512-
ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg
=="
,
"integrity"
:
"sha512-
EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ
=="
,
"dev"
:
true
,
"dev"
:
true
,
"requires"
:
{
"requires"
:
{
"@babel/code-frame"
:
"^7.10.4"
,
"@babel/code-frame"
:
"^7.10.4"
,
"@babel/generator"
:
"^7.11.
0
"
,
"@babel/generator"
:
"^7.11.
5
"
,
"@babel/helper-function-name"
:
"^7.10.4"
,
"@babel/helper-function-name"
:
"^7.10.4"
,
"@babel/helper-split-export-declaration"
:
"^7.11.0"
,
"@babel/helper-split-export-declaration"
:
"^7.11.0"
,
"@babel/parser"
:
"^7.11.
0
"
,
"@babel/parser"
:
"^7.11.
5
"
,
"@babel/types"
:
"^7.11.
0
"
,
"@babel/types"
:
"^7.11.
5
"
,
"debug"
:
"^4.1.0"
,
"debug"
:
"^4.1.0"
,
"globals"
:
"^11.1.0"
,
"globals"
:
"^11.1.0"
,
"lodash"
:
"^4.17.19"
"lodash"
:
"^4.17.19"
}
}
},
},
"@babel/types"
:
{
"@babel/types"
:
{
"version"
:
"7.11.
0
"
,
"version"
:
"7.11.
5
"
,
"resolved"
:
"https://registry.npmjs.org/@babel/types/-/types-7.11.
0
.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/types/-/types-7.11.
5
.tgz"
,
"integrity"
:
"sha512-
O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA
=="
,
"integrity"
:
"sha512-
bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q
=="
,
"dev"
:
true
,
"dev"
:
true
,
"requires"
:
{
"requires"
:
{
"@babel/helper-validator-identifier"
:
"^7.10.4"
,
"@babel/helper-validator-identifier"
:
"^7.10.4"
,
...
@@ -239,9 +226,9 @@
...
@@ -239,9 +226,9 @@
"dev"
:
true
"dev"
:
true
},
},
"source-map"
:
{
"source-map"
:
{
"version"
:
"0.
5.7
"
,
"version"
:
"0.
6.1
"
,
"resolved"
:
"https://registry.npmjs.org/source-map/-/source-map-0.
5.7
.tgz"
,
"resolved"
:
"https://registry.npmjs.org/source-map/-/source-map-0.
6.1
.tgz"
,
"integrity"
:
"sha
1-igOdLRAh0i0eoUyA2OpGi6LvP8w
="
,
"integrity"
:
"sha
512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=
="
,
"dev"
:
true
"dev"
:
true
},
},
"supports-color"
:
{
"supports-color"
:
{
...
@@ -318,9 +305,9 @@
...
@@ -318,9 +305,9 @@
},
},
"dependencies"
:
{
"dependencies"
:
{
"@babel/types"
:
{
"@babel/types"
:
{
"version"
:
"7.11.
0
"
,
"version"
:
"7.11.
5
"
,
"resolved"
:
"https://registry.npmjs.org/@babel/types/-/types-7.11.
0
.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/types/-/types-7.11.
5
.tgz"
,
"integrity"
:
"sha512-
O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA
=="
,
"integrity"
:
"sha512-
bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q
=="
,
"dev"
:
true
,
"dev"
:
true
,
"requires"
:
{
"requires"
:
{
"@babel/helper-validator-identifier"
:
"^7.10.4"
,
"@babel/helper-validator-identifier"
:
"^7.10.4"
,
...
@@ -352,9 +339,9 @@
...
@@ -352,9 +339,9 @@
},
},
"dependencies"
:
{
"dependencies"
:
{
"@babel/types"
:
{
"@babel/types"
:
{
"version"
:
"7.11.
0
"
,
"version"
:
"7.11.
5
"
,
"resolved"
:
"https://registry.npmjs.org/@babel/types/-/types-7.11.
0
.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/types/-/types-7.11.
5
.tgz"
,
"integrity"
:
"sha512-
O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA
=="
,
"integrity"
:
"sha512-
bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q
=="
,
"dev"
:
true
,
"dev"
:
true
,
"requires"
:
{
"requires"
:
{
"@babel/helper-validator-identifier"
:
"^7.10.4"
,
"@babel/helper-validator-identifier"
:
"^7.10.4"
,
...
@@ -368,54 +355,14 @@
...
@@ -368,54 +355,14 @@
"integrity"
:
"sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
,
"integrity"
:
"sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
,
"dev"
:
true
"dev"
:
true
},
},
<<<<<<<
HEAD
"source-map"
:
{
"version"
:
"0.6.1"
,
"resolved"
:
"https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
,
"integrity"
:
"sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
,
=======
"to-fast-properties"
:
{
"to-fast-properties"
:
{
"version"
:
"2.0.0"
,
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
,
"integrity"
:
"sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
,
"integrity"
:
"sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
,
>>>>>>>
Bring
in
video
motion
fix
"dev"
:
true
"dev"
:
true
}
}
}
}
},
},
<<<<<<<
HEAD
"@babel/code-frame"
:
{
"version"
:
"7.0.0"
,
"resolved"
:
"https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz"
,
"integrity"
:
"sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/highlight"
:
"^7.0.0"
}
},
"@babel/core"
:
{
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/core/-/core-7.11.5.tgz"
,
"integrity"
:
"sha512-fsEANVOcZHzrsV6dMVWqpSeXClq3lNbYrfFGme6DE25FQWe7pyeYpXyx9guqUnpy466JLzZ8z4uwSr2iv60V5Q=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/code-frame"
:
"^7.10.4"
,
"@babel/generator"
:
"^7.11.5"
,
"@babel/helper-module-transforms"
:
"^7.11.0"
,
"@babel/helpers"
:
"^7.10.4"
,
"@babel/parser"
:
"^7.11.5"
,
"@babel/template"
:
"^7.10.4"
,
"@babel/traverse"
:
"^7.11.5"
,
"@babel/types"
:
"^7.11.5"
,
"convert-source-map"
:
"^1.7.0"
,
"debug"
:
"^4.1.0"
,
"gensync"
:
"^1.0.0-beta.1"
,
"json5"
:
"^2.1.2"
,
"lodash"
:
"^4.17.19"
,
"resolve"
:
"^1.3.2"
,
"semver"
:
"^5.4.1"
,
"source-map"
:
"^0.6.1"
=======
"@babel/helper-module-transforms"
:
{
"@babel/helper-module-transforms"
:
{
"version"
:
"7.11.0"
,
"version"
:
"7.11.0"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"
,
...
@@ -429,7 +376,6 @@
...
@@ -429,7 +376,6 @@
"@babel/template"
:
"^7.10.4"
,
"@babel/template"
:
"^7.10.4"
,
"@babel/types"
:
"^7.11.0"
,
"@babel/types"
:
"^7.11.0"
,
"lodash"
:
"^4.17.19"
"lodash"
:
"^4.17.19"
>>>>>>>
Bring
in
video
motion
fix
},
},
"dependencies"
:
{
"dependencies"
:
{
"@babel/code-frame"
:
{
"@babel/code-frame"
:
{
...
@@ -441,40 +387,6 @@
...
@@ -441,40 +387,6 @@
"@babel/highlight"
:
"^7.10.4"
"@babel/highlight"
:
"^7.10.4"
}
}
},
},
<<<<<<<
HEAD
"@babel/generator"
:
{
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/generator/-/generator-7.11.5.tgz"
,
"integrity"
:
"sha512-9UqHWJ4IwRTy4l0o8gq2ef8ws8UPzvtMkVKjTLAiRmza9p9V6Z+OfuNd9fB1j5Q67F+dVJtPC2sZXI8NM9br4g=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/types"
:
"^7.11.5"
,
"jsesc"
:
"^2.5.1"
,
"source-map"
:
"^0.6.1"
}
},
"@babel/helper-function-name"
:
{
"version"
:
"7.10.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"
,
"integrity"
:
"sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/helper-get-function-arity"
:
"^7.10.4"
,
"@babel/template"
:
"^7.10.4"
,
"@babel/types"
:
"^7.10.4"
}
},
"@babel/helper-get-function-arity"
:
{
"version"
:
"7.10.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"
,
"integrity"
:
"sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/types"
:
"^7.10.4"
}
},
=======
>>>>>>>
Bring
in
video
motion
fix
"@babel/helper-split-export-declaration"
:
{
"@babel/helper-split-export-declaration"
:
{
"version"
:
"7.11.0"
,
"version"
:
"7.11.0"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"
,
...
@@ -496,15 +408,9 @@
...
@@ -496,15 +408,9 @@
}
}
},
},
"@babel/parser"
:
{
"@babel/parser"
:
{
<<<<<<<
HEAD
"version"
:
"7.11.5"
,
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"
,
"integrity"
:
"sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
,
"integrity"
:
"sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
,
=======
"version"
:
"7.11.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz"
,
"integrity"
:
"sha512-MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA=="
,
>>>>>>>
Bring
in
video
motion
fix
"dev"
:
true
"dev"
:
true
},
},
"@babel/template"
:
{
"@babel/template"
:
{
...
@@ -518,26 +424,6 @@
...
@@ -518,26 +424,6 @@
"@babel/types"
:
"^7.10.4"
"@babel/types"
:
"^7.10.4"
}
}
},
},
<<<<<<<
HEAD
"@babel/traverse"
:
{
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz"
,
"integrity"
:
"sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/code-frame"
:
"^7.10.4"
,
"@babel/generator"
:
"^7.11.5"
,
"@babel/helper-function-name"
:
"^7.10.4"
,
"@babel/helper-split-export-declaration"
:
"^7.11.0"
,
"@babel/parser"
:
"^7.11.5"
,
"@babel/types"
:
"^7.11.5"
,
"debug"
:
"^4.1.0"
,
"globals"
:
"^11.1.0"
,
"lodash"
:
"^4.17.19"
}
},
=======
>>>>>>>
Bring
in
video
motion
fix
"@babel/types"
:
{
"@babel/types"
:
{
"version"
:
"7.11.5"
,
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"
,
...
@@ -581,27 +467,6 @@
...
@@ -581,27 +467,6 @@
"integrity"
:
"sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
,
"integrity"
:
"sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
,
"dev"
:
true
"dev"
:
true
},
},
<<<<<<<
HEAD
"minimist"
:
{
"version"
:
"1.2.5"
,
"resolved"
:
"https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"
,
"integrity"
:
"sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
,
"dev"
:
true
},
"ms"
:
{
"version"
:
"2.1.2"
,
"resolved"
:
"https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
,
"integrity"
:
"sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
,
"dev"
:
true
},
"source-map"
:
{
"version"
:
"0.6.1"
,
"resolved"
:
"https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
,
"integrity"
:
"sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
,
"dev"
:
true
},
=======
>>>>>>>
Bring
in
video
motion
fix
"supports-color"
:
{
"supports-color"
:
{
"version"
:
"5.5.0"
,
"version"
:
"5.5.0"
,
"resolved"
:
"https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
,
...
@@ -659,259 +524,6 @@
...
@@ -659,259 +524,6 @@
"integrity"
:
"sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
,
"integrity"
:
"sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
,
"dev"
:
true
"dev"
:
true
},
},
"@babel/helper-replace-supers"
:
{
"version"
:
"7.10.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"
,
"integrity"
:
"sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/helper-member-expression-to-functions"
:
"^7.10.4"
,
"@babel/helper-optimise-call-expression"
:
"^7.10.4"
,
"@babel/traverse"
:
"^7.10.4"
,
"@babel/types"
:
"^7.10.4"
},
"dependencies"
:
{
<<<<<<<
HEAD
"@babel/types"
:
{
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"
,
"integrity"
:
"sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="
,
=======
"@babel/code-frame"
:
{
"version"
:
"7.10.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz"
,
"integrity"
:
"sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="
,
>>>>>>>
Bring
in
video
motion
fix
"dev"
:
true
,
"requires"
:
{
"@babel/highlight"
:
"^7.10.4"
}
},
"@babel/generator"
:
{
"version"
:
"7.11.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz"
,
"integrity"
:
"sha512-Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/types"
:
"^7.11.0"
,
"jsesc"
:
"^2.5.1"
,
"source-map"
:
"^0.5.0"
}
},
"@babel/helper-function-name"
:
{
"version"
:
"7.10.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"
,
"integrity"
:
"sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/helper-get-function-arity"
:
"^7.10.4"
,
"@babel/template"
:
"^7.10.4"
,
"@babel/types"
:
"^7.10.4"
}
},
"@babel/helper-get-function-arity"
:
{
"version"
:
"7.10.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"
,
"integrity"
:
"sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/types"
:
"^7.10.4"
}
},
"@babel/helper-split-export-declaration"
:
{
"version"
:
"7.11.0"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"
,
"integrity"
:
"sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/types"
:
"^7.11.0"
}
},
"@babel/highlight"
:
{
"version"
:
"7.10.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"
,
"integrity"
:
"sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/helper-validator-identifier"
:
"^7.10.4"
,
"chalk"
:
"^2.0.0"
,
"js-tokens"
:
"^4.0.0"
}
},
"@babel/parser"
:
{
<<<<<<<
HEAD
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"
,
"integrity"
:
"sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
,
=======
"version"
:
"7.11.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz"
,
"integrity"
:
"sha512-MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA=="
,
>>>>>>>
Bring
in
video
motion
fix
"dev"
:
true
},
"@babel/template"
:
{
"version"
:
"7.10.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz"
,
"integrity"
:
"sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/code-frame"
:
"^7.10.4"
,
"@babel/parser"
:
"^7.10.4"
,
"@babel/types"
:
"^7.10.4"
}
},
"@babel/traverse"
:
{
"version"
:
"7.11.0"
,
"resolved"
:
"https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz"
,
"integrity"
:
"sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/code-frame"
:
"^7.10.4"
,
"@babel/generator"
:
"^7.11.0"
,
"@babel/helper-function-name"
:
"^7.10.4"
,
"@babel/helper-split-export-declaration"
:
"^7.11.0"
,
"@babel/parser"
:
"^7.11.0"
,
"@babel/types"
:
"^7.11.0"
,
"debug"
:
"^4.1.0"
,
"globals"
:
"^11.1.0"
,
"lodash"
:
"^4.17.19"
}
},
"@babel/types"
:
{
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"
,
"integrity"
:
"sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/helper-validator-identifier"
:
"^7.10.4"
,
"lodash"
:
"^4.17.19"
,
"to-fast-properties"
:
"^2.0.0"
}
},
"ansi-styles"
:
{
"version"
:
"3.2.1"
,
"resolved"
:
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
,
"integrity"
:
"sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
,
"dev"
:
true
,
"requires"
:
{
"color-convert"
:
"^1.9.0"
}
},
"chalk"
:
{
"version"
:
"2.4.2"
,
"resolved"
:
"https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
,
"integrity"
:
"sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="
,
"dev"
:
true
,
"requires"
:
{
"ansi-styles"
:
"^3.2.1"
,
"escape-string-regexp"
:
"^1.0.5"
,
"supports-color"
:
"^5.3.0"
}
},
"debug"
:
{
"version"
:
"4.1.1"
,
"resolved"
:
"https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"
,
"integrity"
:
"sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="
,
"dev"
:
true
,
"requires"
:
{
"ms"
:
"^2.1.1"
}
},
"globals"
:
{
"version"
:
"11.12.0"
,
"resolved"
:
"https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
,
"integrity"
:
"sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
,
"dev"
:
true
},
"has-flag"
:
{
"version"
:
"3.0.0"
,
"resolved"
:
"https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
,
"integrity"
:
"sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
,
"dev"
:
true
},
"jsesc"
:
{
"version"
:
"2.5.2"
,
"resolved"
:
"https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
,
"integrity"
:
"sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
,
"dev"
:
true
},
"lodash"
:
{
"version"
:
"4.17.20"
,
"resolved"
:
"https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"
,
"integrity"
:
"sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
,
"dev"
:
true
},
"ms"
:
{
"version"
:
"2.1.2"
,
"resolved"
:
"https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
,
"integrity"
:
"sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
,
"dev"
:
true
},
"source-map"
:
{
"version"
:
"0.5.7"
,
"resolved"
:
"https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
,
"integrity"
:
"sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
,
"dev"
:
true
},
"supports-color"
:
{
"version"
:
"5.5.0"
,
"resolved"
:
"https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
,
"integrity"
:
"sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="
,
"dev"
:
true
,
"requires"
:
{
"has-flag"
:
"^3.0.0"
}
},
"to-fast-properties"
:
{
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
,
"integrity"
:
"sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
,
"dev"
:
true
}
}
},
"@babel/helper-simple-access"
:
{
"version"
:
"7.10.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"
,
"integrity"
:
"sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="
,
"dev"
:
true
,
"requires"
:
{
<<<<<<<
HEAD
"@babel/types"
:
"^7.10.4"
},
"dependencies"
:
{
"@babel/types"
:
{
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"
,
"integrity"
:
"sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/helper-validator-identifier"
:
"^7.10.4"
,
"lodash"
:
"^4.17.19"
,
"to-fast-properties"
:
"^2.0.0"
}
},
"lodash"
:
{
"version"
:
"4.17.20"
,
"resolved"
:
"https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"
,
"integrity"
:
"sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
,
"dev"
:
true
},
"to-fast-properties"
:
{
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
,
"integrity"
:
"sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
,
"dev"
:
true
}
}
},
"@babel/helper-plugin-utils"
:
{
"version"
:
"7.10.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"
,
"integrity"
:
"sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
,
"dev"
:
true
},
"@babel/helper-replace-supers"
:
{
"@babel/helper-replace-supers"
:
{
"version"
:
"7.10.4"
,
"version"
:
"7.10.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"
,
...
@@ -1117,8 +729,6 @@
...
@@ -1117,8 +729,6 @@
"integrity"
:
"sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="
,
"integrity"
:
"sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="
,
"dev"
:
true
,
"dev"
:
true
,
"requires"
:
{
"requires"
:
{
=======
>>>>>>>
Bring
in
video
motion
fix
"@babel/template"
:
"^7.10.4"
,
"@babel/template"
:
"^7.10.4"
,
"@babel/types"
:
"^7.10.4"
"@babel/types"
:
"^7.10.4"
},
},
...
@@ -1144,15 +754,9 @@
...
@@ -1144,15 +754,9 @@
}
}
},
},
"@babel/parser"
:
{
"@babel/parser"
:
{
<<<<<<<
HEAD
"version"
:
"7.11.5"
,
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"
,
"integrity"
:
"sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
,
"integrity"
:
"sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
,
=======
"version"
:
"7.11.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz"
,
"integrity"
:
"sha512-MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA=="
,
>>>>>>>
Bring
in
video
motion
fix
"dev"
:
true
"dev"
:
true
},
},
"@babel/template"
:
{
"@babel/template"
:
{
...
@@ -1262,15 +866,9 @@
...
@@ -1262,15 +866,9 @@
}
}
},
},
"@babel/generator"
:
{
"@babel/generator"
:
{
<<<<<<<
HEAD
"version"
:
"7.11.5"
,
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/generator/-/generator-7.11.5.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/generator/-/generator-7.11.5.tgz"
,
"integrity"
:
"sha512-9UqHWJ4IwRTy4l0o8gq2ef8ws8UPzvtMkVKjTLAiRmza9p9V6Z+OfuNd9fB1j5Q67F+dVJtPC2sZXI8NM9br4g=="
,
"integrity"
:
"sha512-9UqHWJ4IwRTy4l0o8gq2ef8ws8UPzvtMkVKjTLAiRmza9p9V6Z+OfuNd9fB1j5Q67F+dVJtPC2sZXI8NM9br4g=="
,
=======
"version"
:
"7.11.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz"
,
"integrity"
:
"sha512-Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g=="
,
>>>>>>>
Bring
in
video
motion
fix
"dev"
:
true
,
"dev"
:
true
,
"requires"
:
{
"requires"
:
{
"@babel/types"
:
"^7.11.5"
,
"@babel/types"
:
"^7.11.5"
,
...
@@ -1319,15 +917,9 @@
...
@@ -1319,15 +917,9 @@
}
}
},
},
"@babel/parser"
:
{
"@babel/parser"
:
{
<<<<<<<
HEAD
"version"
:
"7.11.5"
,
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"
,
"integrity"
:
"sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
,
"integrity"
:
"sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
,
=======
"version"
:
"7.11.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz"
,
"integrity"
:
"sha512-MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA=="
,
>>>>>>>
Bring
in
video
motion
fix
"dev"
:
true
"dev"
:
true
},
},
"@babel/template"
:
{
"@babel/template"
:
{
...
@@ -16072,15 +15664,15 @@
...
@@ -16072,15 +15664,15 @@
}
}
},
},
"scratch-gui"
:
{
"scratch-gui"
:
{
"version"
:
"0.1.0-prerelease.20200
831120820
"
,
"version"
:
"0.1.0-prerelease.20200
902141518
"
,
"resolved"
:
"https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200
831120820
.tgz"
,
"resolved"
:
"https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200
902141518
.tgz"
,
"integrity"
:
"sha512-
nCr+U+9uXvn9C6nMMozentYGV2CpJsnswchjUV+YP7Z3IkSLwNmOIfKtxZUn7QUvjZfoX7RCEulUMdtoQ7miFw
=="
,
"integrity"
:
"sha512-
Qp2G0Vl37Eo/i3bJiXDbOi+K8jvPCV3QsKtV0Kol4ttHcbptJZMUP5EEpI6qkyKwSNYWGY7Dda/f3T9hF1jw/A
=="
,
"dev"
:
true
"dev"
:
true
},
},
"scratch-l10n"
:
{
"scratch-l10n"
:
{
"version"
:
"3.10.20200
826030836
"
,
"version"
:
"3.10.20200
902030719
"
,
"resolved"
:
"https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20200
826030836
.tgz"
,
"resolved"
:
"https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20200
902030719
.tgz"
,
"integrity"
:
"sha512-
+TOqY3Jcby/9/63lqP64YCw0+KkvBI3VIyhpTlBm9+8o5GYoUxUvG4rEJAXMQ8KJLOa4M+ru7MChK1xVJ6N16Q
=="
,
"integrity"
:
"sha512-
utg/FPVrj7adW8JrOvuWv2Zu1cikJUUEnaU0XvB/a/gvNXEwxLkpGlC+0tVIh33qStpIGT3HClKRdIamowRmOw
=="
,
"dev"
:
true
,
"dev"
:
true
,
"requires"
:
{
"requires"
:
{
"@babel/cli"
:
"^7.1.2"
,
"@babel/cli"
:
"^7.1.2"
,
...
@@ -16090,9 +15682,9 @@
...
@@ -16090,9 +15682,9 @@
},
},
"dependencies"
:
{
"dependencies"
:
{
"@babel/cli"
:
{
"@babel/cli"
:
{
"version"
:
"7.1
0
.5"
,
"version"
:
"7.1
1
.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/cli/-/cli-7.1
0
.5.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@babel/cli/-/cli-7.1
1
.5.tgz"
,
"integrity"
:
"sha512-
j9H9qSf3kLdM0Ao3aGPbGZ73mEA9XazuupcS6cDGWuiyAcANoguhP0r2Lx32H5JGw4sSSoHG3x/mxVnHgvOoyA
=="
,
"integrity"
:
"sha512-
0umMDxxdEZ98EMZtS9Wgnaf4NdgqBcQHaGYaMfAmP+ZicVglZ2+QZwoHNacfnUq4hCmC1V7Ap5Phq7FInpWrWg
=="
,
"dev"
:
true
,
"dev"
:
true
,
"requires"
:
{
"requires"
:
{
"chokidar"
:
"^2.1.8"
,
"chokidar"
:
"^2.1.8"
,
...
@@ -16103,7 +15695,7 @@
...
@@ -16103,7 +15695,7 @@
"lodash"
:
"^4.17.19"
,
"lodash"
:
"^4.17.19"
,
"make-dir"
:
"^2.1.0"
,
"make-dir"
:
"^2.1.0"
,
"slash"
:
"^2.0.0"
,
"slash"
:
"^2.0.0"
,
"source-map"
:
"^0.
5.0
"
"source-map"
:
"^0.
6.1
"
}
}
},
},
"anymatch"
:
{
"anymatch"
:
{
...
@@ -16557,61 +16149,13 @@
...
@@ -16557,61 +16149,13 @@
"dev"
:
true
"dev"
:
true
},
},
"source-map"
:
{
"source-map"
:
{
"version"
:
"0.
5.7
"
,
"version"
:
"0.
6.1
"
,
"resolved"
:
"https://registry.npmjs.org/source-map/-/source-map-0.
5.7
.tgz"
,
"resolved"
:
"https://registry.npmjs.org/source-map/-/source-map-0.
6.1
.tgz"
,
"integrity"
:
"sha
1-igOdLRAh0i0eoUyA2OpGi6LvP8w
="
,
"integrity"
:
"sha
512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=
="
,
"dev"
:
true
"dev"
:
true
}
}
}
}
},
},
<<<<<<<
HEAD
"sax"
:
{
"version"
:
"1.2.4"
,
"resolved"
:
"https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"
,
"integrity"
:
"sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
,
"dev"
:
true
},
"scheduler"
:
{
"version"
:
"0.13.6"
,
"resolved"
:
"https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz"
,
"integrity"
:
"sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ=="
,
"dev"
:
true
,
"requires"
:
{
"loose-envify"
:
"^1.1.0"
,
"object-assign"
:
"^4.1.1"
}
},
"schema-utils"
:
{
"version"
:
"1.0.0"
,
"resolved"
:
"https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz"
,
"integrity"
:
"sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="
,
"dev"
:
true
,
"requires"
:
{
"ajv"
:
"^6.1.0"
,
"ajv-errors"
:
"^1.0.0"
,
"ajv-keywords"
:
"^3.1.0"
}
},
"scratch-gui"
:
{
"version"
:
"0.1.0-prerelease.20200902141518"
,
"resolved"
:
"https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200902141518.tgz"
,
"integrity"
:
"sha512-Qp2G0Vl37Eo/i3bJiXDbOi+K8jvPCV3QsKtV0Kol4ttHcbptJZMUP5EEpI6qkyKwSNYWGY7Dda/f3T9hF1jw/A=="
,
"dev"
:
true
},
"scratch-l10n"
:
{
"version"
:
"3.10.20200902030719"
,
"resolved"
:
"https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20200902030719.tgz"
,
"integrity"
:
"sha512-utg/FPVrj7adW8JrOvuWv2Zu1cikJUUEnaU0XvB/a/gvNXEwxLkpGlC+0tVIh33qStpIGT3HClKRdIamowRmOw=="
,
"dev"
:
true
,
"requires"
:
{
"@babel/cli"
:
"^7.1.2"
,
"@babel/core"
:
"^7.1.2"
,
"babel-plugin-react-intl"
:
"^3.0.1"
,
"transifex"
:
"1.6.6"
}
},
=======
>>>>>>>
Bring
in
video
motion
fix
"scratch-parser"
:
{
"scratch-parser"
:
{
"version"
:
"5.0.0"
,
"version"
:
"5.0.0"
,
"resolved"
:
"https://registry.npmjs.org/scratch-parser/-/scratch-parser-5.0.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/scratch-parser/-/scratch-parser-5.0.0.tgz"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment