fix: 🐛 Fixes TSconfig for all projects

imzeeshan · Nov 9, 2021 · 24c1624 · 24c1624
1 parent 82e0c6f
commit 24c1624
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 26 deletions.
diff --git a/libs/api-hjarntorget/package.json b/libs/api-hjarntorget/package.json
@@ -14,7 +14,7 @@
   "scripts": {
     "lint": "eslint 'lib/**/*.{js,ts}' --quiet --fix",
     "test": "jest",
-    "build": "tsc",
+    "build": "tsc --build",
     "prepare": "yarn build",
     "run-dev": "yarn run build && node run",
     "publish-package": "npm publish --access public"

diff --git a/libs/api-skolplattformen/lib/loginStatus.ts b/libs/api-skolplattformen/lib/loginStatus.ts
@@ -1,7 +1,7 @@
 import { EventEmitter } from 'events'
-import { Fetcher } from './fetcher'
 import { loginStatus } from './routes'
-import { AuthTicket } from './types'
+import { Fetcher } from '../../api/lib/fetcher'
+import { AuthTicket } from '../..//api/lib/types'
 
 /*
 export enum LoginEvent {

diff --git a/libs/api-skolplattformen/package.json b/libs/api-skolplattformen/package.json
@@ -6,14 +6,14 @@
   "files": [
     "dist/**/*"
   ],
-  "repository": "git@github.com:kolplattformen/embedded-api.git",
-  "author": "Johan Öbrink <johan.obrink@gmail.com>",
+  "repository": "git@github.com:kolplattformen/skolplattformen.git",
+  "author": "ÖS <info@skolplattformen.org>",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
     "lint": "eslint 'lib/**/*.{js,ts}' --quiet --fix",
     "test": "jest",
-    "build": "tsc",
+    "build": "tsc --build",
     "prepare": "yarn build",
     "run-dev": "yarn run build && node run",
     "publish-package": "npm publish --access public"

diff --git a/libs/api-skolplattformen/tsconfig.json b/libs/api-skolplattformen/tsconfig.json
@@ -1,22 +1,21 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "jsx": "react-jsx",
-    "allowJs": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true,
+    "target": "ES6",
+    "module": "CommonJS",
+    "declaration": true,
+    "outDir": "./dist",
     "strict": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "allowSyntheticDefaultImports": true,
+    "sourceMap": true
   },
-  "files": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
+  "include": [
+    "lib"
+  ],
+  "exclude": [
+    "node_modules",
+    "**/__tests__/*",
+    "**/__mocks__/*",
+    "**/*.test.ts"
   ]
 }
diff --git a/libs/api-skolplattformen/tsconfig.lib.json b/libs/api-skolplattformen/tsconfig.lib.json
@@ -2,7 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "types": ["node"]
+    "types": ["node"],
   },
   "exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
   "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]

diff --git a/libs/api-skolplattformen/tsconfig.spec.json b/libs/api-skolplattformen/tsconfig.spec.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["jest", "node"]
+    "types": ["jest", "node"],
+    "composite": true
   },
   "include": [
     "**/*.spec.ts",

diff --git a/libs/api/tsconfig.json b/libs/api/tsconfig.json
@@ -9,9 +9,7 @@
     "allowSyntheticDefaultImports": true,
     "sourceMap": true
   },
-  "include": [
-    "lib"
-  ],
+  "include": ["lib", "../../__mocks__"  ],
   "exclude": [
     "node_modules",
     "**/__tests__/*",

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -17,6 +17,12 @@
       "@skolplattformen/api-skolplattformen": [
         "libs/api-skolplattformen/lib/index.ts"
       ],
+      "@skolplattformen/api-hjarntorget": [
+        "libs/api-hjarntorget/lib/index.ts"
+      ],
+      "@skolplattformen/api": [
+        "libs/api/lib/index.ts"
+      ],
       "@skolplattformen/curriculum": ["libs/curriculum/src/index.ts"],
       "@skolplattformen/hooks": ["libs/hooks/src/index.ts"]
     }

diff --git a/workspace.json b/workspace.json
@@ -122,6 +122,16 @@
       "sourceRoot": "apps/skolplattformen-sthlm/src",
       "projectType": "application",
       "targets": {
+
+        "build": {
+          "executor": "@nrwl/react-native:bundle",
+          "outputs": ["apps/skolplattformen-sthlm/build"],
+          "options": {
+            "entryFile": "apps/skolplattformen-sthlm/index.js",
+            "platform": "ios",
+            "bundleOutput": "dist/apps/skolplattformen-sthlm/ios/main.jsbundle"
+          }
+        },
         "start": {
           "executor": "@nrwl/react-native:start",
           "options": {