@medway-ui/native 1.8.2 → 1.9.0

package/lib/module/editor/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["default","NoteEditor","EDITOR_PROTOCOL_VERSION","EDITOR_RECEIVE_HANDLER","isEditorMessage"],"sourceRoot":"../../../src","sources":["editor/index.ts"],"mappings":";;AAAA,SAASA,OAAO,IAAIC,UAAU,QAAQ,cAAc;AAIpD,SACEC,uBAAuB,EACvBC,sBAAsB,EACtBC,eAAe,QACV,YAAY","ignoreList":[]}
+{"version":3,"names":["default","NoteEditor","EDITOR_PROTOCOL_VERSION","EDITOR_RECEIVE_HANDLER","isEditorMessage"],"sourceRoot":"../../../src","sources":["editor/index.ts"],"mappings":";;AAAA,SAASA,OAAO,IAAIC,UAAU,QAAQ,cAAc;AAKpD,SACEC,uBAAuB,EACvBC,sBAAsB,EACtBC,eAAe,QACV,YAAY","ignoreList":[]}

package/lib/typescript/editor/editorHtml.generated.d.ts

@@ -4,10 +4,10 @@
  * Single-file build of the Tiptap editor that runs inside the WebView rendered
  * by `@medway-ui/native/NoteEditor`. Regenerate with:
  *
- *   cd editor-bundle && npm install && npm run build
+ *   pnpm build:editor-bundle
  *
- * Source lives in `editor-bundle/src`. The bridge protocol it speaks is defined
- * in `../native/src/editor/protocol.ts`, which both sides compile against.
+ * Source lives in `packages/editor-bundle/src`. The bridge protocol it speaks is defined
+ * in `packages/native/src/editor/protocol.ts`, which both sides compile against.
  */
 export declare const EDITOR_HTML: string;
 //# sourceMappingURL=editorHtml.generated.d.ts.map

package/lib/typescript/editor/index.d.ts

@@ -1,6 +1,7 @@
 export { default as NoteEditor } from "./NoteEditor";
 export type { NoteEditorHandle } from "./NoteEditor";
+export type { EditorDocument } from "@medway-ui/notes-core";
 export type { WebViewMessageEvent } from "react-native-webview";
 export { EDITOR_PROTOCOL_VERSION, EDITOR_RECEIVE_HANDLER, isEditorMessage, } from "./protocol";
-export type { EditorToNativeMessage, NativeToEditorMessage, } from "./protocol";
+export type { EditorToNativeMessage, NativeToEditorMessage } from "./protocol";
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/editor/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/editor/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,YAAY,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,YAAY,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,eAAe,GAChB,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/editor/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,YAAY,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,YAAY,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,eAAe,GAChB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medway-ui/native",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "description": "Medway UI components for React Native (iOS/Android via Expo)",
   "author": "Alekcarvalho",
   "license": "MIT",
@@ -49,16 +49,8 @@
     "./setup/MedwayUiProvider.tsx",
     "./setup/global.css"
   ],
