atlassian · gwyneplaine · Sep 27, 2019 · Sep 27, 2019 · Sep 27, 2019 · Sep 27, 2019
diff --git a/.changeset/lemon-tips-sing/changes.json b/.changeset/lemon-tips-sing/changes.json
@@ -0,0 +1,10 @@
+{
+  "releases": [
+    { "name": "@extract-types/babel-plugin-extract-react-types", "type": "patch" },
+    { "name": "@extract-types/loader", "type": "patch" },
+    { "name": "@extract-types/core", "type": "patch" },
+    { "name": "@extract-types/kind2string", "type": "patch" },
+    { "name": "@extract-types/pretty-proptypes", "type": "patch" }
+  ],
+  "dependents": []
+}
diff --git a/.changeset/lemon-tips-sing/changes.md b/.changeset/lemon-tips-sing/changes.md
@@ -0,0 +1 @@
+Added @extract-types scope to packages, with slight rename for sense
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   },
   "preconstruct": {
     "packages": [
-      "packages/extract-react-types",
+      "packages/core",
       "packages/kind2string",
       "packages/pretty-proptypes"
     ]

diff --git a/packages/babel-plugin-extract-react-types/index.js b/packages/babel-plugin-extract-react-types/index.js
@@ -1,4 +1,4 @@
-const { findExportedComponents } = require('extract-react-types');
+const { findExportedComponents } = require('@extract-types/core');
 
 module.exports = babel => {
   let t = babel.types;

diff --git a/packages/babel-plugin-extract-react-types/package.json b/packages/babel-plugin-extract-react-types/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "babel-plugin-extract-react-types",
+  "name": "@extract-types/babel-plugin-extract-react-types",
   "version": "0.1.6",
   "main": "index.js",
   "license": "MIT",
@@ -17,7 +17,7 @@
   ],
   "author": "Mitchell Hamilton",
   "dependencies": {
-    "extract-react-types": "^0.22.0"
+    "@extract-types/core": "^0.22.0"
   },
   "devDependencies": {
     "@babel/core": "^7.4.4",

diff --git a/packages/extract-react-types/CHANGELOG.md → packages/core/CHANGELOG.md b/packages/extract-react-types/CHANGELOG.md → packages/core/CHANGELOG.md
diff --git a/packages/extract-react-types/LICENSE → packages/core/LICENSE b/packages/extract-react-types/LICENSE → packages/core/LICENSE
diff --git a/packages/extract-react-types/README.md → packages/core/README.md b/packages/extract-react-types/README.md → packages/core/README.md
diff --git a/...ypes/__fixtures__/nested-exports/index.ts → ...core/__fixtures__/nested-exports/index.ts b/...ypes/__fixtures__/nested-exports/index.ts → ...core/__fixtures__/nested-exports/index.ts
diff --git a/...ixtures__/nested-exports/nested-export.ts → ...ixtures__/nested-exports/nested-export.ts b/...ixtures__/nested-exports/nested-export.ts → ...ixtures__/nested-exports/nested-export.ts
diff --git a/...extract-react-types/__fixtures__/props.ts → packages/core/__fixtures__/props.ts b/...extract-react-types/__fixtures__/props.ts → packages/core/__fixtures__/props.ts
diff --git a/...xtract-react-types/__fixtures__/test.json → packages/core/__fixtures__/test.json b/...xtract-react-types/__fixtures__/test.json → packages/core/__fixtures__/test.json
diff --git a/...extract-react-types/__fixtures__/types.ts → packages/core/__fixtures__/types.ts b/...extract-react-types/__fixtures__/types.ts → packages/core/__fixtures__/types.ts
diff --git a/...ct-react-types/__snapshots__/test.js.snap → packages/core/__snapshots__/test.js.snap b/...ct-react-types/__snapshots__/test.js.snap → packages/core/__snapshots__/test.js.snap
diff --git a/packages/extract-react-types/package.json → packages/core/package.json b/packages/extract-react-types/package.json → packages/core/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "extract-react-types",
+  "name": "@extract-types/core",
   "version": "0.22.1",
-  "main": "dist/extract-react-types.cjs.js",
+  "main": "dist/core.cjs.js",
   "repository": "atlassian/extract-react-types",
   "description": "Parse prop-types from react components using typescript or flow",
   "author": "James Kyle <[email protected]>",
@@ -43,4 +43,4 @@
     "jest": "^24.7.1",
     "prettier": "^1.13.7"
   }
-}
+}
diff --git a/packages/extract-react-types/src/index.js → packages/core/src/index.js b/packages/extract-react-types/src/index.js → packages/core/src/index.js
diff --git a/packages/extract-react-types/src/kinds.js → packages/core/src/kinds.js b/packages/extract-react-types/src/kinds.js → packages/core/src/kinds.js
diff --git a/.../extract-react-types/src/matchExported.js → packages/core/src/matchExported.js b/.../extract-react-types/src/matchExported.js → packages/core/src/matchExported.js
diff --git a/packages/extract-react-types/test.js → packages/core/test.js b/packages/extract-react-types/test.js → packages/core/test.js
diff --git a/packages/extract-react-types-loader/index.js b/packages/extract-react-types-loader/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 const path = require('path');
-const { extractReactTypes } = require('extract-react-types');
+const { extractReactTypes } = require('@extract-types/core');
 
 const devProps = {
   component: {

diff --git a/packages/extract-react-types-loader/package.json b/packages/extract-react-types-loader/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "extract-react-types-loader",
+  "name": "@extract-types/loader",
   "version": "0.3.9",
   "main": "index.js",
   "repository": "atlassian/extract-react-types",
@@ -14,6 +14,6 @@
     "documentation"
   ],
   "dependencies": {
-    "extract-react-types": "^0.22.0"
+    "@extract-types/core": "^0.22.0"
   }
 }
