From faf4e789135ad4852145f2c8118b0706a208f3e8 Mon Sep 17 00:00:00 2001 From: Anton Kosiakov Date: Thu, 19 Oct 2017 14:05:01 +0200 Subject: [PATCH] Share configs between runtime and dev packages Signed-off-by: Anton Kosiakov --- .vscode/launch.json | 2 +- .vscode/settings.json | 2 +- {packages => configs}/all.tslint.json | 0 {packages => configs}/base.tsconfig.json | 0 {packages => configs}/mocha.opts | 0 {packages => configs}/nyc.json | 0 {packages => configs}/strict.tslint.json | 0 {packages => configs}/tslint.json | 0 {packages => configs}/typedoc.json | 0 .../application-package/compile.tsconfig.json | 2 +- dev-packages/application-package/package.json | 19 ++++++++++++------- dev-packages/cli/compile.tsconfig.json | 2 +- dev-packages/ext-scripts/package.json | 8 ++++---- packages/core/compile.tsconfig.json | 2 +- packages/core/package.json | 2 +- packages/cpp/compile.tsconfig.json | 4 ++-- packages/cpp/package.json | 2 +- packages/editor/compile.tsconfig.json | 2 +- packages/editor/package.json | 2 +- .../extension-manager/compile.tsconfig.json | 4 ++-- packages/extension-manager/package.json | 2 +- packages/filesystem/compile.tsconfig.json | 2 +- packages/filesystem/package.json | 2 +- packages/git/compile.tsconfig.json | 2 +- packages/git/package.json | 2 +- packages/go/compile.tsconfig.json | 4 ++-- packages/go/package.json | 2 +- packages/java/compile.tsconfig.json | 2 +- packages/java/package.json | 2 +- packages/languages/compile.tsconfig.json | 2 +- packages/languages/package.json | 2 +- packages/markers/compile.tsconfig.json | 4 ++-- packages/markers/package.json | 2 +- packages/monaco/compile.tsconfig.json | 2 +- packages/monaco/package.json | 12 +++++++----- packages/navigator/compile.tsconfig.json | 2 +- packages/navigator/package.json | 2 +- .../preferences-api/compile.tsconfig.json | 4 ++-- packages/preferences-api/package.json | 2 +- packages/preferences/compile.tsconfig.json | 2 +- packages/preferences/package.json | 2 +- packages/process/compile.tsconfig.json | 4 ++-- packages/process/package.json | 2 +- packages/python/compile.tsconfig.json | 4 ++-- packages/python/package.json | 2 +- packages/terminal/compile.tsconfig.json | 2 +- packages/terminal/package.json | 2 +- packages/typescript/compile.tsconfig.json | 4 ++-- packages/typescript/package.json | 2 +- packages/workspace/compile.tsconfig.json | 2 +- packages/workspace/package.json | 2 +- tsconfig.json | 2 +- 52 files changed, 73 insertions(+), 66 deletions(-) rename {packages => configs}/all.tslint.json (100%) rename {packages => configs}/base.tsconfig.json (100%) rename {packages => configs}/mocha.opts (100%) rename {packages => configs}/nyc.json (100%) rename {packages => configs}/strict.tslint.json (100%) rename {packages => configs}/tslint.json (100%) rename {packages => configs}/typedoc.json (100%) diff --git a/.vscode/launch.json b/.vscode/launch.json index 1ce8ce2f0176c..eaea5a71bac4d 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -99,7 +99,7 @@ "--no-timeouts", "--colors", "--opts", - "${workspaceRoot}/packages/mocha.opts" + "${workspaceRoot}/configs/mocha.opts" ], "env": { "TS_NODE_PROJECT": "${workspaceRoot}/tsconfig.json" diff --git a/.vscode/settings.json b/.vscode/settings.json index de5f7044b2f46..b4dc8b40b97f0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,7 +5,7 @@ // - Mac: $HOME/Library/Application Support/Code/User/settings.json { "tslint.enable": true, - "tslint.configFile": "packages/strict.tslint.json", + "tslint.configFile": "configs/strict.tslint.json", "editor.formatOnSave": true, "search.exclude": { "**/node_modules": true, diff --git a/packages/all.tslint.json b/configs/all.tslint.json similarity index 100% rename from packages/all.tslint.json rename to configs/all.tslint.json diff --git a/packages/base.tsconfig.json b/configs/base.tsconfig.json similarity index 100% rename from packages/base.tsconfig.json rename to configs/base.tsconfig.json diff --git a/packages/mocha.opts b/configs/mocha.opts similarity index 100% rename from packages/mocha.opts rename to configs/mocha.opts diff --git a/packages/nyc.json b/configs/nyc.json similarity index 100% rename from packages/nyc.json rename to configs/nyc.json diff --git a/packages/strict.tslint.json b/configs/strict.tslint.json similarity index 100% rename from packages/strict.tslint.json rename to configs/strict.tslint.json diff --git a/packages/tslint.json b/configs/tslint.json similarity index 100% rename from packages/tslint.json rename to configs/tslint.json diff --git a/packages/typedoc.json b/configs/typedoc.json similarity index 100% rename from packages/typedoc.json rename to configs/typedoc.json diff --git a/dev-packages/application-package/compile.tsconfig.json b/dev-packages/application-package/compile.tsconfig.json index 4a5f1b7c584b2..b8b72b49c8822 100644 --- a/dev-packages/application-package/compile.tsconfig.json +++ b/dev-packages/application-package/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../packages/base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" diff --git a/dev-packages/application-package/package.json b/dev-packages/application-package/package.json index 1fb422f6d764e..d8829a824fd0f 100644 --- a/dev-packages/application-package/package.json +++ b/dev-packages/application-package/package.json @@ -15,19 +15,18 @@ }, "homepage": "https://github.com/theia-ide/theia", "files": [ - "bin", "lib", "src" ], "main": "lib/index.js", "typings": "lib/index.d.ts", "scripts": { - "prepare": "yarn run clean && yarn build", - "clean": "rimraf lib", - "build": "tsc -p compile.tsconfig.json", - "watch": "yarn build -w", - "test": "echo 'skip'", - "docs": "echo 'skip'" + "prepare": "yarn run clean && yarn run build", + "clean": "theiaext clean", + "build": "theiaext build", + "watch": "theiaext watch", + "test": "theiaext test", + "docs": "theiaext docs" }, "dependencies": { "@types/fs-extra": "^4.0.2", @@ -52,5 +51,11 @@ "url-loader": "^0.5.8", "webpack": "^2.2.1", "write-json-file": "^2.2.0" + }, + "devDependencies": { + "@theia/ext-scripts": "^0.1.1" + }, + "nyc": { + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/dev-packages/cli/compile.tsconfig.json b/dev-packages/cli/compile.tsconfig.json index 4a5f1b7c584b2..b8b72b49c8822 100644 --- a/dev-packages/cli/compile.tsconfig.json +++ b/dev-packages/cli/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../packages/base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" diff --git a/dev-packages/ext-scripts/package.json b/dev-packages/ext-scripts/package.json index edfb85a2b60c6..01679a0135d89 100644 --- a/dev-packages/ext-scripts/package.json +++ b/dev-packages/ext-scripts/package.json @@ -21,12 +21,12 @@ "ext:build": "concurrently -n compile,lint -c blue,green \"theiaext compile\" \"theiaext lint\"", "ext:compile": "tsc -p compile.tsconfig.json", "ext:compile:clean": "rimraf lib", - "ext:lint": "tslint -c ../tslint.json --project compile.tsconfig.json", + "ext:lint": "tslint -c ../../configs/tslint.json --project compile.tsconfig.json", "ext:watch": "tsc -w -p compile.tsconfig.json", - "ext:docs": "typedoc --tsconfig compile.tsconfig.json --options ../typedoc.json", + "ext:docs": "typedoc --tsconfig compile.tsconfig.json --options ../../configs/typedoc.json", "ext:docs:clean": "rimraf docs/api", - "ext:test": "nyc mocha --opts ../mocha.opts \"./src/**/*.*spec.ts\"", - "ext:test:watch": "mocha -w --opts ../mocha.opts \"./src/**/*.*spec.ts\"", + "ext:test": "nyc mocha --opts ../../configs/mocha.opts \"./src/**/*.*spec.ts\"", + "ext:test:watch": "mocha -w --opts ../../configs/mocha.opts \"./src/**/*.*spec.ts\"", "ext:test:clean": "rimraf .nyc_output && rimraf coverage" } } \ No newline at end of file diff --git a/packages/core/compile.tsconfig.json b/packages/core/compile.tsconfig.json index 6aa721b1c92b9..dd6dd45d792e3 100644 --- a/packages/core/compile.tsconfig.json +++ b/packages/core/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib", diff --git a/packages/core/package.json b/packages/core/package.json index 2c7bf06479045..a1e6c309e91ac 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -64,6 +64,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/cpp/compile.tsconfig.json b/packages/cpp/compile.tsconfig.json index f42b36183ebc6..b8b72b49c8822 100644 --- a/packages/cpp/compile.tsconfig.json +++ b/packages/cpp/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" @@ -7,4 +7,4 @@ "include": [ "src" ] -} +} \ No newline at end of file diff --git a/packages/cpp/package.json b/packages/cpp/package.json index 54cb79e540903..df277947a83ed 100644 --- a/packages/cpp/package.json +++ b/packages/cpp/package.json @@ -47,6 +47,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/editor/compile.tsconfig.json b/packages/editor/compile.tsconfig.json index b7e52553a6f46..b8b72b49c8822 100644 --- a/packages/editor/compile.tsconfig.json +++ b/packages/editor/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" diff --git a/packages/editor/package.json b/packages/editor/package.json index 358eec24035e9..066e763bc6fa5 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -43,6 +43,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/extension-manager/compile.tsconfig.json b/packages/extension-manager/compile.tsconfig.json index f42b36183ebc6..b8b72b49c8822 100644 --- a/packages/extension-manager/compile.tsconfig.json +++ b/packages/extension-manager/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" @@ -7,4 +7,4 @@ "include": [ "src" ] -} +} \ No newline at end of file diff --git a/packages/extension-manager/package.json b/packages/extension-manager/package.json index f647f32ccac36..2741568cd9a4c 100644 --- a/packages/extension-manager/package.json +++ b/packages/extension-manager/package.json @@ -48,6 +48,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/filesystem/compile.tsconfig.json b/packages/filesystem/compile.tsconfig.json index 5fcd33baf8d6c..bad4f888c3da2 100644 --- a/packages/filesystem/compile.tsconfig.json +++ b/packages/filesystem/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib", diff --git a/packages/filesystem/package.json b/packages/filesystem/package.json index a474370574dc8..8631167f2a888 100644 --- a/packages/filesystem/package.json +++ b/packages/filesystem/package.json @@ -52,6 +52,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/git/compile.tsconfig.json b/packages/git/compile.tsconfig.json index b7e52553a6f46..b8b72b49c8822 100644 --- a/packages/git/compile.tsconfig.json +++ b/packages/git/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" diff --git a/packages/git/package.json b/packages/git/package.json index c7f79357dae95..b65f4f6fc1650 100644 --- a/packages/git/package.json +++ b/packages/git/package.json @@ -49,6 +49,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/go/compile.tsconfig.json b/packages/go/compile.tsconfig.json index f42b36183ebc6..b8b72b49c8822 100644 --- a/packages/go/compile.tsconfig.json +++ b/packages/go/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" @@ -7,4 +7,4 @@ "include": [ "src" ] -} +} \ No newline at end of file diff --git a/packages/go/package.json b/packages/go/package.json index 4e5f05a95f37d..5cd4d8efe4821 100644 --- a/packages/go/package.json +++ b/packages/go/package.json @@ -46,6 +46,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/java/compile.tsconfig.json b/packages/java/compile.tsconfig.json index cadaa753cf11d..609fa7ad7e6f9 100644 --- a/packages/java/compile.tsconfig.json +++ b/packages/java/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" diff --git a/packages/java/package.json b/packages/java/package.json index 6d5a986e3535e..eb88877f819db 100644 --- a/packages/java/package.json +++ b/packages/java/package.json @@ -50,6 +50,6 @@ "src" ], "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/languages/compile.tsconfig.json b/packages/languages/compile.tsconfig.json index b7e52553a6f46..b8b72b49c8822 100644 --- a/packages/languages/compile.tsconfig.json +++ b/packages/languages/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" diff --git a/packages/languages/package.json b/packages/languages/package.json index 40b4b9ce3b7f5..9ccd3e64aedd4 100644 --- a/packages/languages/package.json +++ b/packages/languages/package.json @@ -44,6 +44,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/markers/compile.tsconfig.json b/packages/markers/compile.tsconfig.json index f42b36183ebc6..b8b72b49c8822 100644 --- a/packages/markers/compile.tsconfig.json +++ b/packages/markers/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" @@ -7,4 +7,4 @@ "include": [ "src" ] -} +} \ No newline at end of file diff --git a/packages/markers/package.json b/packages/markers/package.json index 08f34ae82fadf..45dbb2b8904d9 100644 --- a/packages/markers/package.json +++ b/packages/markers/package.json @@ -42,6 +42,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/monaco/compile.tsconfig.json b/packages/monaco/compile.tsconfig.json index b7e52553a6f46..b8b72b49c8822 100644 --- a/packages/monaco/compile.tsconfig.json +++ b/packages/monaco/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" diff --git a/packages/monaco/package.json b/packages/monaco/package.json index 5777387077c44..0ea70dfaa3220 100644 --- a/packages/monaco/package.json +++ b/packages/monaco/package.json @@ -19,10 +19,12 @@ "publishConfig": { "access": "public" }, - "theiaExtensions": [{ - "frontend": "lib/browser/monaco-browser-module", - "frontendElectron": "lib/electron-browser/monaco-electron-module" - }], + "theiaExtensions": [ + { + "frontend": "lib/browser/monaco-browser-module", + "frontendElectron": "lib/electron-browser/monaco-electron-module" + } + ], "keywords": [ "theia-extension" ], @@ -51,6 +53,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/navigator/compile.tsconfig.json b/packages/navigator/compile.tsconfig.json index b7e52553a6f46..b8b72b49c8822 100644 --- a/packages/navigator/compile.tsconfig.json +++ b/packages/navigator/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" diff --git a/packages/navigator/package.json b/packages/navigator/package.json index bd283d29fcf90..8dbe40cc71aa8 100644 --- a/packages/navigator/package.json +++ b/packages/navigator/package.json @@ -43,6 +43,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/preferences-api/compile.tsconfig.json b/packages/preferences-api/compile.tsconfig.json index f42b36183ebc6..b8b72b49c8822 100644 --- a/packages/preferences-api/compile.tsconfig.json +++ b/packages/preferences-api/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" @@ -7,4 +7,4 @@ "include": [ "src" ] -} +} \ No newline at end of file diff --git a/packages/preferences-api/package.json b/packages/preferences-api/package.json index a4faff66faa5d..967e2ea35fda4 100644 --- a/packages/preferences-api/package.json +++ b/packages/preferences-api/package.json @@ -38,6 +38,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/preferences/compile.tsconfig.json b/packages/preferences/compile.tsconfig.json index b7e52553a6f46..b8b72b49c8822 100644 --- a/packages/preferences/compile.tsconfig.json +++ b/packages/preferences/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" diff --git a/packages/preferences/package.json b/packages/preferences/package.json index 720c7d30035bc..1dbae37f2a9cc 100644 --- a/packages/preferences/package.json +++ b/packages/preferences/package.json @@ -47,6 +47,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/process/compile.tsconfig.json b/packages/process/compile.tsconfig.json index f42b36183ebc6..b8b72b49c8822 100644 --- a/packages/process/compile.tsconfig.json +++ b/packages/process/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" @@ -7,4 +7,4 @@ "include": [ "src" ] -} +} \ No newline at end of file diff --git a/packages/process/package.json b/packages/process/package.json index 697d5a68f05d7..048b80dae62e7 100644 --- a/packages/process/package.json +++ b/packages/process/package.json @@ -42,6 +42,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/python/compile.tsconfig.json b/packages/python/compile.tsconfig.json index f42b36183ebc6..b8b72b49c8822 100644 --- a/packages/python/compile.tsconfig.json +++ b/packages/python/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" @@ -7,4 +7,4 @@ "include": [ "src" ] -} +} \ No newline at end of file diff --git a/packages/python/package.json b/packages/python/package.json index 175c949cd49dd..df6fdb2fcb7ec 100644 --- a/packages/python/package.json +++ b/packages/python/package.json @@ -43,6 +43,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/terminal/compile.tsconfig.json b/packages/terminal/compile.tsconfig.json index b7e52553a6f46..b8b72b49c8822 100644 --- a/packages/terminal/compile.tsconfig.json +++ b/packages/terminal/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" diff --git a/packages/terminal/package.json b/packages/terminal/package.json index 78441b2a92f02..579ca7f2b1d32 100644 --- a/packages/terminal/package.json +++ b/packages/terminal/package.json @@ -47,6 +47,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/typescript/compile.tsconfig.json b/packages/typescript/compile.tsconfig.json index f42b36183ebc6..b8b72b49c8822 100644 --- a/packages/typescript/compile.tsconfig.json +++ b/packages/typescript/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" @@ -7,4 +7,4 @@ "include": [ "src" ] -} +} \ No newline at end of file diff --git a/packages/typescript/package.json b/packages/typescript/package.json index 3cc10d4abca91..6caadf9320797 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -46,6 +46,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/packages/workspace/compile.tsconfig.json b/packages/workspace/compile.tsconfig.json index b7e52553a6f46..b8b72b49c8822 100644 --- a/packages/workspace/compile.tsconfig.json +++ b/packages/workspace/compile.tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../base.tsconfig", + "extends": "../../configs/base.tsconfig", "compilerOptions": { "rootDir": "src", "outDir": "lib" diff --git a/packages/workspace/package.json b/packages/workspace/package.json index 38f786c8c153a..6d30140dfead4 100644 --- a/packages/workspace/package.json +++ b/packages/workspace/package.json @@ -43,6 +43,6 @@ "@theia/ext-scripts": "^0.1.1" }, "nyc": { - "extends": "../nyc.json" + "extends": "../../configs/nyc.json" } } \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 5dbf5dfab22f1..2c674577158ae 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./packages/base.tsconfig", + "extends": "./configs/base.tsconfig", "compilerOptions": { "baseUrl": ".", "paths": {