Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "apps/dashboard"]
path = apps/dashboard
url = git@github.com:feedloop/batiq-dashboard.git
[submodule "apps/batiq-editor"]
path = apps/batiq-editor
url = https://github.com/feedloop/batiq-editor
1 change: 1 addition & 0 deletions apps/batiq-editor
Submodule batiq-editor added at e10d75
3 changes: 2 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
},
"library": {
"style": "css",
"linter": "eslint"
"linter": "eslint",
"unitTestRunner": "none"
}
}
}
Expand Down
19 changes: 12 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"scripts": {},
"private": true,
"workspaces": [
"apps/*",
"packages/*"
],
"dependencies": {
Expand All @@ -22,12 +23,12 @@
"@babel/preset-typescript": "7.12.13",
"@nrwl/esbuild": "^15.9.3",
"@nrwl/eslint-plugin-nx": "^15.9.3",
"@nrwl/jest": "^15.9.3",
"@nrwl/js": "15.9.3",
"@nrwl/jest": "15.9.4",
"@nrwl/js": "15.9.4",
"@nrwl/linter": "^15.9.3",
"@nrwl/react": "^15.9.3",
"@nrwl/react": "15.9.4",
"@nrwl/react-native": "15.9.3",
"@nrwl/rollup": "^15.9.3",
"@nrwl/rollup": "15.9.4",
"@nrwl/storybook": "15.9.3",
"@nrwl/vite": "^15.9.3",
"@nrwl/webpack": "^15.9.3",
Expand All @@ -36,6 +37,7 @@
"@react-native-community/cli": "10.2.1",
"@react-native-community/cli-platform-android": "10.2.0",
"@react-native-community/cli-platform-ios": "10.2.1",
"@rollup/plugin-url": "^7.0.0",
"@storybook/addon-essentials": "^6.5.15",
"@storybook/addon-ondevice-actions": "^6.0.1-beta.11",
"@storybook/addon-ondevice-backgrounds": "^6.0.1-beta.11",
Expand All @@ -50,24 +52,26 @@
"@storybook/react": "^6.5.16",
"@storybook/react-native": "^6.0.1-beta.11",
"@storybook/test-runner": "^0.7.2",
"@svgr/rollup": "^6.1.2",
"@svgr/webpack": "^5.4.0",
"@swc/cli": "^0.1.62",
"@swc/core": "^1.3.41",
"@swc/jest": "^0.2.24",
"@testing-library/jest-native": "5.4.2",
"@testing-library/react-native": "11.5.2",
"@types/react-native": "^0.71.6",
"@testing-library/react": "14.0.0",
"@testing-library/react-native": "11.5.2",
"@types/jest": "^29.4.0",
"@types/node": "18.14.2",
"@types/react": "18.0.28",
"@types/react-dom": "18.0.11",
"@types/react-native": "^0.71.6",
"@types/react-router-dom": "5.3.3",
"@typescript-eslint/eslint-plugin": "^5.36.1",
"@typescript-eslint/parser": "^5.36.1",
"@vitejs/plugin-react": "^3.0.0",
"@vitest/coverage-c8": "~0.25.8",
"@vitest/ui": "^0.25.8",
"babel-jest": "^29.4.1",
"babel-loader": "8.1.0",
"eslint": "~8.15.0",
"eslint-config-prettier": "8.1.0",
Expand All @@ -79,8 +83,10 @@
"html-webpack-plugin": "^5.5.0",
"jest": "^29.4.1",
"jest-environment-jsdom": "^29.4.1",
"jest-environment-node": "^29.4.1",
"jest-file-snapshot": "^0.5.0",
"jest-react-native": "18.0.0",
"jsdom": "~20.0.3",
"metro": "0.74.1",
"metro-babel-register": "0.74.1",
"metro-config": "^0.76.3",
Expand All @@ -98,7 +104,6 @@
"react-native-svg": "13.8.0",
"react-native-svg-transformer": "1.0.0",
"react-native-url-polyfill": "^1.3.0",
"jsdom": "~20.0.3",
"react-test-renderer": "18.2.0",
"ts-jest": "^29.0.5",
"ts-node": "^10.9.1",
Expand Down
4 changes: 3 additions & 1 deletion packages/data/src/OpenAPI.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ export const OpenAPI = async (data: DataSourceDefinitionSchema) => {
const client = await api.init();

const { origin } =
Platform.OS === "web" ? new URL(definition) : new URLNative(definition);
// temporary fix as react-native-url-polyfill doesn't work on web https://github.com/charpeni/react-native-url-polyfill/issues/366
// Platform.OS === "web" ? new URL(definition) : new URLNative(definition);
new URL(definition);

// eslint-disable-next-line prefer-const
let { http, apiKey, oauth2, openIdConnect } = auth;
Expand Down
12 changes: 12 additions & 0 deletions packages/expo-runtime/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"presets": [
[
"@nrwl/react/babel",
{
"runtime": "automatic",
"useBuiltIns": "usage"
}
]
],
"plugins": []
}
6 changes: 2 additions & 4 deletions packages/expo-runtime/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
{
"extends": ["../../.eslintrc.json"],
"extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
"ignorePatterns": ["!**/*"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@typescript-eslint/ban-types": "off"
}
"rules": {}
},
{
"files": ["*.ts", "*.tsx"],
Expand Down
32 changes: 0 additions & 32 deletions packages/expo-runtime/.lib.swcrc

This file was deleted.

17 changes: 0 additions & 17 deletions packages/expo-runtime/jest.config.ts

This file was deleted.

14 changes: 4 additions & 10 deletions packages/expo-runtime/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
"options": {
"outputPath": "dist/packages/expo-runtime",
"project": "packages/expo-runtime/package.json",
"main": "packages/expo-runtime/src/index.ts",
"entryFile": "packages/expo-runtime/src/index.ts",
"tsConfig": "packages/expo-runtime/tsconfig.lib.json",
"compiler": "babel",
"assets": [],
"format": ["esm", "cjs"],
"external": [
"react/jsx-runtime",
"@react-navigation/native",
"expo",
"@react-navigation/bottom-tabs",
Expand All @@ -34,15 +36,7 @@
"executor": "@nrwl/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/expo-runtime/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "packages/expo-runtime/jest.config.ts",
"passWithNoTests": true
"lintFilePatterns": ["packages/expo-runtime/**/*.{ts,tsx}"]
}
}
},
Expand Down
3 changes: 0 additions & 3 deletions packages/expo-runtime/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
"references": [
{
"path": "./tsconfig.lib.json"
},
{
"path": "./tsconfig.spec.json"
}
]
}
14 changes: 12 additions & 2 deletions packages/expo-runtime/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@
"declaration": true,
"types": ["node"]
},
"include": ["src/**/*.ts"],
"exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"include": ["src/**/*.ts", "src/**/*.tsx"],
"exclude": [
"jest.config.ts",
"src/**/*.spec.ts",
"src/**/*.test.ts",
"src/**/*.spec.tsx",
"src/**/*.test.tsx"
]
}
13 changes: 0 additions & 13 deletions packages/expo-runtime/tsconfig.spec.json

