From b1270bc0eb7379d575fc7db32e4df8c13be6a032 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 4 Jan 2020 07:16:05 +0100 Subject: [PATCH 1/3] fixed launch scripts --- .vscode/launch.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 554bf57c..c810af37 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,17 +5,15 @@ "version": "0.2.0", "configurations": [ { - "name": "bookshop", "request": "launch", - "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n", "--" ], - "args": [ "cds", "run", "--in-memory" ], + "name": "bookshop", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ], + "args": [ "--", "cds", "run", "--in-memory" ], "cwd": "${workspaceFolder}/packages/bookshop", "console": "integratedTerminal", "skipFiles": ["/**"] }, { - "name": "cds run ...", "request": "launch", - "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n", "--" ], - "args": [ "cds", "run", "--with-mocks", "--in-memory?" ], + "name": "cds run ...", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ], + "args": [ "--", "cds", "run", "--with-mocks", "--in-memory?" ], "cwd": "${workspaceFolder}/packages/${input:service}", "console": "integratedTerminal", "skipFiles": ["/**"] From a0847e603f9c6b1f4d93c006b5c0d74df01c1ee3 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 4 Jan 2020 07:24:11 +0100 Subject: [PATCH 2/3] settings.json restored --- .vscode/settings.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 10800472..72bc8cb5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,6 @@ { "files.exclude": { - "**/.gitignore": false, - "**/.git": false, - "**/.vscode": false + "**/.gitignore": true, + "**/.vscode": true } } From 6a9a1bc4d67ac5e47503fba2101c0488b3cd8ca2 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 4 Jan 2020 07:27:19 +0100 Subject: [PATCH 3/3] cleaned up dot files --- .eslintrc | 2 +- .npmrc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 .npmrc diff --git a/.eslintrc b/.eslintrc index 79cf25fe..7e6f79e2 100644 --- a/.eslintrc +++ b/.eslintrc @@ -6,7 +6,7 @@ "jest": true }, "parserOptions": { - "ecmaVersion": 2017 + "ecmaVersion": 2018 }, "globals": { "SELECT": true, diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 43c97e71..00000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -package-lock=false