-  "scripts": {
-    "prebuild:lib": "npm --prefix .. run build:notes-core",
-    "build:lib": "bob build",
-    "pretypecheck": "npm --prefix .. run build:notes-core",
-    "typecheck": "tsc --noEmit",
-    "changeset": "changeset",
-    "version": "changeset version",
-    "release": "yarn build:lib && changeset publish"
-  },
   "dependencies": {
+    "@medway-ui/notes-core": "^0.2.1",
     "@rn-primitives/alert-dialog": "^1.0.0",
     "@rn-primitives/avatar": "^1.0.0",
     "@rn-primitives/checkbox": "^1.0.0",
@@ -74,9 +66,8 @@
     "@rn-primitives/tooltip": "^1.0.0"
   },
   "peerDependencies": {
-    "@medway-ui/core": ">=1.0.0",
+    "@medway-ui/core": "^1.0.0",
     "@medway-ui/icons": "^1.12.0",
-    "@medway-ui/notes-core": ">=0.2.0",
     "@react-native-masked-view/masked-view": ">=0.3.0",
     "@react-navigation/native": ">=6.0.0",
     "@react-navigation/native-stack": ">=6.0.0",
@@ -105,9 +96,6 @@
     "@medway-ui/core": {
       "optional": true
     },
-    "@medway-ui/notes-core": {
-      "optional": true
-    },
     "@react-native-masked-view/masked-view": {
       "optional": true
     },
@@ -122,8 +110,6 @@
     }
   },
   "devDependencies": {
-    "@changesets/changelog-github": "^0.7.0",
-    "@changesets/cli": "^2.31.1",
     "@medway-ui/icons": "^1.12.1",
     "@react-native-masked-view/masked-view": "^0.3.2",
     "@react-navigation/native": "^7.3.18",
@@ -141,6 +127,7 @@
     "react-native-svg": "^15.15.5",
     "react-native-webview": "^14.0.1",
     "tailwind-merge": "^3.2.0",
+    "tailwindcss": "^3.4",
     "typescript": "^5"
   },
   "react-native-builder-bob": {
@@ -168,7 +155,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/medway-dev/medway-ui.git",
-    "directory": "native"
+    "directory": "packages/native"
   },
   "keywords": [
     "react-native",
@@ -179,5 +166,9 @@
     "medway",
     "ios",
     "android"
-  ]
-}
+  ],
+  "scripts": {
+    "build": "bob build",
+    "typecheck": "tsc --noEmit"
+  }
+}

package/setup/babel-brownfield.js

@@ -1,68 +1,48 @@
 const fs = require('fs');
 const path = require('path');
+const { medwayUiNativeRoots, resolveMedwayUiPaths } = require('./monorepo');
 
 const DEFAULT_APP_PAGES_DIR = 'medway-ui';
 
+function isInsideNativeRoot(filename, nativeRoots) {
+  return nativeRoots.some((root) => filename.startsWith(root + path.sep));
+}
+
 function createNativeWindScopeTest(options = {}) {
   const appPagesDir = options.appPagesDir ?? DEFAULT_APP_PAGES_DIR;
   const appPagesSegment = `${path.sep}pages${path.sep}${appPagesDir}${path.sep}`;
+  const nativeRoots = medwayUiNativeRoots(options.projectRoot ?? process.cwd());
 
   return function isNativeWindScope(filename) {
     return (
       filename.includes(`${path.sep}@medway-ui${path.sep}native${path.sep}`) ||
       filename.includes(`${path.sep}medway-ui${path.sep}native${path.sep}`) ||
+      isInsideNativeRoot(filename, nativeRoots) ||
       filename.includes(`${path.sep}@rn-primitives${path.sep}`) ||
       filename.includes(appPagesSegment)
     );
   };
 }
 