This file was deleted.

12 changes: 12 additions & 0 deletions packages/ir/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"presets": [
[
"@nrwl/react/babel",
{
"runtime": "automatic",
"useBuiltIns": "usage"
}
]
],
"plugins": []
}
2 changes: 1 addition & 1 deletion packages/ir/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["../../.eslintrc.json"],
"extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
"ignorePatterns": ["!**/*"],
"overrides": [
{
Expand Down
32 changes: 0 additions & 32 deletions packages/ir/.lib.swcrc

This file was deleted.

12 changes: 3 additions & 9 deletions packages/ir/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
/* eslint-disable */
import { readFileSync } from "fs";

// Reading the SWC compilation config and remove the "exclude"
// for the test files to be compiled by SWC
const { exclude: _, ...swcJestConfig } = JSON.parse(
readFileSync(`${__dirname}/.lib.swcrc`, "utf-8")
);
export default {
displayName: "ir",
preset: "../../jest.preset.js",
transform: {
"^.+\\.[tj]sx?$": ["@swc/jest", { ...swcJestConfig }],
"^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "@nrwl/react/plugins/jest",
"^.+\\.[tj]sx?$": ["babel-jest", { presets: ["@nrwl/react/babel"] }],
},
moduleFileExtensions: ["ts", "js", "html", "tsx"],
moduleFileExtensions: ["ts", "tsx", "js", "jsx"],
coverageDirectory: "../../coverage/packages/ir",
extensionsToTreatAsEsm: [".ts", ".tsx"],
};
7 changes: 5 additions & 2 deletions packages/ir/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@
"options": {
"outputPath": "dist/packages/ir",
"project": "packages/ir/package.json",
"main": "packages/ir/src/index.ts",
"entryFile": "packages/ir/src/index.ts",
"tsConfig": "packages/ir/tsconfig.lib.json",
"external": ["react/jsx-runtime"],
"rollupConfig": "@nrwl/react/plugins/bundle-rollup",
"compiler": "babel",
"assets": [],
"format": ["esm", "cjs"]
}
Expand All @@ -27,7 +30,7 @@
"executor": "@nrwl/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/ir/**/*.ts"]
"lintFilePatterns": ["packages/ir/**/*.{ts,tsx}"]
}
},
"test": {
Expand Down
14 changes: 12 additions & 2 deletions packages/ir/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@
"declaration": true,
"types": ["node"]
},
"include": ["src/**/*.ts"],
"exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"include": ["src/**/*.ts", "src/**/*.tsx"],
"exclude": [
"jest.config.ts",
"src/**/*.spec.ts",
"src/**/*.test.ts",
"src/**/*.spec.tsx",
"src/**/*.test.tsx"
]
}
2 changes: 2 additions & 0 deletions packages/ir/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"jest.config.ts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
"src/**/*.spec.tsx",
"src/**/*.d.ts"
]
}
Loading