status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove .vscode launch tasks and fix package-lock conflict.

This commit is contained in:
emizzle 2018-06-15 09:43:22 +10:00 committed by Iuri Matias
parent a100dd4260
commit 79ca004de6
2 changed files with 0 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
.vscode/launch.json vendored
View File

@ -1,147 +0,0 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Embark: Mocha All",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"args": [
"--colors",
"--no-timeouts",
"${workspaceFolder}/test/"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
},
{
"type": "node",
"request": "launch",
"name": "Embark: Mocha Current File",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"args": [
"--colors",
"--no-timeouts",
"${file}"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
},
{
"type": "node",
"request": "launch",
"name": "Embark: embark test",
"autoAttachChildProcesses": true,
//"preLaunchTask": "npm_install",
"program": "${workspaceFolder}/lib/tests/test_embark",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
},
{
"type": "node",
"request": "launch",
"name": "Test app: Embark test",
"cwd": "${workspaceFolder}/test_apps/test_app/",
"autoAttachChildProcesses": true,
//"preLaunchTask": "npm_install",
"program": "${workspaceFolder}/bin/embark",
"args": [
"test"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
},
{
"type": "node",
"request": "launch",
"name": "Test app: Embark new testapp123",
"cwd": "${workspaceFolder}/test_apps/test_app/",
"autoAttachChildProcesses": true,
//"preLaunchTask": "npm_install",
"program": "${workspaceFolder}/bin/embark",
"args": [
"new",
"testapp123"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
},
{
"type": "node",
"request": "launch",
"name": "Test app: Embark upload",
"cwd": "${workspaceFolder}/test_apps/test_app/",
"autoAttachChildProcesses": true,
//"preLaunchTask": "npm_install",
"program": "${workspaceFolder}/bin/embark",
"args": [
"upload"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
},
{
"type": "node",
"request": "launch",
"name": "Test app: Embark run",
"cwd": "${workspaceFolder}/test_apps/test_app/",
"autoAttachChildProcesses": true,
//"preLaunchTask": "npm_install",
"program": "${workspaceFolder}/bin/embark",
"args": [
"run",
"--nodashboard"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
},
{
"type": "node",
"request": "launch",
"name": "Embark demo from main repo: Embark run",
"cwd": "${workspaceFolder}/../../embk-fw/embark/embark_demo/",
"autoAttachChildProcesses": true,
//"preLaunchTask": "npm_install",
"program": "${workspaceFolder}/bin/embark",
"args": [
"run"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
},
{
"type": "node",
"request": "launch",
"name": "Embark demo from dapp-bin: Embark run",
"cwd": "${workspaceFolder}/../../embk-fw/dapp-bin/embark_demo/",
"autoAttachChildProcesses": false,
//"preLaunchTask": "npm_install",
"program": "${workspaceFolder}/bin/embark",
"args": [
"run",
"--nodashboard"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
},
{
"type": "node",
"request": "launch",
"name": "Embark react routes demo: Embark run",
"cwd": "${workspaceFolder}/../../emizzle/embark-demo-react-routes/",
"autoAttachChildProcesses": true,
//"preLaunchTask": "npm_install",
"program": "${workspaceFolder}/bin/embark",
"args": [
"run"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
}
]
}

86
package-lock.json generated
View File

@ -40,22 +40,6 @@
"samsam": "1.3.0"
}
},
<<<<<<< develop
<<<<<<< develop
<<<<<<< develop
=======
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
=======
=======
<<<<<<< develop
>>>>>>> use neo-blessed
=======
<<<<<<< develop
>>>>>>> Finally fixed the solc loading issue.
>>>>>>> Finally fixed the solc loading issue.
=======
>>>>>>> package-lock conflict
"@types/debug": {
"version": "0.0.30",
"resolved": "https://registry.npmjs.org/@types/debug/-/debug-0.0.30.tgz",
@ -141,23 +125,6 @@
"resolved": "https://registry.npmjs.org/@types/url-join/-/url-join-0.8.2.tgz",
"integrity": "sha1-EYHsvh2XtwNODqHjXmLobMJrQi0="
},
<<<<<<< develop
<<<<<<< develop
<<<<<<< develop
=======
>>>>>>> Finally fixed the solc loading issue.
=======
>>>>>>> use neo-blessed
=======
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
>>>>>>> Finally fixed the solc loading issue.
>>>>>>> use neo-blessed
=======
=======
>>>>>>> Finally fixed the solc loading issue.
>>>>>>> Finally fixed the solc loading issue.
=======
>>>>>>> package-lock conflict
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@ -7216,9 +7183,6 @@
}
}
},
<<<<<<< develop
<<<<<<< develop
<<<<<<< develop
"live-plugin-manager-git-fix": {
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
@ -7238,27 +7202,6 @@
"requires": {
"@types/debug": "0.0.30",
"@types/fs-extra": "5.0.3",
=======
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
=======
=======
<<<<<<< develop
>>>>>>> Finally fixed the solc loading issue.
=======
>>>>>>> package-lock conflict
"live-plugin-manager-git-fix": {
"version": "0.12.1",
"resolved": "https://registry.npmjs.org/live-plugin-manager-git-fix/-/live-plugin-manager-git-fix-0.12.1.tgz",
"integrity": "sha512-1FvmI3xP246iNgwMcdqlAdPfGhugwiKQhQwg8YY8Uzbzra47lXVpgk3Fe/YDVBRpnnBTQ2YKdDlq4WM86G41SA==",
"requires": {
"@types/debug": "0.0.30",
<<<<<<< develop
"@types/fs-extra": "5.0.2",
>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
=======
"@types/fs-extra": "5.0.3",
>>>>>>> use neo-blessed
"@types/lockfile": "1.0.0",
"@types/node-fetch": "1.6.9",
"@types/semver": "5.5.0",
@ -7299,12 +7242,6 @@
"graceful-fs": "4.1.11"
}
},
<<<<<<< develop
<<<<<<< develop
<<<<<<< develop
=======
=======
>>>>>>> package-lock conflict
"minipass": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz",
@ -7319,12 +7256,6 @@
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
<<<<<<< develop
>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
=======
>>>>>>> use neo-blessed
=======
>>>>>>> package-lock conflict
"tar": {
"version": "4.4.4",
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz",
@ -7346,23 +7277,6 @@
}
}
},
<<<<<<< develop
<<<<<<< develop
<<<<<<< develop
=======
>>>>>>> Finally fixed the solc loading issue.
=======
>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
=======
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
>>>>>>> Finally fixed the solc loading issue.
>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
=======
=======
>>>>>>> Finally fixed the solc loading issue.
>>>>>>> Finally fixed the solc loading issue.
=======
>>>>>>> package-lock conflict
"load-json-file": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",