From 2b9a65033bbd88efce33454f9796d033f7e35fdf Mon Sep 17 00:00:00 2001 From: gwyneplaine Date: Fri, 27 Sep 2019 11:07:03 +1000 Subject: [PATCH 1/5] add scope to existing packages, with slight rename, versions are the same --- packages/babel-plugin-extract-react-types/package.json | 2 +- packages/extract-react-types-loader/package.json | 2 +- packages/extract-react-types/package.json | 2 +- packages/kind2string/package.json | 2 +- packages/pretty-proptypes/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/babel-plugin-extract-react-types/package.json b/packages/babel-plugin-extract-react-types/package.json index 2cfbaec1..79ce08b9 100644 --- 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", diff --git a/packages/extract-react-types-loader/package.json b/packages/extract-react-types-loader/package.json index 53162c5c..57ee59a0 100644 --- 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", diff --git a/packages/extract-react-types/package.json b/packages/extract-react-types/package.json index 71d7e1ce..60355c44 100644 --- a/packages/extract-react-types/package.json +++ b/packages/extract-react-types/package.json @@ -1,5 +1,5 @@ { - "name": "extract-react-types", + "name": "@extract-types/core", "version": "0.22.1", "main": "dist/extract-react-types.cjs.js", "repository": "atlassian/extract-react-types", diff --git a/packages/kind2string/package.json b/packages/kind2string/package.json index c68253de..2a1703a8 100644 --- 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", diff --git a/packages/pretty-proptypes/package.json b/packages/pretty-proptypes/package.json index 96791f1e..795e205e 100644 --- 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", From c52255a5653ae2ea5515aafd48b8723e096e668a Mon Sep 17 00:00:00 2001 From: gwyneplaine Date: Fri, 27 Sep 2019 11:07:57 +1000 Subject: [PATCH 2/5] add changeset --- .changeset/lemon-tips-sing/changes.json | 10 ++++++++++ .changeset/lemon-tips-sing/changes.md | 1 + 2 files changed, 11 insertions(+) create mode 100644 .changeset/lemon-tips-sing/changes.json create mode 100644 .changeset/lemon-tips-sing/changes.md diff --git a/.changeset/lemon-tips-sing/changes.json b/.changeset/lemon-tips-sing/changes.json new file mode 100644 index 00000000..0085f16d --- /dev/null +++ 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 new file mode 100644 index 00000000..d1eea06d --- /dev/null +++ b/.changeset/lemon-tips-sing/changes.md @@ -0,0 +1 @@ +Added @extract-types scope to packages, with slight rename for sense \ No newline at end of file From a2764b755a21437ac99a80e8b8f48cd6bc01e087 Mon Sep 17 00:00:00 2001 From: gwyneplaine Date: Fri, 27 Sep 2019 11:14:08 +1000 Subject: [PATCH 3/5] preconstruct-fix --- packages/extract-react-types/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/extract-react-types/package.json b/packages/extract-react-types/package.json index 60355c44..efca3c1b 100644 --- a/packages/extract-react-types/package.json +++ b/packages/extract-react-types/package.json @@ -1,7 +1,7 @@ { "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 ", @@ -43,4 +43,4 @@ "jest": "^24.7.1", "prettier": "^1.13.7" } -} \ No newline at end of file +} From 741ed7ee27f82a3d426a748a384482f35d5b1cb5 Mon Sep 17 00:00:00 2001 From: gwyneplaine Date: Fri, 27 Sep 2019 11:28:17 +1000 Subject: [PATCH 4/5] fix deps --- packages/babel-plugin-extract-react-types/index.js | 2 +- packages/babel-plugin-extract-react-types/package.json | 2 +- packages/extract-react-types-loader/index.js | 2 +- packages/extract-react-types-loader/package.json | 2 +- packages/kind2string/README.md | 2 +- packages/kind2string/package.json | 2 +- packages/kind2string/src/index.js | 2 +- packages/kind2string/test.js | 2 +- packages/pretty-proptypes/package.json | 4 ++-- packages/pretty-proptypes/src/PrettyConvert/converters.js | 4 ++-- .../pretty-proptypes/src/PrettyConvert/converters.test.js | 2 +- packages/pretty-proptypes/src/PrettyConvert/index.js | 2 +- packages/pretty-proptypes/src/PropType/index.js | 2 +- packages/pretty-proptypes/src/Props/Props.test.js | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/babel-plugin-extract-react-types/index.js b/packages/babel-plugin-extract-react-types/index.js index f4e1645a..5056c4df 100644 --- 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 index 79ce08b9..2286b1cc 100644 --- a/packages/babel-plugin-extract-react-types/package.json +++ b/packages/babel-plugin-extract-react-types/package.json @@ -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-loader/index.js b/packages/extract-react-types-loader/index.js index 0f469a7b..a0cc71af 100644 --- 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 index 57ee59a0..09853262 100644 --- a/packages/extract-react-types-loader/package.json +++ b/packages/extract-react-types-loader/package.json @@ -14,6 +14,6 @@ "documentation" ], "dependencies": { - "extract-react-types": "^0.22.0" + "@extract-types/core": "^0.22.0" } } \ No newline at end of file diff --git a/packages/kind2string/README.md b/packages/kind2string/README.md index 0a96b797..d52a1546 100644 --- 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 () =>
convert(generatedData)
; ``` diff --git a/packages/kind2string/package.json b/packages/kind2string/package.json index 2a1703a8..8b9d7bd6 100644 --- a/packages/kind2string/package.json +++ b/packages/kind2string/package.json @@ -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 index 24472bbf..7b2cd5db 100644 --- 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 index 32c44bdb..c99770bd 100644 --- 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 index 795e205e..f224a133 100644 --- a/packages/pretty-proptypes/package.json +++ b/packages/pretty-proptypes/package.json @@ -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 index affaf1d6..c1104985 100644 --- 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 index a474fdbc..87105c81 100644 --- 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 index efd560d3..36cbdcae 100644 --- 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 index 23df66ba..e7e6b701 100644 --- 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 index 9e2dd6df..c019fe17 100644 --- 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 './'; From 9f17474ff685f75b869a1fabcc4b549dcf7f2f08 Mon Sep 17 00:00:00 2001 From: gwyneplaine Date: Fri, 27 Sep 2019 11:50:06 +1000 Subject: [PATCH 5/5] rename extract-react-types folder --- package.json | 2 +- packages/{extract-react-types => core}/CHANGELOG.md | 0 packages/{extract-react-types => core}/LICENSE | 0 packages/{extract-react-types => core}/README.md | 0 .../__fixtures__/nested-exports/index.ts | 0 .../__fixtures__/nested-exports/nested-export.ts | 0 packages/{extract-react-types => core}/__fixtures__/props.ts | 0 packages/{extract-react-types => core}/__fixtures__/test.json | 0 packages/{extract-react-types => core}/__fixtures__/types.ts | 0 .../{extract-react-types => core}/__snapshots__/test.js.snap | 0 packages/{extract-react-types => core}/package.json | 0 packages/{extract-react-types => core}/src/index.js | 0 packages/{extract-react-types => core}/src/kinds.js | 0 packages/{extract-react-types => core}/src/matchExported.js | 0 packages/{extract-react-types => core}/test.js | 0 packages/pretty-proptypes/src/getPropTypes.js | 2 +- 16 files changed, 2 insertions(+), 2 deletions(-) rename packages/{extract-react-types => core}/CHANGELOG.md (100%) rename packages/{extract-react-types => core}/LICENSE (100%) rename packages/{extract-react-types => core}/README.md (100%) rename packages/{extract-react-types => core}/__fixtures__/nested-exports/index.ts (100%) rename packages/{extract-react-types => core}/__fixtures__/nested-exports/nested-export.ts (100%) rename packages/{extract-react-types => core}/__fixtures__/props.ts (100%) rename packages/{extract-react-types => core}/__fixtures__/test.json (100%) rename packages/{extract-react-types => core}/__fixtures__/types.ts (100%) rename packages/{extract-react-types => core}/__snapshots__/test.js.snap (100%) rename packages/{extract-react-types => core}/package.json (100%) rename packages/{extract-react-types => core}/src/index.js (100%) rename packages/{extract-react-types => core}/src/kinds.js (100%) rename packages/{extract-react-types => core}/src/matchExported.js (100%) rename packages/{extract-react-types => core}/test.js (100%) diff --git a/package.json b/package.json index cbfe056a..0b17c837 100644 --- 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/extract-react-types/CHANGELOG.md b/packages/core/CHANGELOG.md similarity index 100% rename from packages/extract-react-types/CHANGELOG.md rename to packages/core/CHANGELOG.md diff --git a/packages/extract-react-types/LICENSE b/packages/core/LICENSE similarity index 100% rename from packages/extract-react-types/LICENSE rename to packages/core/LICENSE diff --git a/packages/extract-react-types/README.md b/packages/core/README.md similarity index 100% rename from packages/extract-react-types/README.md rename to packages/core/README.md diff --git a/packages/extract-react-types/__fixtures__/nested-exports/index.ts b/packages/core/__fixtures__/nested-exports/index.ts similarity index 100% rename from packages/extract-react-types/__fixtures__/nested-exports/index.ts rename to packages/core/__fixtures__/nested-exports/index.ts diff --git a/packages/extract-react-types/__fixtures__/nested-exports/nested-export.ts b/packages/core/__fixtures__/nested-exports/nested-export.ts similarity index 100% rename from packages/extract-react-types/__fixtures__/nested-exports/nested-export.ts rename to packages/core/__fixtures__/nested-exports/nested-export.ts diff --git a/packages/extract-react-types/__fixtures__/props.ts b/packages/core/__fixtures__/props.ts similarity index 100% rename from packages/extract-react-types/__fixtures__/props.ts rename to packages/core/__fixtures__/props.ts diff --git a/packages/extract-react-types/__fixtures__/test.json b/packages/core/__fixtures__/test.json similarity index 100% rename from packages/extract-react-types/__fixtures__/test.json rename to packages/core/__fixtures__/test.json diff --git a/packages/extract-react-types/__fixtures__/types.ts b/packages/core/__fixtures__/types.ts similarity index 100% rename from packages/extract-react-types/__fixtures__/types.ts rename to packages/core/__fixtures__/types.ts diff --git a/packages/extract-react-types/__snapshots__/test.js.snap b/packages/core/__snapshots__/test.js.snap similarity index 100% rename from packages/extract-react-types/__snapshots__/test.js.snap rename to packages/core/__snapshots__/test.js.snap diff --git a/packages/extract-react-types/package.json b/packages/core/package.json similarity index 100% rename from packages/extract-react-types/package.json rename to packages/core/package.json diff --git a/packages/extract-react-types/src/index.js b/packages/core/src/index.js similarity index 100% rename from packages/extract-react-types/src/index.js rename to packages/core/src/index.js diff --git a/packages/extract-react-types/src/kinds.js b/packages/core/src/kinds.js similarity index 100% rename from packages/extract-react-types/src/kinds.js rename to packages/core/src/kinds.js diff --git a/packages/extract-react-types/src/matchExported.js b/packages/core/src/matchExported.js similarity index 100% rename from packages/extract-react-types/src/matchExported.js rename to packages/core/src/matchExported.js diff --git a/packages/extract-react-types/test.js b/packages/core/test.js similarity index 100% rename from packages/extract-react-types/test.js rename to packages/core/test.js diff --git a/packages/pretty-proptypes/src/getPropTypes.js b/packages/pretty-proptypes/src/getPropTypes.js index 9cbf1c3d..3a00ebc3 100644 --- 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) => {