Skip to content

Commit bc7d45b

Browse files
authored
refactor: remove runtime storybook, change swc to babel, add batiq editor as submodule (#23)
1 parent d637bb5 commit bc7d45b

34 files changed

Lines changed: 745 additions & 420 deletions

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "apps/dashboard"]
22
path = apps/dashboard
33
url = git@github.com:feedloop/batiq-dashboard.git
4+
[submodule "apps/batiq-editor"]
5+
path = apps/batiq-editor
6+
url = https://github.com/feedloop/batiq-editor

apps/batiq-editor

Submodule batiq-editor added at e10d75d

nx.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
},
6767
"library": {
6868
"style": "css",
69-
"linter": "eslint"
69+
"linter": "eslint",
70+
"unitTestRunner": "none"
7071
}
7172
}
7273
}

package.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"scripts": {},
66
"private": true,
77
"workspaces": [
8+
"apps/*",
89
"packages/*"
910
],
1011
"dependencies": {
@@ -22,12 +23,12 @@
2223
"@babel/preset-typescript": "7.12.13",
2324
"@nrwl/esbuild": "^15.9.3",
2425
"@nrwl/eslint-plugin-nx": "^15.9.3",
25-
"@nrwl/jest": "^15.9.3",
26-
"@nrwl/js": "15.9.3",
26+
"@nrwl/jest": "15.9.4",
27+
"@nrwl/js": "15.9.4",
2728
"@nrwl/linter": "^15.9.3",
28-
"@nrwl/react": "^15.9.3",
29+
"@nrwl/react": "15.9.4",
2930
"@nrwl/react-native": "15.9.3",
30-
"@nrwl/rollup": "^15.9.3",
31+
"@nrwl/rollup": "15.9.4",
3132
"@nrwl/storybook": "15.9.3",
3233
"@nrwl/vite": "^15.9.3",
3334
"@nrwl/webpack": "^15.9.3",
@@ -36,6 +37,7 @@
3637
"@react-native-community/cli": "10.2.1",
3738
"@react-native-community/cli-platform-android": "10.2.0",
3839
"@react-native-community/cli-platform-ios": "10.2.1",
40+
"@rollup/plugin-url": "^7.0.0",
3941
"@storybook/addon-essentials": "^6.5.15",
4042
"@storybook/addon-ondevice-actions": "^6.0.1-beta.11",
4143
"@storybook/addon-ondevice-backgrounds": "^6.0.1-beta.11",
@@ -50,24 +52,26 @@
5052
"@storybook/react": "^6.5.16",
5153
"@storybook/react-native": "^6.0.1-beta.11",
5254
"@storybook/test-runner": "^0.7.2",
55+
"@svgr/rollup": "^6.1.2",
5356
"@svgr/webpack": "^5.4.0",
5457
"@swc/cli": "^0.1.62",
5558
"@swc/core": "^1.3.41",
5659
"@swc/jest": "^0.2.24",
5760
"@testing-library/jest-native": "5.4.2",
58-
"@testing-library/react-native": "11.5.2",
59-
"@types/react-native": "^0.71.6",
6061
"@testing-library/react": "14.0.0",
62+
"@testing-library/react-native": "11.5.2",
6163
"@types/jest": "^29.4.0",
6264
"@types/node": "18.14.2",
6365
"@types/react": "18.0.28",
6466
"@types/react-dom": "18.0.11",
67+
"@types/react-native": "^0.71.6",
6568
"@types/react-router-dom": "5.3.3",
6669
"@typescript-eslint/eslint-plugin": "^5.36.1",
6770
"@typescript-eslint/parser": "^5.36.1",
6871
"@vitejs/plugin-react": "^3.0.0",
6972
"@vitest/coverage-c8": "~0.25.8",
7073
"@vitest/ui": "^0.25.8",
74+
"babel-jest": "^29.4.1",
7175
"babel-loader": "8.1.0",
7276
"eslint": "~8.15.0",
7377
"eslint-config-prettier": "8.1.0",
@@ -79,8 +83,10 @@
7983
"html-webpack-plugin": "^5.5.0",
8084
"jest": "^29.4.1",
8185
"jest-environment-jsdom": "^29.4.1",
86+
"jest-environment-node": "^29.4.1",
8287
"jest-file-snapshot": "^0.5.0",
8388
"jest-react-native": "18.0.0",
89+
"jsdom": "~20.0.3",
8490
"metro": "0.74.1",
8591
"metro-babel-register": "0.74.1",
8692
"metro-config": "^0.76.3",
@@ -98,7 +104,6 @@
98104
"react-native-svg": "13.8.0",
99105
"react-native-svg-transformer": "1.0.0",
100106
"react-native-url-polyfill": "^1.3.0",
101-
"jsdom": "~20.0.3",
102107
"react-test-renderer": "18.2.0",
103108
"ts-jest": "^29.0.5",
104109
"ts-node": "^10.9.1",

packages/data/src/OpenAPI.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ export const OpenAPI = async (data: DataSourceDefinitionSchema) => {
4040
const client = await api.init();
4141

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

4547
// eslint-disable-next-line prefer-const
4648
let { http, apiKey, oauth2, openIdConnect } = auth;

packages/expo-runtime/.babelrc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"presets": [
3+
[
4+
"@nrwl/react/babel",
5+
{
6+
"runtime": "automatic",
7+
"useBuiltIns": "usage"
8+
}
9+
]
10+
],
11+
"plugins": []
12+
}

packages/expo-runtime/.eslintrc.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
{
2-
"extends": ["../../.eslintrc.json"],
2+
"extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
33
"ignorePatterns": ["!**/*"],
44
"overrides": [
55
{
66
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
7-
"rules": {
8-
"@typescript-eslint/ban-types": "off"
9-
}
7+
"rules": {}
108
},
119
{
1210
"files": ["*.ts", "*.tsx"],

packages/expo-runtime/.lib.swcrc

Lines changed: 0 additions & 32 deletions
This file was deleted.

packages/expo-runtime/jest.config.ts

Lines changed: 0 additions & 17 deletions
This file was deleted.

packages/expo-runtime/project.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
"options": {
1111
"outputPath": "dist/packages/expo-runtime",
1212
"project": "packages/expo-runtime/package.json",
13-
"main": "packages/expo-runtime/src/index.ts",
13+
"entryFile": "packages/expo-runtime/src/index.ts",
1414
"tsConfig": "packages/expo-runtime/tsconfig.lib.json",
15+
"compiler": "babel",
1516
"assets": [],
1617
"format": ["esm", "cjs"],
1718
"external": [
19+
"react/jsx-runtime",
1820
"@react-navigation/native",
1921
"expo",
2022
"@react-navigation/bottom-tabs",
@@ -34,15 +36,7 @@
3436
"executor": "@nrwl/linter:eslint",
3537
"outputs": ["{options.outputFile}"],
3638
"options": {
37-
"lintFilePatterns": ["packages/expo-runtime/**/*.ts"]
38-
}
39-
},
40-
"test": {
41-
"executor": "@nrwl/jest:jest",
42-
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
43-
"options": {
44-
"jestConfig": "packages/expo-runtime/jest.config.ts",
45-
"passWithNoTests": true
39+
"lintFilePatterns": ["packages/expo-runtime/**/*.{ts,tsx}"]
4640
}
4741
}
4842
},

0 commit comments

Comments
 (0)