Skip to content
Merged
Show file tree
Hide file tree
Changes from 17 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
5 changes: 5 additions & 0 deletions .changeset/breezy-vans-hide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@equinor/mad-components": patch
---

Reworked the animations for the DotProgress component. Should be much smoother now
3 changes: 1 addition & 2 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
"linked": [],
"access": "public",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": ["@equinor/mad-chronicles", "tsconfig"]
"updateInternalDependencies": "patch"
}
7 changes: 7 additions & 0 deletions .changeset/cool-pumpkins-clap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@equinor/mad-components": minor
---

- **BREAKING CHANGE**: Changed name of `Theme` typing to `Token`
- `useToken` no longer calculates the correctly themed token on every mount. This should come with
some nice performance increases
5 changes: 5 additions & 0 deletions .changeset/polite-cougars-study.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@equinor/react-native-skia-draw": patch
---

Change underlying gesture engine to react native gesture handler + react native reanimated
11 changes: 11 additions & 0 deletions .changeset/proud-drinks-whisper.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
"@equinor/react-native-mad-tag-ocr": minor
"@equinor/mad-components": minor
"@equinor/mad-navigation": minor
"@equinor/react-native-skia-draw": minor
"@equinor/mad-chronicles": minor
"@equinor/mad-toast": minor
"@equinor/mad-core": minor
---

Changed dependencies to requrie Expo 52 compatable versions
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- name: Replace workspace dependencies
run: |
find . -type d -name node_modules -prune -o -name "package.json" -type f -exec sed -i "" -e 's/workspace:\*/\*/g' {} +
find . -type d -name node_modules -prune -o -name "package.json" -type f -exec sed -i "" -e 's/workspace:\*/\*/g' {} +

- name: 🦋 Create Release Pull Request
id: changesets
Expand Down
26 changes: 26 additions & 0 deletions .syncpackrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"versionGroups": [
{
"label": "Require workspace protocol for internal packages",
"dependencies": [
"$LOCAL"
],
"dependencyTypes": [
"prod",
"dev"
],
"pinVersion": "workspace:*"
},
{
"label": "React Native MSAL is fetched from local github",
"dependencies": [
"react-native-msal"
],
"dependencyTypes": [
"prod",
"dev"
],
"specifierTypes": "hosted-git"
}
]
}
2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodeLinker: node-modules
nodeLinker: node-modules
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ This is a monorepo collecting many of the packages used in the Mobile Applicatio

