chore: remove tsc build from local workspaces (#2020)

UILib.tsconfig.json

@@ -2,9 +2,9 @@
   "extends": "./node_modules/@standardnotes/config/src/tsconfig.json",
   "compilerOptions": {
     "module": "esnext",
-    "target": "es5",
+    "target": "es6",
     "lib": ["es6", "dom", "es2016", "es2017"],
-    "types": ["react"],
+    "types": ["react", "jest"],
     "jsx": "react-jsx",
     "declaration": true,
     "moduleResolution": "node",

common.jest.json

@@ -0,0 +1,19 @@
+{
+  "collectCoverageFrom": ["src/**/*.{ts,tsx}", "!**/index.ts"],
+  "coverageReporters": ["text", "lcov", "html", "json-summary"],
+  "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(tsx?)$",
+  "testPathIgnorePatterns": ["/node_modules/"],
+  "coveragePathIgnorePatterns": ["/node_modules/"],
+  "moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json"],
+  "transform": {
+    "^.+\\.tsx?$": ["ts-jest", { "tsconfig": "tsconfig.json" }]
+  },
+  "coverageThreshold": {
+    "global": {
+      "branches": 100,
+      "functions": 100,
+      "lines": 100,
+      "statements": 100
+    }
+  }
+}

packages/api/jest.config.js

@@ -1,12 +1,10 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const base = require('../../node_modules/@standardnotes/config/src/jest.json');
+const base = require('../../common.jest.json')
 
 module.exports = {
   ...base,
-  globals: {
+  transform: {
-    'ts-jest': {
+    '^.+\\.tsx?$': ['ts-jest', { tsconfig: 'tsconfig.json' }],
-      tsconfig: 'tsconfig.json',
-    },
   },
   coverageThreshold: {
     global: {

packages/api/src/Domain/Client/index.ts

@@ -8,3 +8,5 @@ export * from './WebSocket/WebSocketApiService'
 export * from './WebSocket/WebSocketApiServiceInterface'
 export * from './Workspace/WorkspaceApiService'
 export * from './Workspace/WorkspaceApiServiceInterface'
+export * from './Workspace/WorkspaceUser'
+export * from './Workspace/Workspace'

packages/api/src/Domain/Response/Workspace/WorkspaceListResponseBody.ts

@@ -1,4 +1,4 @@
-import { Workspace } from '@standardnotes/models'
+import { Workspace } from './../../Client/Workspace/Workspace'
 
 export type WorkspaceListResponseBody = {
   ownedWorkspaces: Array<Workspace>

packages/api/src/Domain/Response/Workspace/WorkspaceUserListResponseBody.ts

@@ -1,4 +1,4 @@
-import { WorkspaceUser } from '@standardnotes/models'
+import { WorkspaceUser } from './../../Client/Workspace/WorkspaceUser'
 
 export type WorkspaceUserListResponseBody = {
   users: Array<WorkspaceUser>

packages/blocks-editor/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "main": "./src/index.ts",
   "scripts": {
-    "start": "tsc -p tsconfig.json --watch"
+    "tsc": "tsc -p tsconfig.json"
   },
   "dependencies": {
     "@lexical/react": "^0.6.0",

packages/encryption/jest.config.js

@@ -1,11 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const base = require('../../node_modules/@standardnotes/config/src/jest.json');
+const base = require('../../common.jest.json')
 
 module.exports = {
   ...base,
-  globals: {
-    'ts-jest': {
-      tsconfig: 'tsconfig.json',
-    },
 }
-};

packages/features/jest.config.js

@@ -1,11 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const base = require('../../node_modules/@standardnotes/config/src/jest.json');
+const base = require('../../common.jest.json')
 
 module.exports = {
   ...base,
-  globals: {
-    'ts-jest': {
-      tsconfig: 'tsconfig.json',
-    },
 }
-};

packages/filepicker/jest.config.js

@@ -1,14 +1,7 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const base = require('../../node_modules/@standardnotes/config/src/jest.json');
+const base = require('../../common.jest.json')
 
 module.exports = {
   ...base,
-  globals: {
+  coveragePathIgnorePatterns: ['/example/'],
-    'ts-jest': {
+}
-      tsconfig: 'tsconfig.json',
-    },
-  },
-  coveragePathIgnorePatterns: [
-    "/example/"
-  ]
-};

packages/files/jest.config.js

@@ -1,11 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const base = require('../../node_modules/@standardnotes/config/src/jest.json');
+const base = require('../../common.jest.json')
 
 module.exports = {
   ...base,
-  globals: {
-    'ts-jest': {
-      tsconfig: 'tsconfig.json',
-    },
 }
-};

packages/mobile/src/Lib/Interface.ts

@@ -1,6 +1,6 @@
 import AsyncStorage from '@react-native-community/async-storage'
 import SNReactNative from '@standardnotes/react-native-utils'
-import { AppleIAPReceipt } from '@standardnotes/services/dist/Domain/Subscription/AppleIAPReceipt'
+import { AppleIAPReceipt } from '@standardnotes/services'
 import {
   AppleIAPProductId,
   ApplicationIdentifier,

packages/models/jest.config.js

@@ -1,11 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const base = require('../../node_modules/@standardnotes/config/src/jest.json');
+const base = require('../../common.jest.json')
 
 module.exports = {
   ...base,
-  globals: {
-    'ts-jest': {
-      tsconfig: 'tsconfig.json',
-    },
 }
-};

packages/models/package.json

@@ -5,19 +5,11 @@
     "node": ">=16.0.0 <17.0.0"
   },
   "description": "Models used in SNJS library",
-  "main": "dist/index.js",
   "author": "Standard Notes",
-  "types": "dist/index.d.ts",
+  "main": "./src/index.ts",
-  "files": [
-    "dist"
-  ],
   "license": "AGPL-3.0-or-later",
   "scripts": {
-    "clean": "rm -fr dist",
+    "tsc": "tsc -p tsconfig.json",
-    "prestart": "yarn clean",
-    "start": "tsc -p tsconfig.json --watch",
-    "prebuild": "yarn clean",
-    "build": "tsc -p tsconfig.json",
     "lint": "eslint src --ext .ts",
     "test": "jest"
   },

packages/models/src/Domain/Syncable/Theme/Theme.ts

@@ -12,7 +12,7 @@ export const isTheme = (x: ItemInterface): x is SNTheme => x.content_type === Co
 
 export class SNTheme extends SNComponent {
   public override area: ComponentArea = ComponentArea.Themes
-  public override readonly package_info!: ThemePackageInfo
+  public declare readonly package_info: ThemePackageInfo
 
   isLayerable(): boolean {
     return useBoolean(this.package_info && this.package_info.layerable, false)

packages/models/src/Domain/index.ts

@@ -29,8 +29,6 @@ export * from './Api/Subscription/Invitation'
 export * from './Api/Subscription/InvitationStatus'
 export * from './Api/Subscription/InviteeIdentifierType'
 export * from './Api/Subscription/InviterIdentifierType'
-export * from './Api/Workspace/Workspace'
-export * from './Api/Workspace/WorkspaceUser'
 export * from './Device/Environment'
 export * from './Device/Platform'
 export * from './Local/KeyParams/RootKeyParamsInterface'

packages/models/tsconfig.json

@@ -1,13 +1,10 @@
 {
-  "extends": "../../node_modules/@standardnotes/config/src/tsconfig.json",
+  "extends": "../../UILib.tsconfig.json",
   "compilerOptions": {
     "skipLibCheck": true,
     "rootDir": "./src",
-    "outDir": "./dist",
+    "outDir": "./dist"
   },
-  "include": [
+  "include": ["src/**/*"],
-    "src/**/*"
-  ],
-  "references": [],
   "exclude": ["**/*.spec.ts"]
 }

packages/responses/jest.config.js

@@ -1,11 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const base = require('../../node_modules/@standardnotes/config/src/jest.json');
+const base = require('../../common.jest.json')
 
 module.exports = {
   ...base,
-  globals: {
-    'ts-jest': {
-      tsconfig: 'tsconfig.json',
-    },
 }
-};

packages/services/jest.config.js

@@ -1,19 +1,17 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const base = require('../../node_modules/@standardnotes/config/src/jest.json');
+const base = require('../../common.jest.json')
 
 module.exports = {
   ...base,
-  globals: {
+  transform: {
-    'ts-jest': {
+    '^.+\\.tsx?$': ['ts-jest', { tsconfig: 'tsconfig.json' }],
-      tsconfig: 'tsconfig.json',
-    },
   },
   coverageThreshold: {
     global: {
       branches: 6,
       functions: 9,
       lines: 13,
-      statements: 13
+      statements: 13,
+    },
+  },
 }
-  }
-};

packages/services/package.json

@@ -5,20 +5,12 @@
     "node": ">=16.0.0 <17.0.0"
   },
   "description": "Services for Standard Notes SNJS library",
-  "main": "dist/index.js",
+  "main": "./src/index.ts",
   "author": "Standard Notes",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
-    "clean": "rm -fr dist",
+    "tsc": "tsc --project tsconfig.json",
-    "prestart": "yarn clean",
-    "start": "tsc -p tsconfig.json --watch",
-    "prebuild": "yarn clean",
-    "build": "tsc -p tsconfig.json",
     "lint": "eslint src --ext .ts",
     "lint:fix": "eslint src --ext .ts --fix",
     "test": "jest spec --coverage"

packages/services/src/Domain/Workspace/WorkspaceClientInterface.ts

@@ -1,5 +1,5 @@
 import { Uuid, WorkspaceAccessLevel, WorkspaceType } from '@standardnotes/common'
-import { Workspace, WorkspaceUser } from '@standardnotes/models'
+import { Workspace, WorkspaceUser } from '@standardnotes/api'
 
 export interface WorkspaceClientInterface {
   createWorkspace(dto: {

packages/services/src/Domain/Workspace/WorkspaceManager.ts

@@ -1,7 +1,5 @@
-import { WorkspaceApiServiceInterface } from '@standardnotes/api'
+import { WorkspaceApiServiceInterface, Workspace, WorkspaceUser } from '@standardnotes/api'
 import { Uuid, WorkspaceAccessLevel, WorkspaceType } from '@standardnotes/common'
-import { Workspace, WorkspaceUser } from '@standardnotes/models'
-
 import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface'
 import { AbstractService } from '../Service/AbstractService'
 import { WorkspaceClientInterface } from './WorkspaceClientInterface'

packages/services/tsconfig.json

@@ -1,13 +1,10 @@
 {
-  "extends": "../../node_modules/@standardnotes/config/src/tsconfig.json",
+  "extends": "../../UILib.tsconfig.json",
   "compilerOptions": {
     "skipLibCheck": true,
     "rootDir": "./src",
-    "outDir": "./dist",
+    "outDir": "./dist"
   },
-  "include": [
+  "include": ["src/**/*"],
-    "src/**/*"
+  "exclude": ["**/*.spec.ts", "node_modules"]
-  ],
-  "references": [],
-  "exclude": ["**/*.spec.ts", "dist", "node_modules"]
 }

packages/sncrypto-common/jest.config.js

@@ -1,11 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const base = require('../../node_modules/@standardnotes/config/src/jest.json');
+const base = require('../../common.jest.json')
 
 module.exports = {
   ...base,
-  globals: {
-    'ts-jest': {
-      tsconfig: 'tsconfig.json',
-    },
 }
-};

packages/snjs/jest.config.js

@@ -1,5 +1,5 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const base = require('../../node_modules/@standardnotes/config/src/jest.json');
+const base = require('../../common.jest.json')
 
 module.exports = {
   ...base,
@@ -7,12 +7,11 @@ module.exports = {
     '@Lib/(.*)': '<rootDir>/lib/$1',
     '@Services/(.*)': '<rootDir>/lib/Services/$1',
   },
-  globals: {
+  transform: {
-    'ts-jest': {
+    '^.+\\.tsx?$': [
-      tsconfig: '<rootDir>/lib/tsconfig.json',
+      'ts-jest',
-      isolatedModules: true,
+      { tsconfig: './lib/tsconfig.json', isolatedModules: true, babelConfig: 'babel.config.js' },
-      babelConfig: 'babel.config.js',
+    ],
-    },
   },
   clearMocks: true,
   collectCoverageFrom: ['lib/**/{!(index),}.ts'],
@@ -23,9 +22,6 @@ module.exports = {
   roots: ['<rootDir>/lib'],
   setupFiles: ['<rootDir>/jest-global.ts'],
   setupFilesAfterEnv: [],
-  transform: {
-    '^.+\\.(ts|js)?$': 'ts-jest',
-  },
   coverageThreshold: {
     global: {
       branches: 13,

packages/ui-services/jest.config.js

@@ -1,11 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const base = require('../../node_modules/@standardnotes/config/src/jest.json');
+const base = require('../../common.jest.json')
 
 module.exports = {
   ...base,
-  globals: {
-    'ts-jest': {
-      tsconfig: 'tsconfig.json',
-    },
 }
-};

packages/ui-services/package.json

@@ -5,20 +5,12 @@
     "node": ">=16.0.0 <17.0.0"
   },
   "description": "UI Services for Standard Notes clients",
-  "main": "dist/index.js",
+  "main": "./src/index.ts",
   "author": "Standard Notes",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
-    "clean": "rm -fr dist",
+    "tsc": "tsc --project tsconfig.json",
-    "prestart": "yarn clean",
-    "start": "tsc -p tsconfig.json --watch",
-    "prebuild": "yarn clean",
-    "build": "tsc -p tsconfig.json",
     "lint": "eslint src --ext .ts",
     "test": "jest spec"
   },

packages/ui-services/tsconfig.json

@@ -1,14 +1,11 @@
 {
-  "extends": "../../node_modules/@standardnotes/config/src/tsconfig.json",
+  "extends": "../../UILib.tsconfig.json",
   "compilerOptions": {
     "skipLibCheck": true,
     "rootDir": "./src",
     "outDir": "./dist",
-    "jsx": "react-jsx",
+    "jsx": "react-jsx"
   },
-  "include": [
+  "include": ["src/**/*"],
-    "src/**/*"
+  "exclude": ["**/*.spec.ts", "node_modules"]
-  ],
-  "references": [],
-  "exclude": ["**/*.spec.ts", "dist", "node_modules"]
 }

packages/utils/jest.config.js

@@ -1,19 +1,14 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const base = require('../../node_modules/@standardnotes/config/src/jest.json');
+const base = require('../../common.jest.json')
 
 module.exports = {
   ...base,
-  globals: {
-    'ts-jest': {
-      tsconfig: 'tsconfig.json',
-    },
-  },
   coverageThreshold: {
     global: {
       branches: 4,
       functions: 4,
       lines: 24,
-      statements: 25
+      statements: 25,
+    },
+  },
 }
-  }
-};