From: Đặng Minh Dũng <dungdm93@live.com>
Date: Mon, 2 Nov 2020 10:35:30 +0000 (+0700)
Subject: mgr/dashboard: move "tsconfig.app.json" to <root> folder
X-Git-Tag: v16.1.0~629^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3c8392bdbb4dcce9ccad06a8ea4b64a199395a1;p=ceph.git

mgr/dashboard: move "tsconfig.app.json" to <root> folder

Signed-off-by: Đặng Minh Dũng <dungdm93@live.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/angular.json b/src/pybind/mgr/dashboard/frontend/angular.json
index e2c2e8ad724d..ba261665181e 100644
--- a/src/pybind/mgr/dashboard/frontend/angular.json
+++ b/src/pybind/mgr/dashboard/frontend/angular.json
@@ -39,7 +39,7 @@
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
             "polyfills": "src/polyfills.ts",
             "assets": [
               "src/assets",
@@ -191,7 +191,7 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
+              "tsconfig.app.json",
               "tsconfig.spec.json",
               "cypress/tsconfig.json"
             ],
diff --git a/src/pybind/mgr/dashboard/frontend/package.json b/src/pybind/mgr/dashboard/frontend/package.json
index 25141d8bd6a1..8ef91ae374db 100644
--- a/src/pybind/mgr/dashboard/frontend/package.json
+++ b/src/pybind/mgr/dashboard/frontend/package.json
@@ -28,7 +28,7 @@
     "lint:prettier": "prettier --list-different \"{src,cypress}/**/*.{ts,scss}\"",
     "lint:html": "htmllint src/app/**/*.html && html-linter --config html-linter.config.json",
     "prelint:tsc": "npm run postinstall",
-    "lint:tsc": "tsc -p src/tsconfig.app.json --noEmit && tsc -p tsconfig.spec.json --noEmit && tsc -p cypress/tsconfig.json --noEmit",
+    "lint:tsc": "tsc -p tsconfig.app.json --noEmit && tsc -p tsconfig.spec.json --noEmit && tsc -p cypress/tsconfig.json --noEmit",
     "lint:scss": "stylelint '**/*.scss'",
     "lint": "run-p -csl --aggregate-output lint:*",
     "fix:prettier": "prettier --write \"{src,cypress}/**/*.{ts,scss}\"",
@@ -38,14 +38,15 @@
     "fix": "run-p -csl --aggregate-output fix:*",
     "fix:audit": "npx npm-force-resolutions",
     "compodoc": "compodoc",
-    "doc-build": "compodoc -p src/tsconfig.app.json",
-    "doc-serve": "compodoc --port 8444 -s src/tsconfig.app.json",
-    "postinstall": "ngcc --properties es2015 browser module main --async false --first-only --tsconfig './src/tsconfig.app.json'"
+    "doc-build": "compodoc -p tsconfig.app.json",
+    "doc-serve": "compodoc --port 8444 -s tsconfig.app.json",
+    "postinstall": "ngcc --properties es2015 browser module main --async false --first-only --tsconfig 'tsconfig.app.json'"
   },
   "private": true,
   "jest": {
     "moduleNameMapper": {
-      "\\.scss$": "identity-obj-proxy"
+      "\\.scss$": "identity-obj-proxy",
+      "~/(.*)$": "<rootDir>/src/$1"
     },
     "preset": "jest-preset-angular",
     "setupFilesAfterEnv": [
diff --git a/src/pybind/mgr/dashboard/frontend/src/tsconfig.app.json b/src/pybind/mgr/dashboard/frontend/src/tsconfig.app.json
deleted file mode 100644
index 2e7a5b206d58..000000000000
--- a/src/pybind/mgr/dashboard/frontend/src/tsconfig.app.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/app",
-    "baseUrl": "./",
-    "types": []
-  },
-  "files": [
-    "main.ts",
-    "polyfills.ts"
-  ],
-  "include": [
-    "src/**/*.d.ts"
-  ]
-}
diff --git a/src/pybind/mgr/dashboard/frontend/tsconfig.app.json b/src/pybind/mgr/dashboard/frontend/tsconfig.app.json
new file mode 100644
index 000000000000..f758d9820d53
--- /dev/null
+++ b/src/pybind/mgr/dashboard/frontend/tsconfig.app.json
@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/app",
+    "types": []
+  },
+  "files": [
+    "src/main.ts",
+    "src/polyfills.ts"
+  ],
+  "include": [
+    "src/**/*.d.ts"
+  ]
+}
diff --git a/src/pybind/mgr/dashboard/frontend/tsconfig.spec.json b/src/pybind/mgr/dashboard/frontend/tsconfig.spec.json
index 8ce5b87c80f2..e1889d6c6466 100644
--- a/src/pybind/mgr/dashboard/frontend/tsconfig.spec.json
+++ b/src/pybind/mgr/dashboard/frontend/tsconfig.spec.json
@@ -2,7 +2,6 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
-    "baseUrl": "./src/",
     "module": "commonjs",
     "target": "es2015",
     "types": [