Skip to content

Commit

Permalink
chore: rename react navigation in rollup
Browse files Browse the repository at this point in the history
  • Loading branch information
Ahmed Elsayed committed Jul 2, 2024
1 parent d63c590 commit bfece1a
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 10 deletions.
2 changes: 1 addition & 1 deletion configs/jsactions/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,6 @@ const nativeExternal = [
/^react-native-reanimated(\/|$)/,
/^react-native-svg(\/|$)/,
/^react-native-vector-icons(\/|$)/,
/^react-navigation(\/|$)/,
/^@?react-navigation($|\/)/,
/^react-native-device-info(\/|$)/
];
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"node": ">=16"
},
"resolutions": {
"@mendix/pluggable-widgets-tools": "^9.24.0",
"@mendix/pluggable-widgets-tools": "9.24.0",
"@types/react": "^18",
"@types/react-native": "0.72.7",
"react": "18.2.0",
Expand Down
1 change: 1 addition & 0 deletions packages/jsActions/mobile-resources-native/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased]

- We have fixed an issue with checking blocked permissions on iOS
- We have fixed an issue with `useNavigation` support in widgets.

## [6.1.0] Native Mobile Resources - 2024-05-28

Expand Down
24 changes: 17 additions & 7 deletions patches/@mendix+pluggable-widgets-tools+9.24.0.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
diff --git a/node_modules/@mendix/pluggable-widgets-tools/bin/mx-scripts.js b/node_modules/@mendix/pluggable-widgets-tools/bin/mx-scripts.js
old mode 100755
new mode 100644
index ec507d5..f5bf176
index ec507d5..f5bf176 100755
--- a/node_modules/@mendix/pluggable-widgets-tools/bin/mx-scripts.js
+++ b/node_modules/@mendix/pluggable-widgets-tools/bin/mx-scripts.js
@@ -1,6 +1,6 @@
Expand All @@ -14,17 +12,29 @@ index ec507d5..f5bf176
const { red } = require("ansi-colors");
@@ -14,9 +14,10 @@ checkNodeVersion();
}

const [, currentScriptPath, cmd, ...args] = process.argv;
- const toolsRoot = currentScriptPath.endsWith("pluggable-widgets-tools")
+ const isSymlink = lstatSync(currentScriptPath).isSymbolicLink();
+ const toolsRoot = currentScriptPath.endsWith("pluggable-widgets-tools") && !isSymlink
? join(dirname(currentScriptPath), "../@mendix/pluggable-widgets-tools")
- : join(dirname(currentScriptPath), "..");
+ : isSymlink ? join(__dirname, "../") : join(dirname(currentScriptPath), "..");

if (args.indexOf("--subprojectPath") > -1) {
args.splice(args.indexOf("--subprojectPath"), 2);
diff --git a/node_modules/@mendix/pluggable-widgets-tools/configs/rollup.config.native.js b/node_modules/@mendix/pluggable-widgets-tools/configs/rollup.config.native.js
index 85165f8..aabe7af 100644
--- a/node_modules/@mendix/pluggable-widgets-tools/configs/rollup.config.native.js
+++ b/node_modules/@mendix/pluggable-widgets-tools/configs/rollup.config.native.js
@@ -277,6 +277,6 @@ const nativeExternal = [
/^react-native-fast-image($|\/)/,
/^react-native-svg($|\/)/,
/^react-native-vector-icons($|\/)/,
- /^react-navigation($|\/)/,
+ /^@?react-navigation($|\/)/,
/^react-native-safe-area-context($|\/)/
];
diff --git a/node_modules/@mendix/pluggable-widgets-tools/test-config/jest.native.config.js b/node_modules/@mendix/pluggable-widgets-tools/test-config/jest.native.config.js
index 7e604c2..62afe21 100644
--- a/node_modules/@mendix/pluggable-widgets-tools/test-config/jest.native.config.js
Expand All @@ -38,13 +48,13 @@ index 7e604c2..62afe21 100644
}
],
diff --git a/node_modules/@mendix/pluggable-widgets-tools/test-config/test-index-native.js b/node_modules/@mendix/pluggable-widgets-tools/test-config/test-index-native.js
index ac385ec..bb5affb 100644
index ac385ec..63b3871 100644
--- a/node_modules/@mendix/pluggable-widgets-tools/test-config/test-index-native.js
+++ b/node_modules/@mendix/pluggable-widgets-tools/test-config/test-index-native.js
@@ -5,6 +5,8 @@ const enableHooks = require("jest-react-hooks-shallow").default;
configureEnzyme({ adapter: new Adapter() });
enableHooks(jest);

+global.setImmediate = global.setTimeout;
+
const origConsole = console.error;
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3073,7 +3073,7 @@ __metadata:
languageName: unknown
linkType: soft

"@mendix/pluggable-widgets-tools@npm:^9.24.0":
"@mendix/pluggable-widgets-tools@npm:9.24.0":
version: 9.24.0
resolution: "@mendix/pluggable-widgets-tools@npm:9.24.0"
dependencies:
Expand Down

0 comments on commit bfece1a

Please sign in to comment.