Skip to content
Draft
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
4 changes: 2 additions & 2 deletions packages/react-native-ui-lib/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- ReactNativeUiLib (5.0.1):
- ReactNativeUiLib (5.1.0):
- React
- RNDateTimePicker (8.2.0):
- DoubleConversion
Expand Down Expand Up @@ -2195,7 +2195,7 @@ SPEC CHECKSUMS:
ReactCodegen: 7296600d988a22efad378aa9c06e930e0cc377c7
ReactCommon: 7ea8ee50e489e9cc75922f19a06ea45c1b59b4bd
ReactNativeNavigation: f5b64def1a53be435190591f9a4e1780167837e7
ReactNativeUiLib: 699cec778ce0464e2205c84f8716dd4d40bd9b4a
ReactNativeUiLib: 6a72903b74902f11cbb60cf885864191b3962a0a
RNDateTimePicker: 8fcea61ffc2b8ee230ad29c7f423dc639359780c
RNFlashList: b84542632250e04d25a4500294e32aa83d0e2e6f
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-ui-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"setimmediate": "^1.0.5",
"shell-utils": "^1.0.10",
"typescript": "5.0.4",
"uilib-native": "5.1.0-snapshot.7635"
"uilib-native": "workspace:*"
},
"peerDependencies": {
"react": ">=19.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native-ui-lib/scripts/build/build.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const childProcess = require('child_process');
const fs = require('fs');

const BABEL_OPTIONS = `--config-file ./scripts/build/.babelrc.json --extensions '.ts,.tsx' --ignore "src/**/*.d.ts,**/node_modules/**,lib/**/*.d.ts,../../lib/node_modules/**"`;
const BABEL_OPTIONS = `--config-file ./scripts/build/.babelrc.json --extensions '.ts,.tsx' --ignore "src/**/*.d.ts,**/node_modules/**,lib/**/*.d.ts,../uilib-native/node_modules/**"`;
const BABEL_INDEX_EXPORTS_OPTIONS = `--config-file ./scripts/build/.babelrc.exports.js`;

console.info('## Start RNUILib Build ##');
console.info('## Copy files from root ##');
childProcess.execSync('cp -r ../../lib ./lib'); // TODO: pretty sure we don't need this - needs to be tested
childProcess.execSync('cp -r ../uilib-native ./lib'); // TODO: pretty sure we don't need this - needs to be tested
childProcess.execSync('cp -r ../../scripts .');
childProcess.execSync('cp ../../README.md ./README.md');
childProcess.execSync('cp ../../LICENSE ./LICENSE');
Expand All @@ -22,7 +22,7 @@ console.info('## Build lib (native component) files - convert TS to JS files ##'
childProcess.execSync(`../../node_modules/.bin/babel lib --out-dir lib ${BABEL_OPTIONS}`);

console.info('## in uilib-native - Build lib (native component) files - convert TS to JS files ##');
childProcess.execSync(`../../node_modules/.bin/babel ../../lib --out-dir ../../lib ${BABEL_OPTIONS}`);
childProcess.execSync(`../../node_modules/.bin/babel ../uilib-native --out-dir ../uilib-native ${BABEL_OPTIONS}`);

console.info('## Build main index file - for lazy load exports ##');
childProcess.execSync(`../../node_modules/.bin/babel ./src/index.js -o ./src/index.js ${BABEL_INDEX_EXPORTS_OPTIONS}`);
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-ui-lib/scripts/release/release.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function tryPublishAndTag(version) {
function tagAndPublish(newVersion) {
console.log(`trying to publish ${newVersion}...`);
exec.execSync(`npm --no-git-tag-version version ${newVersion}`);
exec.execSync(`npm publish --tag ${VERSION_TAG}`);
exec.execSync(`npm publish --tag ${VERSION_TAG} --workspace react-native-ui-lib`);
if (isRelease) {
exec.execSync(`git tag -a ${newVersion} -m "${newVersion}"`);
}
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ export default class KeyboardRegistry {
*/
static registerKeyboard = (componentID: string, generator: Function, params = {}) => {
if (!_.isFunction(generator)) {
// TODO: do we want to add a util for this?
// eslint-disable-next-line no-restricted-syntax
console.error(`KeyboardRegistry.registerKeyboard: ${componentID} you must register a generator function`);
return;
}
Expand All @@ -45,7 +47,9 @@ export default class KeyboardRegistry {
*/
static getKeyboard = (componentID: string) => {
const res = KeyboardRegistry.registeredKeyboards[componentID];
if (!res || !res.generator) {
if (!res?.generator) {
// TODO: do we want to add a util for this?
// eslint-disable-next-line no-restricted-syntax
console.error(`KeyboardRegistry.getKeyboard: ${componentID} used but not yet registered`);
return undefined;
}
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
/* TODO: Once we upgrade to RN69 we should try using podspecPath again, for now I copied ReactNativeUiLib.podspec file to the root - it seems to work
I copied it, because we need it for both the main uilib and the uilib-native package */
// ios: {
// podspecPath: './lib/ReactNativeUiLib.podspec'
// podspecPath: './uilib-native/ReactNativeUiLib.podspec'
// },
android: {
sourceDir: './android/',
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function tagAndPublish(newVersion) {
if (IS_SNAPSHOT) {
exec.execSync(`npm --no-git-tag-version version ${newVersion}`);
}
exec.execSync(`npm publish --tag ${VERSION_TAG}`);
exec.execSync(`npm publish --tag ${VERSION_TAG} --workspace uilib-native`);
if (!IS_SNAPSHOT) {
exec.execSync(`git tag -a ${newVersion} -m "${newVersion}"`);
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/docs/buildDocs.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
require('./buildDocsCommon').buildDocs('./packages/react-native-ui-lib/src ./lib/components');
require('./buildDocsCommon').buildDocs('./packages/react-native-ui-lib/src ./packages/uilib-native/components');
2 changes: 1 addition & 1 deletion scripts/release/releaseNative.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

pushd lib
pushd packages/uilib-native
npm install
npm run releaseNative
popd
14 changes: 7 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9733,7 +9733,7 @@ __metadata:
shell-utils: "npm:^1.0.10"
tinycolor2: "npm:^1.4.2"
typescript: "npm:5.0.4"
uilib-native: "npm:5.1.0-snapshot.7635"
uilib-native: "workspace:*"
url-parse: "npm:^1.2.0"
wix-react-native-text-size: "npm:1.0.9"
peerDependencies:
Expand Down Expand Up @@ -11285,17 +11285,17 @@ __metadata:
languageName: node
linkType: hard

"uilib-native@npm:5.1.0-snapshot.7635":
version: 5.1.0-snapshot.7635
resolution: "uilib-native@npm:5.1.0-snapshot.7635"
"uilib-native@workspace:*, uilib-native@workspace:packages/uilib-native":
version: 0.0.0-use.local
resolution: "uilib-native@workspace:packages/uilib-native"
dependencies:
lodash: "npm:^4.17.21"
shell-utils: "npm:^1.0.10"
peerDependencies:
react: ">=19.0.0"
react-native: ">=0.78.3"
checksum: 10c0/f98238f78e3c291cda5111459dc08d3acddbf38f37f2febb6e7743f0c663c47ab9e0cb9e2558dd044710365640b6c52ada47aec925dfee1386b05fd34e7becad
languageName: node
linkType: hard
languageName: unknown
linkType: soft

"unbox-primitive@npm:^1.0.2":
version: 1.0.2
Expand Down