diff --git a/packages/kind2string/README.md b/packages/kind2string/README.md
@@ -8,7 +8,7 @@ Default use-case:
 
 ```js
 import generatedData from './extract-react-type-write-location';
-import convert from 'kind2string';
+import convert from '@extract-types/kind2string';
 
 export default () => <div>convert(generatedData)</div>;
 ```

diff --git a/packages/kind2string/package.json b/packages/kind2string/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "kind2string",
+  "name": "@extract-types/kind2string",
   "version": "0.6.3",
   "main": "dist/kind2string.cjs.js",
   "module": "dist/kind2string.esm.js",
@@ -12,7 +12,7 @@
   ],
   "devDependencies": {
     "babel-jest": "^24.7.1",
-    "extract-react-types": "^0.22.0"
+    "@extract-types/core": "^0.22.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.4.4"

diff --git a/packages/kind2string/src/index.js b/packages/kind2string/src/index.js
@@ -8,7 +8,7 @@
 /* eslint-disable no-undef */
 
 /*::
-import * as K from 'extract-react-types'
+import * as K from '@extract-types/core'
 */
 
 import { resolveToLast, resolveFromGeneric, reduceToObj } from './utils';

diff --git a/packages/kind2string/test.js b/packages/kind2string/test.js
@@ -1,5 +1,5 @@
 // @flow
-import { extractReactTypes } from 'extract-react-types';
+import { extractReactTypes } from '@extract-types/core';
 import convert from './src';
 
 const assembleERTAST = (propTypes, defaultProps, type = 'flow') => {

diff --git a/packages/pretty-proptypes/package.json b/packages/pretty-proptypes/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "pretty-proptypes",
+  "name": "@extract-types/pretty-proptypes",
   "version": "1.0.1",
   "description": "prettily render prop types from react components",
   "repository": "atlassian/extract-react-types",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@babel/runtime": "^7.4.4",
     "@emotion/core": "^10.0.14",
-    "kind2string": "^0.6.3",
+    "@extract-types/kind2string": "^0.6.3",
     "react-markings": "^1.2.0"
   },
   "files": [
@@ -25,7 +25,7 @@
   "devDependencies": {
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
-    "extract-react-types": "^0.22.0",
+    "@extract-types/core": "^0.22.0",
     "jsdom": "^11.7.0",
     "react": "^16.3.1",
     "react-addons-test-utils": "^15.6.2",

diff --git a/packages/pretty-proptypes/src/PrettyConvert/converters.js b/packages/pretty-proptypes/src/PrettyConvert/converters.js
@@ -5,12 +5,12 @@
 /** @jsx jsx */
 import { jsx, css } from '@emotion/core';
 import { type Node } from 'react';
-import convert, { resolveFromGeneric } from 'kind2string';
+import convert, { resolveFromGeneric } from '@extract-types/kind2string';
 import type { Components } from '../components';
 import AddBrackets from './AddBrackets';
 import { colors } from '../components/constants';
 /*::
-import * as K from 'extract-react-types'
+import * as K from '@extract-types/core'
 */
 
 export const SIMPLE_TYPES = [

diff --git a/packages/pretty-proptypes/src/PrettyConvert/converters.test.js b/packages/pretty-proptypes/src/PrettyConvert/converters.test.js
@@ -3,7 +3,7 @@
 import { shallow, configure } from 'enzyme';
 import React from 'react';
 import Adapter from 'enzyme-adapter-react-16';
-import { extractReactTypes } from 'extract-react-types';
+import { extractReactTypes } from '@extract-types/core';
 import components from '../components';
 import prettyConvert, { TypeMinWidth } from './converters';
 

diff --git a/packages/pretty-proptypes/src/PrettyConvert/index.js b/packages/pretty-proptypes/src/PrettyConvert/index.js
@@ -2,7 +2,7 @@
 /** @jsx jsx */
 import { jsx, css } from '@emotion/core';
 import { Component, type Node } from 'react';
-import { resolveFromGeneric } from 'kind2string';
+import { resolveFromGeneric } from '@extract-types/kind2string';
 import { gridSize } from '../components/constants';
 import allComponents, { type Components } from '../components';
 import Toggle from './Toggle';

diff --git a/packages/pretty-proptypes/src/PropType/index.js b/packages/pretty-proptypes/src/PropType/index.js
@@ -1,7 +1,7 @@
 // @flow
 /* eslint-disable no-param-reassign */
 import React from 'react';
-import convert, { getKind, reduceToObj } from 'kind2string';
+import convert, { getKind, reduceToObj } from '@extract-types/kind2string';
 import Prop from '../Prop';
 import allComponents from '../components';
 

diff --git a/packages/pretty-proptypes/src/Props/Props.test.js b/packages/pretty-proptypes/src/Props/Props.test.js
@@ -1,7 +1,7 @@
 // @flow
 import React from 'react';
 import { mount, configure } from 'enzyme';
-import { extractReactTypes } from 'extract-react-types';
+import { extractReactTypes } from '@extract-types/core';
 import Adapter from 'enzyme-adapter-react-16';
 
 import Props from './';

diff --git a/packages/pretty-proptypes/src/getPropTypes.js b/packages/pretty-proptypes/src/getPropTypes.js
@@ -1,5 +1,5 @@
 // @flow
-import { reduceToObj, resolveFromGeneric } from 'kind2string';
+import { reduceToObj, resolveFromGeneric } from '@extract-types/kind2string';
 import type { Kind } from './types';
 
 const getPropTypes = (propTypesObj: Kind) => {