From 52481c05f165339296259b5642e0a68cfa55c767 Mon Sep 17 00:00:00 2001 From: M-i-k-e-l Date: Sun, 16 Nov 2025 15:28:22 +0200 Subject: [PATCH] Fix docs and web --- demo/package.json | 2 +- docuilib/package.json | 4 +- docuilib/plugins/uilib.js | 36 ++-- docuilib/yarn.lock | 422 ++++---------------------------------- expoDemo/package.json | 4 +- package.json | 4 +- webDemo/package.json | 2 +- webDemo/webpack.config.js | 7 +- yarn.lock | 12 +- 9 files changed, 82 insertions(+), 411 deletions(-) diff --git a/demo/package.json b/demo/package.json index 6a385b4bd0..311ebf6435 100644 --- a/demo/package.json +++ b/demo/package.json @@ -18,7 +18,7 @@ "light-date": "^1.2.0" }, "devDependencies": { - "react-native-ui-lib": "7.46.3-snapshot.7352", + "react-native-ui-lib": "7.46.3-snapshot.7426", "shell-utils": "^1.0.10" }, "peerDependencies": { diff --git a/docuilib/package.json b/docuilib/package.json index 9fbeb3bb18..97cb5ef311 100644 --- a/docuilib/package.json +++ b/docuilib/package.json @@ -43,12 +43,12 @@ "@types/react": "18.3.24", "@types/react-helmet": "^6.1.2", "@types/react-router-dom": "^5.1.8", - "metro-react-native-babel-preset": "0.77.3", + "metro-react-native-babel-preset": "^0.77.0", "react": "18.3.1", "react-dom": "18.3.1", "react-native-linear-gradient": "2.6.2", "react-native-shimmer-placeholder": "^2.0.9", - "react-native-ui-lib": "7.46.3-snapshot.7352", + "react-native-ui-lib": "7.46.3-snapshot.7426", "shell-utils": "^1.0.10", "typescript": "~5.2.2" }, diff --git a/docuilib/plugins/uilib.js b/docuilib/plugins/uilib.js index f1ce054d11..ae902939b2 100644 --- a/docuilib/plugins/uilib.js +++ b/docuilib/plugins/uilib.js @@ -2,24 +2,28 @@ const path = require('path'); const webpack = require('webpack'); module.exports = ({siteDir}, _options) => { + // RN modules that must be transpiled (regardless of hoisted location) + const rnModules = [ + 'react-native-web', + 'react-native-ui-lib', + 'react-native-reanimated', + 'react-native-shimmer-placeholder', + 'react-native-linear-gradient' + ]; + const makeNodeModulesRegex = (name) => new RegExp(`node_modules[\\\\/]${name}[\\\\/]`); + + // Absolute paths (when packages are installed inside docuilib) + const inSiteNodeModules = rnModules.map(m => path.resolve(siteDir, 'node_modules', m)); + // Regex match to also catch hoisted locations (e.g. root/node_modules) + const hoistedNodeModulesRegexes = rnModules.map(makeNodeModulesRegex); + const baseProjectSource = [ + // Project sources path.resolve(siteDir, 'src'), - path.resolve(siteDir, 'node_modules/react-native-web'), - path.resolve(siteDir, 'node_modules/react-native-ui-lib'), - path.resolve(siteDir, 'node_modules/react-native-shimmer-placeholder'), - path.resolve(siteDir, 'node_modules/react-native-reanimated'), - path.resolve(siteDir, 'node_modules/react-native-linear-gradient') - // just for not getting warnings - // path.resolve(siteDir, 'node_modules/react-native-haptic-feedback'), - // path.resolve(siteDir, 'node_modules/react-native-animatable'), - // path.resolve(siteDir, 'node_modules/react-native-svg'), - // path.resolve(siteDir, 'node_modules/react-native-svg-transformer'), - // path.resolve(siteDir, 'node_modules/@react-native-community/netinfo'), - // path.resolve(siteDir, 'node_modules/@react-native-community/datetimepicker'), - // path.resolve(siteDir, 'node_modules/react-native-color'), - - // path.resolve(siteDir, 'node_modules/postcss'), - // path.resolve(siteDir, 'node_modules/postcss-js') + // Specific absolute locations + ...inSiteNodeModules, + // And any hoisted locations matching these node_modules + ...hoistedNodeModulesRegexes ]; const useBabelForRN = { diff --git a/docuilib/yarn.lock b/docuilib/yarn.lock index 34d8ec8b8b..7cd47bd3a0 100644 --- a/docuilib/yarn.lock +++ b/docuilib/yarn.lock @@ -216,7 +216,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.0, @babel/code-frame@npm:^7.26.2, @babel/code-frame@npm:^7.8.3": +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.26.2, @babel/code-frame@npm:^7.8.3": version: 7.26.2 resolution: "@babel/code-frame@npm:7.26.2" dependencies: @@ -227,44 +227,14 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.26.8": +"@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.26.0, @babel/compat-data@npm:^7.26.8": version: 7.26.8 resolution: "@babel/compat-data@npm:7.26.8" checksum: 1bb04c6860c8c9555b933cb9c3caf5ef1dac331a37a351efb67956fc679f695d487aea76e792dd43823702c1300f7906f2a298e50b4a8d7ec199ada9c340c365 languageName: node linkType: hard -"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.9, @babel/compat-data@npm:^7.26.0": - version: 7.26.2 - resolution: "@babel/compat-data@npm:7.26.2" - checksum: d52fae9b0dc59b409d6005ae6b172e89329f46d68136130065ebe923a156fc633e0f1c8600b3e319b9e0f99fd948f64991a5419e2e9431d00d9d235d5f7a7618 - languageName: node - linkType: hard - -"@babel/core@npm:^7.12.3, @babel/core@npm:^7.21.3, @babel/core@npm:^7.25.9": - version: 7.26.0 - resolution: "@babel/core@npm:7.26.0" - dependencies: - "@ampproject/remapping": ^2.2.0 - "@babel/code-frame": ^7.26.0 - "@babel/generator": ^7.26.0 - "@babel/helper-compilation-targets": ^7.25.9 - "@babel/helper-module-transforms": ^7.26.0 - "@babel/helpers": ^7.26.0 - "@babel/parser": ^7.26.0 - "@babel/template": ^7.25.9 - "@babel/traverse": ^7.25.9 - "@babel/types": ^7.26.0 - convert-source-map: ^2.0.0 - debug: ^4.1.0 - gensync: ^1.0.0-beta.2 - json5: ^2.2.3 - semver: ^6.3.1 - checksum: b296084cfd818bed8079526af93b5dfa0ba70282532d2132caf71d4060ab190ba26d3184832a45accd82c3c54016985a4109ab9118674347a7e5e9bc464894e6 - languageName: node - linkType: hard - -"@babel/core@npm:^7.20.0": +"@babel/core@npm:^7.12.3, @babel/core@npm:^7.20.0, @babel/core@npm:^7.21.3, @babel/core@npm:^7.25.9": version: 7.26.10 resolution: "@babel/core@npm:7.26.10" dependencies: @@ -287,20 +257,7 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.25.9, @babel/generator@npm:^7.26.0": - version: 7.26.2 - resolution: "@babel/generator@npm:7.26.2" - dependencies: - "@babel/parser": ^7.26.2 - "@babel/types": ^7.26.0 - "@jridgewell/gen-mapping": ^0.3.5 - "@jridgewell/trace-mapping": ^0.3.25 - jsesc: ^3.0.2 - checksum: 6ff850b7d6082619f8c2f518d993cf7254cfbaa20b026282cbef5c9b2197686d076a432b18e36c4d1a42721c016df4f77a8f62c67600775d9683621d534b91b4 - languageName: node - linkType: hard - -"@babel/generator@npm:^7.26.10, @babel/generator@npm:^7.27.0": +"@babel/generator@npm:^7.25.9, @babel/generator@npm:^7.26.10, @babel/generator@npm:^7.27.0": version: 7.27.0 resolution: "@babel/generator@npm:7.27.0" dependencies: @@ -332,7 +289,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.26.5": +"@babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.25.9, @babel/helper-compilation-targets@npm:^7.26.5": version: 7.27.0 resolution: "@babel/helper-compilation-targets@npm:7.27.0" dependencies: @@ -345,20 +302,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.25.9": - version: 7.25.9 - resolution: "@babel/helper-compilation-targets@npm:7.25.9" - dependencies: - "@babel/compat-data": ^7.25.9 - "@babel/helper-validator-option": ^7.25.9 - browserslist: ^4.24.0 - lru-cache: ^5.1.1 - semver: ^6.3.1 - checksum: 3af536e2db358b38f968abdf7d512d425d1018fef2f485d6f131a57a7bcaed32c606b4e148bb230e1508fa42b5b2ac281855a68eb78270f54698c48a83201b9b - languageName: node - linkType: hard - -"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.27.0": +"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.25.9, @babel/helper-create-class-features-plugin@npm:^7.27.0": version: 7.27.0 resolution: "@babel/helper-create-class-features-plugin@npm:7.27.0" dependencies: @@ -375,23 +319,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.25.9": - version: 7.25.9 - resolution: "@babel/helper-create-class-features-plugin@npm:7.25.9" - dependencies: - "@babel/helper-annotate-as-pure": ^7.25.9 - "@babel/helper-member-expression-to-functions": ^7.25.9 - "@babel/helper-optimise-call-expression": ^7.25.9 - "@babel/helper-replace-supers": ^7.25.9 - "@babel/helper-skip-transparent-expression-wrappers": ^7.25.9 - "@babel/traverse": ^7.25.9 - semver: ^6.3.1 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 91dd5f203ed04568c70b052e2f26dfaac7c146447196c00b8ecbb6d3d2f3b517abadb985d3321a19d143adaed6fe17f7f79f8f50e0c20e9d8ad83e1027b42424 - languageName: node - linkType: hard - "@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.25.9": version: 7.25.9 resolution: "@babel/helper-create-regexp-features-plugin@npm:7.25.9" @@ -405,22 +332,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-define-polyfill-provider@npm:^0.6.2": - version: 0.6.2 - resolution: "@babel/helper-define-polyfill-provider@npm:0.6.2" - dependencies: - "@babel/helper-compilation-targets": ^7.22.6 - "@babel/helper-plugin-utils": ^7.22.5 - debug: ^4.1.1 - lodash.debounce: ^4.0.8 - resolve: ^1.14.2 - peerDependencies: - "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 2bba965ea9a4887ddf9c11d51d740ab473bd7597b787d042c325f6a45912dfe908c2d6bb1d837bf82f7e9fa51e6ad5150563c58131d2bb85515e63d971414a9c - languageName: node - linkType: hard - -"@babel/helper-define-polyfill-provider@npm:^0.6.3": +"@babel/helper-define-polyfill-provider@npm:^0.6.2, @babel/helper-define-polyfill-provider@npm:^0.6.3": version: 0.6.4 resolution: "@babel/helper-define-polyfill-provider@npm:0.6.4" dependencies: @@ -486,14 +398,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.25.7, @babel/helper-plugin-utils@npm:^7.25.9, @babel/helper-plugin-utils@npm:^7.8.0": - version: 7.25.9 - resolution: "@babel/helper-plugin-utils@npm:7.25.9" - checksum: e19ec8acf0b696756e6d84531f532c5fe508dce57aa68c75572a77798bd04587a844a9a6c8ea7d62d673e21fdc174d091c9097fb29aea1c1b49f9c6eaa80f022 - languageName: node - linkType: hard - -"@babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.26.5": +"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.25.7, @babel/helper-plugin-utils@npm:^7.25.9, @babel/helper-plugin-utils@npm:^7.26.5, @babel/helper-plugin-utils@npm:^7.8.0": version: 7.26.5 resolution: "@babel/helper-plugin-utils@npm:7.26.5" checksum: 4771fbb1711c624c62d12deabc2ed7435a6e6994b6ce09d5ede1bc1bf19be59c3775461a1e693bdd596af865685e87bb2abc778f62ceadc1b2095a8e2aa74180 @@ -513,20 +418,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-replace-supers@npm:^7.25.9": - version: 7.25.9 - resolution: "@babel/helper-replace-supers@npm:7.25.9" - dependencies: - "@babel/helper-member-expression-to-functions": ^7.25.9 - "@babel/helper-optimise-call-expression": ^7.25.9 - "@babel/traverse": ^7.25.9 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 84f40e12520b7023e52d289bf9d569a06284879fe23bbbacad86bec5d978b2669769f11b073fcfeb1567d8c547168323005fda88607a4681ecaeb4a5cdd48bb9 - languageName: node - linkType: hard - -"@babel/helper-replace-supers@npm:^7.26.5": +"@babel/helper-replace-supers@npm:^7.25.9, @babel/helper-replace-supers@npm:^7.26.5": version: 7.26.5 resolution: "@babel/helper-replace-supers@npm:7.26.5" dependencies: @@ -539,16 +431,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-simple-access@npm:^7.25.9": - version: 7.25.9 - resolution: "@babel/helper-simple-access@npm:7.25.9" - dependencies: - "@babel/traverse": ^7.25.9 - "@babel/types": ^7.25.9 - checksum: 6d96c94b88e8288d15e5352c1221486bd4f62de8c7dc7c7b9f5b107ce2c79f67fec5ed71a0476e146f1fefbbbf1d69abe35dc821d80ce01fc7f472286c342421 - languageName: node - linkType: hard - "@babel/helper-skip-transparent-expression-wrappers@npm:^7.20.0, @babel/helper-skip-transparent-expression-wrappers@npm:^7.25.9": version: 7.25.9 resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.25.9" @@ -591,16 +473,6 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.26.0": - version: 7.26.10 - resolution: "@babel/helpers@npm:7.26.10" - dependencies: - "@babel/template": ^7.26.9 - "@babel/types": ^7.26.10 - checksum: daa3689024a4fc5e024fea382915c6fb0fde15cf1b2f6093435725c79edccbef7646d4a656b199c046ff5c61846d1b3876d6096b7bf0635823de6aaff2a1e1a4 - languageName: node - linkType: hard - "@babel/helpers@npm:^7.26.10": version: 7.27.0 resolution: "@babel/helpers@npm:7.27.0" @@ -611,17 +483,6 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.25.9, @babel/parser@npm:^7.26.0, @babel/parser@npm:^7.26.2, @babel/parser@npm:^7.26.9": - version: 7.26.10 - resolution: "@babel/parser@npm:7.26.10" - dependencies: - "@babel/types": ^7.26.10 - bin: - parser: ./bin/babel-parser.js - checksum: 81f9af962aea55a2973d213dffc6191939df7eba0511ba585d23f0d838931f5fca2efb83ae382e4b9bb486f20ae1b2607cb1b8be49af89e9f011fb4355727f47 - languageName: node - linkType: hard - "@babel/parser@npm:^7.26.10, @babel/parser@npm:^7.27.0": version: 7.27.0 resolution: "@babel/parser@npm:7.27.0" @@ -1005,7 +866,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-block-scoping@npm:^7.0.0": +"@babel/plugin-transform-block-scoping@npm:^7.0.0, @babel/plugin-transform-block-scoping@npm:^7.25.9": version: 7.27.0 resolution: "@babel/plugin-transform-block-scoping@npm:7.27.0" dependencies: @@ -1016,17 +877,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-block-scoping@npm:^7.25.9": - version: 7.25.9 - resolution: "@babel/plugin-transform-block-scoping@npm:7.25.9" - dependencies: - "@babel/helper-plugin-utils": ^7.25.9 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: e869500cfb1995e06e64c9608543b56468639809febfcdd6fcf683bc0bf1be2431cacf2981a168a1a14f4766393e37bc9f7c96d25bc5b5f39a64a8a8ad0bf8e0 - languageName: node - linkType: hard - "@babel/plugin-transform-class-properties@npm:^7.25.9": version: 7.25.9 resolution: "@babel/plugin-transform-class-properties@npm:7.25.9" @@ -1252,7 +1102,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-modules-commonjs@npm:^7.0.0": +"@babel/plugin-transform-modules-commonjs@npm:^7.0.0, @babel/plugin-transform-modules-commonjs@npm:^7.25.9": version: 7.26.3 resolution: "@babel/plugin-transform-modules-commonjs@npm:7.26.3" dependencies: @@ -1264,19 +1114,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-modules-commonjs@npm:^7.25.9": - version: 7.25.9 - resolution: "@babel/plugin-transform-modules-commonjs@npm:7.25.9" - dependencies: - "@babel/helper-module-transforms": ^7.25.9 - "@babel/helper-plugin-utils": ^7.25.9 - "@babel/helper-simple-access": ^7.25.9 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 4f101f0ea4a57d1d27a7976d668c63a7d0bbb0d9c1909d8ac43c785fd1496c31e6552ffd9673730c088873df1bc64f1cc4aad7c3c90413ac5e80b33e336d80e4 - languageName: node - linkType: hard - "@babel/plugin-transform-modules-systemjs@npm:^7.25.9": version: 7.25.9 resolution: "@babel/plugin-transform-modules-systemjs@npm:7.25.9" @@ -1560,7 +1397,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-runtime@npm:^7.0.0": +"@babel/plugin-transform-runtime@npm:^7.0.0, @babel/plugin-transform-runtime@npm:^7.25.9": version: 7.26.10 resolution: "@babel/plugin-transform-runtime@npm:7.26.10" dependencies: @@ -1576,22 +1413,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-runtime@npm:^7.25.9": - version: 7.25.9 - resolution: "@babel/plugin-transform-runtime@npm:7.25.9" - dependencies: - "@babel/helper-module-imports": ^7.25.9 - "@babel/helper-plugin-utils": ^7.25.9 - babel-plugin-polyfill-corejs2: ^0.4.10 - babel-plugin-polyfill-corejs3: ^0.10.6 - babel-plugin-polyfill-regenerator: ^0.6.1 - semver: ^6.3.1 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: db7f20a7a7324dbfe3b43a09f0095c69dadcf8b08567fa7c7fa6e245d97c66cdcdc330e97733b7589261c0e1046bc5cc36741b932ac5dd7757374495b57e7b02 - languageName: node - linkType: hard - "@babel/plugin-transform-shorthand-properties@npm:^7.0.0, @babel/plugin-transform-shorthand-properties@npm:^7.25.9": version: 7.25.9 resolution: "@babel/plugin-transform-shorthand-properties@npm:7.25.9" @@ -1648,22 +1469,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-typescript@npm:^7.25.9": - version: 7.25.9 - resolution: "@babel/plugin-transform-typescript@npm:7.25.9" - dependencies: - "@babel/helper-annotate-as-pure": ^7.25.9 - "@babel/helper-create-class-features-plugin": ^7.25.9 - "@babel/helper-plugin-utils": ^7.25.9 - "@babel/helper-skip-transparent-expression-wrappers": ^7.25.9 - "@babel/plugin-syntax-typescript": ^7.25.9 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 6dd1303f1b9f314e22c6c54568a8b9709a081ce97be757d4004f960e3e73d6b819e6b49cee6cf1fc8455511e41127a8b580fa34602de62d17ab8a0b2d0ccf183 - languageName: node - linkType: hard - -"@babel/plugin-transform-typescript@npm:^7.5.0": +"@babel/plugin-transform-typescript@npm:^7.25.9, @babel/plugin-transform-typescript@npm:^7.5.0": version: 7.27.0 resolution: "@babel/plugin-transform-typescript@npm:7.27.0" dependencies: @@ -1867,7 +1673,7 @@ __metadata: languageName: node linkType: hard -"@babel/template@npm:^7.0.0, @babel/template@npm:^7.27.0": +"@babel/template@npm:^7.0.0, @babel/template@npm:^7.25.9, @babel/template@npm:^7.26.9, @babel/template@npm:^7.27.0": version: 7.27.0 resolution: "@babel/template@npm:7.27.0" dependencies: @@ -1878,33 +1684,7 @@ __metadata: languageName: node linkType: hard -"@babel/template@npm:^7.25.9, @babel/template@npm:^7.26.9": - version: 7.26.9 - resolution: "@babel/template@npm:7.26.9" - dependencies: - "@babel/code-frame": ^7.26.2 - "@babel/parser": ^7.26.9 - "@babel/types": ^7.26.9 - checksum: 32259298c775e543ab994daff0c758b3d6a184349b146d6497aa46cec5907bc47a6bc09e7295a81a5eccfbd023d4811a9777cb5d698d582d09a87cabf5b576e7 - languageName: node - linkType: hard - -"@babel/traverse@npm:^7.25.9": - version: 7.25.9 - resolution: "@babel/traverse@npm:7.25.9" - dependencies: - "@babel/code-frame": ^7.25.9 - "@babel/generator": ^7.25.9 - "@babel/parser": ^7.25.9 - "@babel/template": ^7.25.9 - "@babel/types": ^7.25.9 - debug: ^4.3.1 - globals: ^11.1.0 - checksum: 901d325662ff1dd9bc51de00862e01055fa6bc374f5297d7e3731f2f0e268bbb1d2141f53fa82860aa308ee44afdcf186a948f16c83153927925804b95a9594d - languageName: node - linkType: hard - -"@babel/traverse@npm:^7.26.10, @babel/traverse@npm:^7.26.5, @babel/traverse@npm:^7.27.0": +"@babel/traverse@npm:^7.25.9, @babel/traverse@npm:^7.26.10, @babel/traverse@npm:^7.26.5, @babel/traverse@npm:^7.27.0": version: 7.27.0 resolution: "@babel/traverse@npm:7.27.0" dependencies: @@ -1919,17 +1699,7 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.12.6, @babel/types@npm:^7.21.3, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0, @babel/types@npm:^7.26.10, @babel/types@npm:^7.26.9, @babel/types@npm:^7.4.4": - version: 7.26.10 - resolution: "@babel/types@npm:7.26.10" - dependencies: - "@babel/helper-string-parser": ^7.25.9 - "@babel/helper-validator-identifier": ^7.25.9 - checksum: 07340068ea3824dcaccf702dfc9628175c9926912ad6efba182d8b07e20953297d0a514f6fb103a61b9d5c555c8b87fc2237ddb06efebe14794eefc921dfa114 - languageName: node - linkType: hard - -"@babel/types@npm:^7.24.7, @babel/types@npm:^7.27.0": +"@babel/types@npm:^7.12.6, @babel/types@npm:^7.21.3, @babel/types@npm:^7.24.7, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.10, @babel/types@npm:^7.27.0, @babel/types@npm:^7.4.4": version: 7.27.0 resolution: "@babel/types@npm:7.27.0" dependencies: @@ -3579,24 +3349,13 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*": - version: 18.3.11 - resolution: "@types/react@npm:18.3.11" +"@types/react@npm:*, @types/react@npm:18.3.24": + version: 18.3.24 + resolution: "@types/react@npm:18.3.24" dependencies: "@types/prop-types": "*" csstype: ^3.0.2 - checksum: 6cbf36673b64e758dd61b16c24139d015f58530e0d476777de26ba83f24b55e142fbf64e3b8f6b3c7b05ed9ba548551b2a62d9ffb0f95743d0a368646a619163 - languageName: node - linkType: hard - -"@types/react@npm:^17.0.14": - version: 17.0.83 - resolution: "@types/react@npm:17.0.83" - dependencies: - "@types/prop-types": "*" - "@types/scheduler": ^0.16 - csstype: ^3.0.2 - checksum: c237dc47fc19bbe1af14ff89d0e9b749abfb95c0d9c3bca8292539f3d4a4b22c2a359db5e405cd274999a62e1a5fadc8e0eafe62ecc070ff3b2bbba89600b35e + checksum: 852fd0430d721ceb431662ac90b6b41d6473ea55d29b5d92f7a81f4c6c397eb3b26a904fdd276fb71a5fad318d0d79cc0072867024611716bfb85e6b4907ae68 languageName: node linkType: hard @@ -3616,13 +3375,6 @@ __metadata: languageName: node linkType: hard -"@types/scheduler@npm:^0.16": - version: 0.16.8 - resolution: "@types/scheduler@npm:0.16.8" - checksum: 6c091b096daa490093bf30dd7947cd28e5b2cd612ec93448432b33f724b162587fed9309a0acc104d97b69b1d49a0f3fc755a62282054d62975d53d7fd13472d - languageName: node - linkType: hard - "@types/send@npm:*": version: 0.17.4 resolution: "@types/send@npm:0.17.4" @@ -4539,21 +4291,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.0.0, browserslist@npm:^4.18.1, browserslist@npm:^4.23.0, browserslist@npm:^4.23.3, browserslist@npm:^4.24.0": - version: 4.24.0 - resolution: "browserslist@npm:4.24.0" - dependencies: - caniuse-lite: ^1.0.30001663 - electron-to-chromium: ^1.5.28 - node-releases: ^2.0.18 - update-browserslist-db: ^1.1.0 - bin: - browserslist: cli.js - checksum: de200d3eb8d6ed819dad99719099a28fb6ebeb88016a5ac42fbdc11607e910c236a84ca1b0bbf232477d4b88ab64e8ab6aa67557cdd40a73ca9c2834f92ccce0 - languageName: node - linkType: hard - -"browserslist@npm:^4.24.4": +"browserslist@npm:^4.0.0, browserslist@npm:^4.18.1, browserslist@npm:^4.23.0, browserslist@npm:^4.23.3, browserslist@npm:^4.24.0, browserslist@npm:^4.24.4": version: 4.24.4 resolution: "browserslist@npm:4.24.4" dependencies: @@ -4686,14 +4424,7 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001646, caniuse-lite@npm:^1.0.30001663": - version: 1.0.30001667 - resolution: "caniuse-lite@npm:1.0.30001667" - checksum: f3c6a40c3e4115c6e5fb46c47884d903191285d29ec8a8b092546efbc9cdedcbd7183cce72dd3cab7dfc16c4d5b2745892876b3d6dda75d4cba49f9389239aa9 - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001688": +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001646, caniuse-lite@npm:^1.0.30001688": version: 1.0.30001714 resolution: "caniuse-lite@npm:1.0.30001714" checksum: e68fbee9a115f842f0d907e033f14e8d476f965473556fb993c8870854a2608573eebf4dbc2aa5b03caa9c6224ff4afe63ea8c702566fbbcb78c369fba72395b @@ -5231,16 +4962,7 @@ __metadata: languageName: node linkType: hard -"core-js-compat@npm:^3.38.0, core-js-compat@npm:^3.38.1": - version: 3.38.1 - resolution: "core-js-compat@npm:3.38.1" - dependencies: - browserslist: ^4.23.3 - checksum: a0a5673bcd59f588f0cd0b59cdacd4712b82909738a87406d334dd412eb3d273ae72b275bdd8e8fef63fca9ef12b42ed651be139c7c44c8a1acb423c8906992e - languageName: node - linkType: hard - -"core-js-compat@npm:^3.40.0": +"core-js-compat@npm:^3.38.0, core-js-compat@npm:^3.38.1, core-js-compat@npm:^3.40.0": version: 3.41.0 resolution: "core-js-compat@npm:3.41.0" dependencies: @@ -6052,13 +5774,6 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.5.28": - version: 1.5.33 - resolution: "electron-to-chromium@npm:1.5.33" - checksum: 945916e1fbaf53cb388835822108b5f373fdd985a9fc6d3abfd5bdc8a799da28c74a1537e7bdd81033cd021132d3e7b39ecf377c6c301d1b6c2ac1382e26155d - languageName: node - linkType: hard - "electron-to-chromium@npm:^1.5.73": version: 1.5.137 resolution: "electron-to-chromium@npm:1.5.137" @@ -9173,7 +8888,7 @@ __metadata: languageName: node linkType: hard -"metro-react-native-babel-preset@npm:0.77.0": +"metro-react-native-babel-preset@npm:^0.77.0": version: 0.77.0 resolution: "metro-react-native-babel-preset@npm:0.77.0" dependencies: @@ -10086,13 +9801,6 @@ __metadata: languageName: node linkType: hard -"node-releases@npm:^2.0.18": - version: 2.0.18 - resolution: "node-releases@npm:2.0.18" - checksum: ef55a3d853e1269a6d6279b7692cd6ff3e40bc74947945101138745bfdc9a5edabfe72cb19a31a8e45752e1910c4c65c77d931866af6357f242b172b7283f5b3 - languageName: node - linkType: hard - "node-releases@npm:^2.0.19": version: 2.0.19 resolution: "node-releases@npm:2.0.19" @@ -10647,14 +10355,7 @@ __metadata: languageName: node linkType: hard -"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1, picocolors@npm:^1.1.0": - version: 1.1.0 - resolution: "picocolors@npm:1.1.0" - checksum: a64d653d3a188119ff45781dfcdaeedd7625583f45280aea33fcb032c7a0d3959f2368f9b192ad5e8aade75b74dbd954ffe3106c158509a45e4c18ab379a2acd - languageName: node - linkType: hard - -"picocolors@npm:^1.1.1": +"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1, picocolors@npm:^1.1.0, picocolors@npm:^1.1.1": version: 1.1.1 resolution: "picocolors@npm:1.1.1" checksum: e1cf46bf84886c79055fdfa9dcb3e4711ad259949e3565154b004b260cd356c5d54b31a1437ce9782624bf766272fe6b0154f5f0c744fb7af5d454d2b60db045 @@ -11170,19 +10871,7 @@ __metadata: languageName: node linkType: hard -"prism-react-renderer@npm:^2.0.6, prism-react-renderer@npm:^2.3.0": - version: 2.4.0 - resolution: "prism-react-renderer@npm:2.4.0" - dependencies: - "@types/prismjs": ^1.26.0 - clsx: ^2.0.0 - peerDependencies: - react: ">=16.0.0" - checksum: d15d944a8cbf05f7b04deecd2cf4ffb08229a6027918641b6f046cd8ab24b65ca4ebe4ac8e95a53a7d7cefb1bba8df3ce394fe4f1d75418e34fa92553dc63ef7 - languageName: node - linkType: hard - -"prism-react-renderer@npm:^2.4.1": +"prism-react-renderer@npm:^2.0.6, prism-react-renderer@npm:^2.3.0, prism-react-renderer@npm:^2.4.1": version: 2.4.1 resolution: "prism-react-renderer@npm:2.4.1" dependencies: @@ -11439,7 +11128,7 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:^18.2.0": +"react-dom@npm:18.3.1": version: 18.3.1 resolution: "react-dom@npm:18.3.1" dependencies: @@ -11604,9 +11293,9 @@ __metadata: languageName: node linkType: hard -"react-native-ui-lib@npm:snapshot": - version: 7.39.0-snapshot.6697 - resolution: "react-native-ui-lib@npm:7.39.0-snapshot.6697" +"react-native-ui-lib@npm:7.46.3-snapshot.7426": + version: 7.46.3-snapshot.7426 + resolution: "react-native-ui-lib@npm:7.46.3-snapshot.7426" dependencies: babel-plugin-transform-inline-environment-variables: ^0.0.2 color: ^3.1.0 @@ -11621,16 +11310,16 @@ __metadata: react-native-redash: ^12.0.3 semver: ^5.5.0 tinycolor2: ^1.4.2 - uilib-native: 4.5.1 url-parse: ^1.2.0 wix-react-native-text-size: 1.0.9 peerDependencies: - react: ">=17.0.1" - react-native: ">=0.64.1" - react-native-gesture-handler: ">=2.5.0" - react-native-reanimated: ">=2.0.0" + react: ">=18.3.1" + react-native: ">=0.77.3" + react-native-gesture-handler: ">=2.24.0" + react-native-reanimated: ">=3.17.5" react-native-ui-lib: "*" - checksum: 810d2a12f4383e7e14c21830999e7fd9000ed93bd096a1572524179671881069ecc3dbd0d66904bca8bccc672076f14993184bc6cc82c4fe91b0c6ae3eb6a80d + uilib-native: 5.0.0-snapshot.7390 + checksum: 3505464044b97fa9c35525fa54063e6a4f9ad116baa4e7a50718e6bb468eaf2b318fb1dbbe8a715859da0a1249f8b3f0c0211e192676e8c61eac7ff4f4f84726 languageName: node linkType: hard @@ -11708,7 +11397,7 @@ __metadata: languageName: node linkType: hard -"react@npm:^18.2.0": +"react@npm:18.3.1": version: 18.3.1 resolution: "react@npm:18.3.1" dependencies: @@ -13481,7 +13170,7 @@ __metadata: "@react-native-clipboard/clipboard": ^1.14.2 "@svgr/webpack": ^5.5.0 "@tsconfig/docusaurus": ^1.0.4 - "@types/react": ^17.0.14 + "@types/react": 18.3.24 "@types/react-helmet": ^6.1.2 "@types/react-router-dom": ^5.1.8 babel-loader: 9.2.1 @@ -13490,15 +13179,15 @@ __metadata: clsx: ^1.1.1 docusaurus-plugin-sass: ^0.2.1 file-loader: ^6.2.0 - metro-react-native-babel-preset: 0.77.0 + metro-react-native-babel-preset: ^0.77.0 prettier: 2.8.8 prism-react-renderer: ^2.4.1 - react: ^18.2.0 - react-dom: ^18.2.0 + react: 18.3.1 + react-dom: 18.3.1 react-html-parser: ^2.0.2 react-native-linear-gradient: 2.6.2 react-native-shimmer-placeholder: ^2.0.9 - react-native-ui-lib: snapshot + react-native-ui-lib: 7.46.3-snapshot.7426 react-native-web: ^0.19.12 sass: ^1.39.0 shell-utils: ^1.0.10 @@ -13508,19 +13197,6 @@ __metadata: languageName: unknown linkType: soft -"uilib-native@npm:4.5.1": - version: 4.5.1 - resolution: "uilib-native@npm:4.5.1" - dependencies: - lodash: ^4.17.21 - prop-types: ^15.5.10 - peerDependencies: - react: ">=17.0.1" - react-native: ">=0.64.1" - checksum: 2a85fe8976f50003c7eeda7c752fa12f7b9af24089b07e86b2b93505eeb0e91d1f9268b8a9166091432b39a535b676efb0eaa0a0d01e8f7f6ae33d0f06b2cf37 - languageName: node - linkType: hard - "unbox-primitive@npm:^1.0.2": version: 1.0.2 resolution: "unbox-primitive@npm:1.0.2" @@ -13705,20 +13381,6 @@ __metadata: languageName: node linkType: hard -"update-browserslist-db@npm:^1.1.0": - version: 1.1.1 - resolution: "update-browserslist-db@npm:1.1.1" - dependencies: - escalade: ^3.2.0 - picocolors: ^1.1.0 - peerDependencies: - browserslist: ">= 4.21.0" - bin: - update-browserslist-db: cli.js - checksum: 2ea11bd2562122162c3e438d83a1f9125238c0844b6d16d366e3276d0c0acac6036822dc7df65fc5a89c699cdf9f174acf439c39bedf3f9a2f3983976e4b4c3e - languageName: node - linkType: hard - "update-browserslist-db@npm:^1.1.1": version: 1.1.3 resolution: "update-browserslist-db@npm:1.1.3" diff --git a/expoDemo/package.json b/expoDemo/package.json index 286365a6c3..f607d1847b 100644 --- a/expoDemo/package.json +++ b/expoDemo/package.json @@ -27,9 +27,9 @@ "react-native-screens": "~3.20.0", "react-native-svg": "15.11.2", "react-native-svg-transformer": "1.5.0", - "react-native-ui-lib": "7.46.3-snapshot.7352", + "react-native-ui-lib": "7.46.3-snapshot.7426", "react-native-web": "~0.18.12", - "unicorn-demo-app": "7.46.3-snapshot.7352" + "unicorn-demo-app": "7.46.3-snapshot.7426" }, "devDependencies": { "@babel/core": "^7.25.2", diff --git a/package.json b/package.json index 5b9ff22e2e..d2c5718e5c 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "setimmediate": "^1.0.5", "shell-utils": "^1.0.10", "typescript": "5.0.4", - "uilib-native": "5.0.0-snapshot.7390" + "uilib-native": "5.0.0-snapshot.7426" }, "peerDependencies": { "react": ">=18.3.1", @@ -137,7 +137,7 @@ "react-native-gesture-handler": ">=2.24.0", "react-native-reanimated": ">=3.17.5", "react-native-ui-lib": "*", - "uilib-native": "5.0.0-snapshot.7390" + "uilib-native": "5.0.0-snapshot.7426" }, "jest": { "preset": "react-native", diff --git a/webDemo/package.json b/webDemo/package.json index b108cddaa9..d3cfbfa375 100644 --- a/webDemo/package.json +++ b/webDemo/package.json @@ -28,7 +28,7 @@ "react-native-shimmer-placeholder": "^2.0.8", "react-native-svg": "15.11.2", "react-native-svg-transformer": "1.5.0", - "react-native-ui-lib": "7.46.3-snapshot.7352", + "react-native-ui-lib": "7.46.3-snapshot.7426", "react-native-web": "^0.18.6", "typescript": "^4.4.2" }, diff --git a/webDemo/webpack.config.js b/webDemo/webpack.config.js index 2330d5b05b..e4cfbc4f7e 100644 --- a/webDemo/webpack.config.js +++ b/webDemo/webpack.config.js @@ -23,7 +23,10 @@ const baseProjectSource = [ path.resolve(appDirectory, 'node_modules/react-native-ui-lib'), path.resolve(appDirectory, 'node_modules/postcss'), path.resolve(appDirectory, 'node_modules/postcss-js'), - path.resolve(appDirectory, 'node_modules/uilib-native') + path.resolve(appDirectory, 'node_modules/uilib-native'), + // hoisted packages (monorepo root) + path.resolve(appDirectory, '../node_modules/uilib-native'), + path.resolve(appDirectory, '../node_modules/react-native-ui-lib') ]; const useBabelForRN = { @@ -76,6 +79,8 @@ module.exports = // This will only alias the exact import "react-native" alias: { 'react-native$': 'react-native-web', + // ensure deep imports like 'react-native-web/dist/exports/Platform' resolve to webDemo's RNW + 'react-native-web': path.resolve(appDirectory, 'node_modules/react-native-web'), '@shopify/flash-list': path.resolve(appDirectory, './src/alias/flash-list.ts'), 'react-native-fs': path.resolve(appDirectory, './src/alias/react-native-fs.ts') }, diff --git a/yarn.lock b/yarn.lock index 787f96cfc7..775f84cf79 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9777,7 +9777,7 @@ __metadata: shell-utils: ^1.0.10 tinycolor2: ^1.4.2 typescript: 5.0.4 - uilib-native: 5.0.0-snapshot.7390 + uilib-native: 5.0.0-snapshot.7426 url-parse: ^1.2.0 wix-react-native-text-size: 1.0.9 peerDependencies: @@ -9786,7 +9786,7 @@ __metadata: react-native-gesture-handler: ">=2.24.0" react-native-reanimated: ">=3.17.5" react-native-ui-lib: "*" - uilib-native: 5.0.0-snapshot.7390 + uilib-native: 5.0.0-snapshot.7426 languageName: unknown linkType: soft @@ -11344,16 +11344,16 @@ __metadata: languageName: node linkType: hard -"uilib-native@npm:5.0.0-snapshot.7390": - version: 5.0.0-snapshot.7390 - resolution: "uilib-native@npm:5.0.0-snapshot.7390" +"uilib-native@npm:5.0.0-snapshot.7426": + version: 5.0.0-snapshot.7426 + resolution: "uilib-native@npm:5.0.0-snapshot.7426" dependencies: lodash: ^4.17.21 prop-types: ^15.5.10 peerDependencies: react: ">=18.3.1" react-native: ">=0.77.3" - checksum: 745d01a2a1e33b7cf873b443e5bf3656e0e4caacaebcd0242c2feab3fecfb6433e3dfc65221acd27ee138f414c15e19a866247386ffc5ede8d735a5ea27b2ee7 + checksum: 0d65491bb9b89f795ed8ae9375cf4f5416a439cdef80dee4f8fa3119e98f5ad5904fd83b4879a8662244c599a9006c1dc64d2c12b46c1d1b41232f6986e6c921 languageName: node linkType: hard