Share configs between runtime and dev packages

Signed-off-by: Anton Kosiakov <anton.kosyakov@typefox.io>
eclipse-theia · Oct 19, 2017 · faf4e78 · faf4e78
1 parent aa4c153
commit faf4e78
Show file tree

Hide file tree

Showing 52 changed files with 73 additions and 66 deletions.
diff --git 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
@@ -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 → configs/all.tslint.json b/packages/all.tslint.json → configs/all.tslint.json
diff --git a/packages/base.tsconfig.json → configs/base.tsconfig.json b/packages/base.tsconfig.json → configs/base.tsconfig.json
diff --git a/packages/mocha.opts → configs/mocha.opts b/packages/mocha.opts → configs/mocha.opts
diff --git a/packages/nyc.json → configs/nyc.json b/packages/nyc.json → configs/nyc.json
diff --git a/packages/strict.tslint.json → configs/strict.tslint.json b/packages/strict.tslint.json → configs/strict.tslint.json
diff --git a/packages/tslint.json → configs/tslint.json b/packages/tslint.json → configs/tslint.json
diff --git a/packages/typedoc.json → configs/typedoc.json b/packages/typedoc.json → configs/typedoc.json
diff --git 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
@@ -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"
   }
 }
diff --git 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
@@ -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"
   }
 }
diff --git 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
@@ -64,6 +64,6 @@
     "@theia/ext-scripts": "^0.1.1"
   },
   "nyc": {
-    "extends": "../nyc.json"
+    "extends": "../../configs/nyc.json"
   }
 }
diff --git a/packages/cpp/compile.tsconfig.json b/packages/cpp/compile.tsconfig.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../base.tsconfig",
+  "extends": "../../configs/base.tsconfig",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "lib"
   },
   "include": [
     "src"
   ]
-}
+}
diff --git 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"
   }
 }
diff --git 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
@@ -43,6 +43,6 @@
     "@theia/ext-scripts": "^0.1.1"
   },
   "nyc": {
-    "extends": "../nyc.json"
+    "extends": "../../configs/nyc.json"
   }
 }
diff --git a/packages/extension-manager/compile.tsconfig.json b/packages/extension-manager/compile.tsconfig.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../base.tsconfig",
+  "extends": "../../configs/base.tsconfig",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "lib"
   },
   "include": [
     "src"
   ]
-}
+}
diff --git 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"
   }
 }
diff --git 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
@@ -52,6 +52,6 @@
     "@theia/ext-scripts": "^0.1.1"
   },
   "nyc": {
-    "extends": "../nyc.json"
+    "extends": "../../configs/nyc.json"
   }
 }
diff --git 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
@@ -49,6 +49,6 @@
     "@theia/ext-scripts": "^0.1.1"
   },
   "nyc": {
-    "extends": "../nyc.json"
+    "extends": "../../configs/nyc.json"
   }
 }
diff --git a/packages/go/compile.tsconfig.json b/packages/go/compile.tsconfig.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../base.tsconfig",
+  "extends": "../../configs/base.tsconfig",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "lib"
   },
   "include": [
     "src"
   ]
-}
+}
diff --git 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"
   }
 }
diff --git 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
@@ -50,6 +50,6 @@
     "src"
   ],
   "nyc": {
-    "extends": "../nyc.json"
+    "extends": "../../configs/nyc.json"
   }
 }
diff --git 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
@@ -44,6 +44,6 @@
     "@theia/ext-scripts": "^0.1.1"
   },
   "nyc": {
-    "extends": "../nyc.json"
+    "extends": "../../configs/nyc.json"
   }
 }
diff --git a/packages/markers/compile.tsconfig.json b/packages/markers/compile.tsconfig.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../base.tsconfig",
+  "extends": "../../configs/base.tsconfig",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "lib"
   },
   "include": [
     "src"
   ]
-}
+}
diff --git 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"
   }
 }
diff --git 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
@@ -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"
   }
 }
diff --git 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
@@ -43,6 +43,6 @@
     "@theia/ext-scripts": "^0.1.1"
   },
   "nyc": {
-    "extends": "../nyc.json"
+    "extends": "../../configs/nyc.json"
   }
 }
diff --git a/packages/preferences-api/compile.tsconfig.json b/packages/preferences-api/compile.tsconfig.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../base.tsconfig",
+  "extends": "../../configs/base.tsconfig",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "lib"
   },
   "include": [
     "src"
   ]
-}
+}
diff --git 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"
   }
 }
diff --git 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
@@ -47,6 +47,6 @@
     "@theia/ext-scripts": "^0.1.1"
   },
   "nyc": {
-    "extends": "../nyc.json"
+    "extends": "../../configs/nyc.json"
   }
 }
diff --git a/packages/process/compile.tsconfig.json b/packages/process/compile.tsconfig.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../base.tsconfig",
+  "extends": "../../configs/base.tsconfig",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "lib"
   },
   "include": [
     "src"
   ]
-}
+}
diff --git 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"
   }
 }