[![SCM Compliance](https://scm-compliance-api.radix.equinor.com/repos/equinor/mad/badge)](https://scm-compliance-api.radix.equinor.com/repos/equinor/mad/badge)


## 📦 Apps and packages:

| App / Package | Description | Status |
Expand All @@ -28,8 +27,8 @@ This is a monorepo collecting many of the packages used in the Mobile Applicatio

### ⏱️ Getting started

This turborepo uses [yarn](https://classic.yarnpkg.com/) as a package manager. Start by cloning the repository
and run
This turborepo uses [yarn](https://classic.yarnpkg.com/) as a package manager. Start by cloning the
repository and run

```
npm install -g yarn
Expand Down
18 changes: 10 additions & 8 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
### If you discover a security vulnerability in this project, please follow these steps to responsibly disclose it:

1. **Do not** create a public GitHub issue for the vulnerability.
2. Follow our guideline for Responsible Disclosure Policy at [https://www.equinor.com/about-us/csirt](https://www.equinor.com/about-us/csirt) to report the issue
2. Follow our guideline for Responsible Disclosure Policy at
[https://www.equinor.com/about-us/csirt](https://www.equinor.com/about-us/csirt) to report the
issue

### The following information will help us triage your report more quickly:

- Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
- Full paths of source file(s) related to the manifestation of the issue
- The location of the affected source code (tag/branch/commit or direct URL)
- Any special configuration required to reproduce the issue
- Step-by-step instructions to reproduce the issue
- Proof-of-concept or exploit code (if possible)
- Impact of the issue, including how an attacker might exploit the issue
- Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
- Full paths of source file(s) related to the manifestation of the issue
- The location of the affected source code (tag/branch/commit or direct URL)
- Any special configuration required to reproduce the issue
- Step-by-step instructions to reproduce the issue
- Proof-of-concept or exploit code (if possible)
- Impact of the issue, including how an attacker might exploit the issue

We prefer all communications to be in English.
67 changes: 33 additions & 34 deletions apps/chronicles/.detoxrc.js
Original file line number Diff line number Diff line change
@@ -1,41 +1,40 @@
/** @type {Detox.DetoxConfig} */
module.exports = {
logger: {
level: process.env.CI ? 'debug' : undefined,
},
testRunner: {
$0: 'jest',
args: {
config: 'e2e/jest.config.js',
_: ['e2e'],
logger: {
level: process.env.CI ? "debug" : undefined,
},
},
artifacts: {
plugins: {
log: process.env.CI ? 'failing' : undefined,
screenshot: 'failing',
testRunner: {
$0: "jest",
args: {
config: "e2e/jest.config.js",
_: ["e2e"],
},
},
},
apps: {
'ios.release': {
type: 'ios.app',
build:
'xcodebuild -workspace ios/chronicles.xcworkspace -scheme chronicles -configuration Release -sdk iphonesimulator -arch x86_64 -derivedDataPath ios/build',
binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/chronicles.app',
artifacts: {
plugins: {
log: process.env.CI ? "failing" : undefined,
screenshot: "failing",
},
},
},
devices: {
simulator: {
type: 'ios.simulator',
device: {
type: 'iPhone 15',
},
apps: {
"ios.release": {
type: "ios.app",
build: "xcodebuild -workspace ios/chronicles.xcworkspace -scheme chronicles -configuration Release -sdk iphonesimulator -arch x86_64 -derivedDataPath ios/build",
binaryPath: "ios/build/Build/Products/Release-iphonesimulator/chronicles.app",
},
},
},
configurations: {
'ios.release': {
device: 'simulator',
app: 'ios.release',
devices: {
simulator: {
type: "ios.simulator",
device: {
type: "iPhone 15",
},
},
},
},
};
configurations: {
"ios.release": {
device: "simulator",
app: "ios.release",
},
},
};
1 change: 1 addition & 0 deletions apps/chronicles/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"name": "chronicles",
"slug": "chronicles",
"version": "1.0.0",
"newArchEnabled": false,
"icon": "./assets/images/icon.png",
"scheme": "chronicles",
"userInterfaceStyle": "automatic",
Expand Down
1 change: 1 addition & 0 deletions apps/chronicles/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module.exports = function (api) {
return {
presets: ["babel-preset-expo"],
plugins: [
"@babel/plugin-proposal-export-namespace-from",
// Reanimated has to be listed last!
"react-native-reanimated/plugin",
],
Expand Down
6 changes: 3 additions & 3 deletions apps/chronicles/e2e/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ module.exports = {
maxWorkers: 1,
setupFiles: ["<rootDir>/e2e/helpers.js"],
globalSetup: "detox/runners/jest/globalSetup",
globalTeardown: "detox/runners/jest/globalTeardown",
reporters: ["detox/runners/jest/reporter"],
testEnvironment: "detox/runners/jest/testEnvironment",
globalTeardown: "detox/runners/jest/globalTeardown",
reporters: ["detox/runners/jest/reporter"],
testEnvironment: "detox/runners/jest/testEnvironment",
verbose: true,
};
3 changes: 2 additions & 1 deletion apps/chronicles/metro.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// Learn more https://docs.expo.io/guides/customizing-metro

const { getDefaultConfig } = require("expo/metro-config");
const { wrapWithReanimatedMetroConfig } = require("react-native-reanimated/metro-config");
const path = require("path");

// Find the project and workspace directories
Expand All @@ -20,4 +21,4 @@ config.resolver.nodeModulesPaths = [
path.resolve(monorepoRoot, "node_modules"),
];

module.exports = config;
module.exports = wrapWithReanimatedMetroConfig(config);
98 changes: 50 additions & 48 deletions apps/chronicles/package.json
Original file line number Diff line number Diff line change
@@ -1,72 +1,74 @@
{
"name": "@equinor/mad-chronicles",
"version": "1.1.1",
"main": "index.js",
"scripts": {
"start": "npx expo start --dev-client",
"android": "npx expo run:android",
"dev": "npx expo run:ios",
"web": "npx expo start --web",
"build": "npx expo prebuild --platform ios && rm -f ./ios/.xcode.env.local",
"docker": "npx expo export -p web",
"ios": "npx expo run:ios",
"lint": "tsc --noEmit && eslint .",
"clean": "rm -rf node_modules ios .turbo .expo",
"detox:build": "npx detox build --configuration ios.release",
"detox:test": "npx detox test --configuration ios.release",
"use:dev": "sed -i \"s/currentEnvironment: \".*\"/currentEnvironment: \\\"dev\\\",/g\" mad.config.ts",
"use:test": "sed -i \"s/currentEnvironment: \".*\"/currentEnvironment: \\\"test\\\",/g\" mad.config.ts",
"use:prod": "sed -i \"s/currentEnvironment: \".*\"/currentEnvironment: \\\"prod\\\",/g\" mad.config.ts"
},
"dependencies": {
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
"@equinor/mad-auth": "workspace:*",
"@equinor/mad-components": "workspace:*",
"@equinor/mad-core": "workspace:*",
"@equinor/mad-dfw": "workspace:*",
"@equinor/mad-navigation": "workspace:*",
"@equinor/react-native-skia-draw": "workspace:*",
"@expo/metro-runtime": "~3.2.1",
"@expo/metro-runtime": "~4.0.0",
"@expo/vector-icons": "^14.0.2",
"@react-native-async-storage/async-storage": "^1.19.3",
"@react-native-async-storage/async-storage": "^2.1.0",
"@react-navigation/bottom-tabs": "^6.6.0",
"@react-navigation/native": "^6.1.17",
"@react-navigation/native-stack": "^6.10.0",
"@shopify/react-native-skia": "1.2.3",
"expo": "~51.0.17",
"expo-asset": "~10.0.10",
"expo-auth-session": "~5.5.2",
"expo-constants": "~16.0.2",
"expo-crypto": "~13.0.2",
"expo-device": "~6.0.2",
"expo-font": "~12.0.7",
"expo-image-picker": "~15.0.6",
"expo-linking": "~6.3.1",
"expo-localization": "~15.0.3",
"expo-splash-screen": "~0.27.5",
"expo-status-bar": "~1.12.1",
"expo-system-ui": "~3.0.6",
"expo-web-browser": "~13.0.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.74.2",
"@shopify/react-native-skia": "1.5.0",
"expo": "^52.0.7",
"expo-asset": "~11.0.1",
"expo-auth-session": "~6.0.0",
"expo-constants": "~17.0.3",
"expo-crypto": "~14.0.1",
"expo-device": "~7.0.1",
"expo-font": "~13.0.1",
"expo-image-picker": "~16.0.2",
"expo-linking": "~7.0.2",
"expo-localization": "~16.0.0",
"expo-splash-screen": "~0.29.10",
"expo-status-bar": "~2.0.0",
"expo-system-ui": "~4.0.3",
"expo-web-browser": "~14.0.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-native": "0.76.2",
"react-native-device-info": "^10.9.0",
"react-native-gesture-handler": "~2.16.1",
"react-native-gesture-handler": "~2.20.2",
"react-native-msal": "git+https://github.com/equinor/react-native-msal.git#db8a2031d6464208c0f9afb5b40e218f9e607de0",
"react-native-reanimated": "~3.10.1",
"react-native-safe-area-context": "4.10.1",
"react-native-screens": "3.31.1",
"react-native-svg": "15.2.0",
"react-native-web": "~0.19.10"
"react-native-reanimated": "~3.16.1",
"react-native-safe-area-context": "4.12.0",
"react-native-screens": "~4.0.0",
"react-native-svg": "15.8.0",
"react-native-web": "~0.19.13"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/core": "^7.25.2",
"@config-plugins/detox": "^8.0.0",
"@equinor/eslint-config-mad": "*",
"@types/react": "~18.2.45",
"@equinor/eslint-config-mad": "workspace:*",
"@types/react": "~18.3.12",
"detox": "^20.23.0",
"jest": "^29.2.1",
"eslint": "^8.46.0",
"jest": "^29.7.0",
"react-test-renderer": "18.2.0",
"typescript": "~5.3.3"
},
"private": true
"main": "index.js",
"private": true,
"scripts": {
"android": "npx expo run:android",
"build": "npx expo prebuild --platform ios && rm -f ./ios/.xcode.env.local",
"clean": "rm -rf node_modules ios .turbo .expo",
"detox:build": "npx detox build --configuration ios.release",
"detox:test": "npx detox test --configuration ios.release",
"dev": "npx expo run:ios",
"docker": "npx expo export -p web",
"ios": "npx expo run:ios",
"lint": "tsc --noEmit && eslint .",
"start": "npx expo start --dev-client",
"use:dev": "sed -i \"s/currentEnvironment: \".*\"/currentEnvironment: \\\"dev\\\",/g\" mad.config.ts",
"use:prod": "sed -i \"s/currentEnvironment: \".*\"/currentEnvironment: \\\"prod\\\",/g\" mad.config.ts",
"use:test": "sed -i \"s/currentEnvironment: \".*\"/currentEnvironment: \\\"test\\\",/g\" mad.config.ts",
"web": "npx expo start --web"
}
}
Loading
Loading