-function createMedwayUiSourceTest() {
+function createMedwayUiSourceTest(projectRoot = process.cwd()) {
+  const nativeRoots = medwayUiNativeRoots(projectRoot);
+
   return function isMedwayUiSourceFile(currentFile) {
     return (
       currentFile.includes(`${path.sep}@medway-ui${path.sep}native${path.sep}`) ||
-      currentFile.includes(`${path.sep}medway-ui${path.sep}native${path.sep}`)
+      currentFile.includes(`${path.sep}medway-ui${path.sep}native${path.sep}`) ||
+      isInsideNativeRoot(currentFile, nativeRoots)
     );
   };
 }
 
 function resolveMedwayUiNativeSrc(projectRoot) {
-  const npmNativeSrc = path.join(projectRoot, 'node_modules/@medway-ui/native/src');
-
-  if (fs.existsSync(npmNativeSrc) && !isNativePackageSymlinkedToMonorepo(projectRoot)) {
-    return npmNativeSrc;
-  }
-
-  const monorepoNativeSrc = path.resolve(projectRoot, '../medway-ui/native/src');
-  if (fs.existsSync(monorepoNativeSrc)) {
-    return monorepoNativeSrc;
-  }
-
-  return npmNativeSrc;
-}
-
-function isNativePackageSymlinkedToMonorepo(projectRoot) {
-  const nativePath = path.join(projectRoot, 'node_modules/@medway-ui/native');
-
-  if (!fs.existsSync(nativePath)) {
-    return false;
-  }
-
-  try {
-    const nativeRealPath = fs.realpathSync(nativePath);
-    const monorepoNativePath = fs.realpathSync(
-      path.resolve(projectRoot, '../medway-ui/native'),
-    );
-
-    return nativeRealPath === monorepoNativePath;
-  } catch {
-    return false;
-  }
+  return resolveMedwayUiPaths(projectRoot).medwayUiNativeSrc;
 }
 
 function createMedwayUiAliasResolver(projectRoot) {
   const medwayUiNativeSrc = resolveMedwayUiNativeSrc(projectRoot);
-  const isMedwayUiSourceFile = createMedwayUiSourceTest();
+  const isMedwayUiSourceFile = createMedwayUiSourceTest(projectRoot);
 
   return function resolveMedwayUiAlias(sourcePath, currentFile) {
     if (!isMedwayUiSourceFile(currentFile) || !sourcePath.startsWith('@/')) {

package/setup/metro.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const path = require('path');
+const { detectLinkedMedwayUiRoot, resolveMedwayUiPaths } = require('./monorepo');
 
 /**
  * Subpaths whose `exports` entry points at `lib/` — the bob build output, which
@@ -107,74 +108,12 @@ function resolveBareModule(moduleName, searchRoots) {
 }
 
 /**
- * Detecta monorepo file: (`../medway-ui`) vs pacotes npm (`node_modules/@medway-ui`).
- * Prioriza npm quando o pacote não é symlink para o clone local.
- */
-function isNativePackageSymlinkedToMonorepo(projectRoot) {
-  const nativePath = path.join(projectRoot, 'node_modules/@medway-ui/native');
-
-  if (!fs.existsSync(nativePath)) {
-    return false;
-  }
-
-  try {
-    const nativeRealPath = fs.realpathSync(nativePath);
-    const monorepoNativePath = fs.realpathSync(
-      path.resolve(projectRoot, '../medway-ui/native'),
-    );
-
-    return nativeRealPath === monorepoNativePath;
-  } catch {
-    return false;
-  }
-}
-
-function detectLinkedMedwayUiRoot(projectRoot) {
-  const npmScopedRoot = 'node_modules/@medway-ui';
-  const npmNativeSrc = path.resolve(projectRoot, npmScopedRoot, 'native/src');
-
-  if (fs.existsSync(npmNativeSrc) && !isNativePackageSymlinkedToMonorepo(projectRoot)) {
-    return npmScopedRoot;
-  }
-
-  const monorepoRoot = '../medway-ui';
-  const monorepoNativeSrc = path.resolve(projectRoot, monorepoRoot, 'native/src');
-
-  if (fs.existsSync(monorepoNativeSrc)) {
-    return monorepoRoot;
-  }
-
-  if (fs.existsSync(npmNativeSrc)) {
-    return npmScopedRoot;
-  }
-
-  return monorepoRoot;
-}
-
-function resolveMedwayUiPaths(projectRoot, linkedMedwayUiRoot, nativePackageRoot) {
-  const medwayUiRoot = path.resolve(projectRoot, linkedMedwayUiRoot);
-  const linkedNativeSrc = path.resolve(medwayUiRoot, 'native/src');
-  const npmNativeSrc = path.join(nativePackageRoot, 'src');
-  const isMonorepoLink = fs.existsSync(linkedNativeSrc);
-
-  return {
-    medwayUiRoot: isMonorepoLink ? medwayUiRoot : nativePackageRoot,
-    medwayUiNativeRoot: isMonorepoLink
-      ? path.resolve(medwayUiRoot, 'native')
-      : nativePackageRoot,
-    medwayUiNativeSrc: isMonorepoLink ? linkedNativeSrc : npmNativeSrc,
-    medwayUiSharedSrc: isMonorepoLink ? path.resolve(medwayUiRoot, 'src') : null,
-    isMonorepoLink,
-  };
-}
-
-/**
- * Metro + NativeWind para @medway-ui/native (monorepo file: ou npm).
+ * Metro + NativeWind para @medway-ui/native (npm ou clone do medway-ui linkado).
  *
  * @param {import('expo/metro-config').MetroConfig} config
  * @param {object} [options]
  * @param {string} options.projectRoot
- * @param {string} [options.linkedMedwayUiRoot] - auto-detecta monorepo ou npm quando omitido
+ * @param {string} [options.linkedMedwayUiRoot] - raiz do clone do medway-ui; detectada quando omitida
  * @param {boolean} [options.resolveNativeSource=true] - aponta @medway-ui/native para src/
  */
 function withMedwayUi(config, options = {}) {
@@ -195,7 +134,7 @@ function withMedwayUi(config, options = {}) {
   } = resolveMedwayUiPaths(projectRoot, linkedMedwayUiRoot, nativePackageRoot);
 
   if (isMonorepoLink) {
-    const escapedMedwayUiRoot = medwayUiRoot.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const escapeRegex = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 
     config.watchFolders = [...(config.watchFolders ?? []), medwayUiRoot];
 
@@ -208,8 +147,8 @@ function withMedwayUi(config, options = {}) {
 
     config.resolver.blockList = [
       ...blockListArray,
-      new RegExp(`${escapedMedwayUiRoot}[\\\\/]native[\\\\/]node_modules[\\\\/].*`),
-      new RegExp(`${escapedMedwayUiRoot}[\\\\/]node_modules[\\\\/].*`),
+      new RegExp(`${escapeRegex(medwayUiNativeRoot)}[\\\\/]node_modules[\\\\/].*`),
+      new RegExp(`${escapeRegex(medwayUiRoot)}[\\\\/]node_modules[\\\\/].*`),
     ];
   }
 

package/setup/monorepo.js

@@ -0,0 +1,102 @@
+const fs = require('fs');
+const path = require('path');
+
+const NPM_MEDWAY_UI_ROOT = 'node_modules/@medway-ui';
+const OWN_NATIVE_ROOT = path.resolve(__dirname, '..');
+
+function realpathOrNull(target) {
+  try {
+    return fs.realpathSync(target);
+  } catch {
+    return null;
+  }
+}
+
+/** Same lookup as Node: the closest node_modules up from the app, so a hoisted install is found too. */
+function findInstalledNative(projectRoot) {
+  for (let dir = path.resolve(projectRoot); ; dir = path.dirname(dir)) {
+    const nativeRoot = realpathOrNull(path.join(dir, 'node_modules', '@medway-ui', 'native'));
+    if (nativeRoot) return nativeRoot;
+    if (path.dirname(dir) === dir) return null;
+  }
+}
+
+function findWorkspaceRoot(fromDir) {
+  for (let dir = fromDir; ; dir = path.dirname(dir)) {
+    if (fs.existsSync(path.join(dir, 'pnpm-workspace.yaml'))) return dir;
+    if (path.dirname(dir) === dir) return null;
+  }
+}
+
+function isMedwayUiClone(dir) {
+  return fs.existsSync(path.join(dir, 'packages', 'native', 'src'));
+}
+
+/**
+ * The medway-ui clone the app links to (`file:`/`link:` symlink), relative to the app, or
+ * `node_modules/@medway-ui` for an npm install. An npm copy always resolves inside a
+ * node_modules folder; a linked clone never does, whatever its folder is called.
+ */
+function detectLinkedMedwayUiRoot(projectRoot) {
+  const nativeRoot = findInstalledNative(projectRoot);
+  if (nativeRoot && !nativeRoot.split(path.sep).includes('node_modules')) {
+    const cloneRoot = findWorkspaceRoot(nativeRoot);
+    if (cloneRoot && isMedwayUiClone(cloneRoot)) {
+      return path.relative(projectRoot, cloneRoot) || '.';
+    }
+  }
+  return NPM_MEDWAY_UI_ROOT;
+}
+
+function resolveMedwayUiPaths(
+  projectRoot,
+  linkedMedwayUiRoot = detectLinkedMedwayUiRoot(projectRoot),
+  nativePackageRoot = OWN_NATIVE_ROOT,
+) {
+  const cloneRoot = path.resolve(projectRoot, linkedMedwayUiRoot);
+
+  // node_modules/@medway-ui (npm) and pre-monorepo clones keep the shape apps already build with.
+  const flatNativeRoot = path.join(cloneRoot, 'native');
+  if (fs.existsSync(path.join(flatNativeRoot, 'src'))) {
+    return {
+      medwayUiRoot: cloneRoot,
+      medwayUiNativeRoot: flatNativeRoot,
+      medwayUiNativeSrc: path.join(flatNativeRoot, 'src'),
+      medwayUiSharedSrc: path.join(cloneRoot, 'src'),
+      isMonorepoLink: true,
+    };
+  }
+
+  if (isMedwayUiClone(cloneRoot)) {
+    const nativeRoot = path.join(cloneRoot, 'packages', 'native');
+    return {
+      medwayUiRoot: cloneRoot,
+      medwayUiNativeRoot: nativeRoot,
+      medwayUiNativeSrc: path.join(nativeRoot, 'src'),
+      medwayUiSharedSrc: path.join(cloneRoot, 'packages', 'core', 'src'),
+      isMonorepoLink: true,
+    };
+  }
+
+  return {
+    medwayUiRoot: nativePackageRoot,
+    medwayUiNativeRoot: nativePackageRoot,
+    medwayUiNativeSrc: path.join(nativePackageRoot, 'src'),
+    medwayUiSharedSrc: null,
+    isMonorepoLink: false,
+  };
+}
+
+/** Real folders of @medway-ui/native for this app: the npm copy and, when linked, the clone's. */
+function medwayUiNativeRoots(projectRoot) {
+  const roots = [OWN_NATIVE_ROOT, resolveMedwayUiPaths(projectRoot).medwayUiNativeRoot]
+    .map((root) => realpathOrNull(root) ?? root);
+  return [...new Set(roots)];
+}
+
+module.exports = {
+  NPM_MEDWAY_UI_ROOT,
+  detectLinkedMedwayUiRoot,
+  resolveMedwayUiPaths,
+  medwayUiNativeRoots,
+};

package/setup/tailwind.js

@@ -1,5 +1,5 @@
-const fs = require('fs');
 const path = require('path');
+const { resolveMedwayUiPaths } = require('./monorepo');
 
 function loadDesignTokens(projectRoot) {
   const tokensPath = require.resolve('@medway-ui/core/tokens', {
@@ -70,7 +70,7 @@ function createNativeMontserratFontPlugin() {
  * @param {object} [options]
  * @param {string} options.projectRoot - raiz do app consumidor
  * @param {string[]} [options.content] - globs extras (ex.: telas migradas)
- * @param {string} [options.linkedMedwayUiRoot] - monorepo file: (ex.: '../medway-ui')
+ * @param {string} [options.linkedMedwayUiRoot] - clone do medway-ui (ex.: '../medway-ui')
  */
 function createMedwayUiTailwindConfig(options = {}) {
   const { projectRoot = process.cwd(), content = [], linkedMedwayUiRoot } = options;
@@ -92,14 +92,13 @@ function createMedwayUiTailwindConfig(options = {}) {
   ];
 
   if (linkedMedwayUiRoot) {
-    const linkedNativeSrc = path.resolve(
+    const { medwayUiNativeSrc, isMonorepoLink } = resolveMedwayUiPaths(
       projectRoot,
       linkedMedwayUiRoot,
-      'native/src',
     );
 
-    if (fs.existsSync(linkedNativeSrc)) {
-      libContent.push(path.join(linkedNativeSrc, '**/*.{ts,tsx}'));
+    if (isMonorepoLink) {
+      libContent.push(path.join(medwayUiNativeSrc, '**/*.{ts,tsx}'));
     }
   }