Merge pull request #517 from airbnb/f/fix-entrypoint

Author: mathieudutour

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This project adheres to [Semantic Versioning](http://semver.org/). Every release, along with the migration instructions, is documented on the Github [Releases](https://github.com/airbnb/react-sketchapp/releases) page.
 
+## Version 3.2.5
+
+- Fix Skpm taking the wrong entry point when requiring react-sketchapp
+
 ## Version 3.2.4
 
 - Fix the generated ES package

examples/basic-svg/package.json

@@ -16,7 +16,7 @@
   "author": "Jon Gold <jon.gold@airbnb.com>",
   "license": "MIT",
   "devDependencies": {
-    "@skpm/builder": "^0.4.0"
+    "@skpm/builder": "^0.7.5"
   },
   "dependencies": {
     "prop-types": "^15.5.8",

package.json

@@ -1,11 +1,10 @@
 {
   "name": "react-sketchapp",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "description": "A React renderer for Sketch.app",
   "sideEffects": false,
   "main": "lib/index.js",
   "module": "lib/module/index.js",
-  "sketch": "lib/module/index.sketch.js",
   "types": "lib/index.d.ts",
   "license": "MIT",
   "author": "Jon Gold <jon.gold@airbnb.com> (http://jon.gold)",

src/index.sketch.ts renamed to src/entrypoint.sketch.ts

@@ -37,5 +37,3 @@ export function makeSymbol(
 }
 
 export const TextStyles = _TextStyles(() => SketchBridge);
-
-export * from './index.common';

src/entrypoint.ts

@@ -0,0 +1,44 @@
+import { render as _render } from './render';
+import { renderToJSON as _renderToJSON } from './renderToJSON';
+import { makeSymbol as _makeSymbol, SymbolMasterProps } from './symbol';
+
+import {
+  SketchLayer,
+  WrappedSketchLayer,
+  SketchDocumentData,
+  WrappedSketchDocument,
+  SketchDocument,
+  PlatformBridge,
+} from './types';
+
+import { TextStyles as _TextStyles } from './sharedStyles/TextStyles';
+
+function getDefaultPlatformBridge() {
+  return require('./platformBridges/macos').default;
+}
+
+export function render(
+  element: React.ReactElement,
+  container?: SketchLayer | WrappedSketchLayer,
+  platformBridge: PlatformBridge = getDefaultPlatformBridge(),
+) {
+  return _render(platformBridge)(element, container);
+}
+
+export function renderToJSON(
+  element: React.ReactElement,
+  platformBridge: PlatformBridge = getDefaultPlatformBridge(),
+) {
+  return _renderToJSON(platformBridge)(element);
+}
+
+export function makeSymbol(
+  Component: React.ComponentType<any>,
+  symbolProps: string | SymbolMasterProps,
+  document: SketchDocumentData | SketchDocument | WrappedSketchDocument | undefined,
+  bridge: PlatformBridge = getDefaultPlatformBridge(),
+) {
+  return _makeSymbol(bridge)(Component, symbolProps, document);
+}
+
+export const TextStyles = _TextStyles(() => getDefaultPlatformBridge());

src/index.common.ts

@@ -1,46 +1,7 @@
-import { render as _render } from './render';
-import { renderToJSON as _renderToJSON } from './renderToJSON';
-import { makeSymbol as _makeSymbol, SymbolMasterProps } from './symbol';
+export { Platform } from './Platform';
+export { StyleSheet } from './stylesheet';
+export { getSymbolComponentByName, getSymbolMasterByName, injectSymbols } from './symbol';
+export { useWindowDimensions } from './context';
 
-import {
-  SketchLayer,
-  WrappedSketchLayer,
-  SketchDocumentData,
-  WrappedSketchDocument,
-  SketchDocument,
-  PlatformBridge,
-} from './types';
-
-import { TextStyles as _TextStyles } from './sharedStyles/TextStyles';
-
-function getDefaultPlatformBridge() {
-  return require('./platformBridges/macos').default;
-}
-
-export function render(
-  element: React.ReactElement,
-  container?: SketchLayer | WrappedSketchLayer,
-  platformBridge: PlatformBridge = getDefaultPlatformBridge(),
-) {
-  return _render(platformBridge)(element, container);
-}
-
-export function renderToJSON(
-  element: React.ReactElement,
-  platformBridge: PlatformBridge = getDefaultPlatformBridge(),
-) {
-  return _renderToJSON(platformBridge)(element);
-}
-
-export function makeSymbol(
-  Component: React.ComponentType<any>,
-  symbolProps: string | SymbolMasterProps,
-  document: SketchDocumentData | SketchDocument | WrappedSketchDocument | undefined,
-  bridge: PlatformBridge = getDefaultPlatformBridge(),
-) {
-  return _makeSymbol(bridge)(Component, symbolProps, document);
-}
-
-export const TextStyles = _TextStyles(() => getDefaultPlatformBridge());
-
-export * from './index.common';
+export * from './components';
+export * from './entrypoint';