diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 012c52ca..55026248 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,11 +24,16 @@ jobs: - name: Install Dependencies run: yarn + - name: Get Artifact Publish Token + id: publish-token + uses: atlassian-labs/artifact-publish-token@v1.0.1 + with: + output-modes: npm + - name: Create Release Pull Request or Publish to npm id: changesets uses: changesets/action@v1 with: - # this expects you to have a script called release which does a build for your packages and calls changeset publish publish: yarn release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index 5251a12c..89a7519b 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "test:watch": "jest --watch", "changeset": "changeset", "apply-changesets": "changeset version", - "release": "yarn build && changeset publish", + "release": "yarn build && changeset publish --use-npmrc=./.npmrc-public", "postinstall": "preconstruct dev", "lint": "yarn eslint \"./**/*.js\"", "lint:fix": "prettier --write packages/**/*.js", diff --git a/packages/babel-plugin-extract-react-types/index.js b/packages/babel-plugin-extract-react-types/index.js index 325bafbf..c3537eb4 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('@atlaskit/extract-react-types'); 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 223ca02a..af381d63 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": "@atlaskit/babel-plugin-extract-react-types", "version": "0.2.0", "main": "index.js", "license": "MIT", @@ -17,7 +17,7 @@ ], "author": "Mitchell Hamilton", "dependencies": { - "extract-react-types": "^0.30.0" + "@atlaskit/extract-react-types": "^0.30.0" }, "devDependencies": { "@babel/core": "^7.4.4", @@ -25,5 +25,8 @@ "@babel/plugin-syntax-jsx": "^7.2.0", "@babel/plugin-syntax-typescript": "^7.2.0", "jest-in-case": "^1.0.2" + }, + "publishConfig": { + "registry": "https://packages.atlassian.com/api/npm/npm-public/" } } diff --git a/packages/extract-react-types-loader/index.js b/packages/extract-react-types-loader/index.js index bfbab995..40adda68 100644 --- a/packages/extract-react-types-loader/index.js +++ b/packages/extract-react-types-loader/index.js @@ -1,6 +1,6 @@ // @flow const path = require('path'); -const { extractReactTypes } = require('extract-react-types'); +const { extractReactTypes } = require('@atlaskit/extract-react-types'); module.exports = function extractReactTypesLoader(content /* : string */) { const filename = this.resource; diff --git a/packages/extract-react-types-loader/package.json b/packages/extract-react-types-loader/package.json index c8f8a064..51cf9acf 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": "@atlaskit/extract-react-types-loader", "version": "1.0.0", "main": "index.js", "repository": "atlassian/extract-react-types", @@ -14,6 +14,9 @@ "documentation" ], "dependencies": { - "extract-react-types": "^0.30.0" + "@atlaskit/extract-react-types": "^0.30.0" + }, + "publishConfig": { + "registry": "https://packages.atlassian.com/api/npm/npm-public/" } } diff --git a/packages/extract-react-types/CHANGELOG.md b/packages/extract-react-types/CHANGELOG.md index 6401c584..39881b4e 100644 --- a/packages/extract-react-types/CHANGELOG.md +++ b/packages/extract-react-types/CHANGELOG.md @@ -177,8 +177,8 @@ -import extractReactTypes from 'extract-react-types'; +import { extractReactTypes } from 'extract-react-types'; // or in cjs - -const extractReactTypes = require('extract-react-types'); - +const { extractReactTypes } = require('extract-react-types'); + -const extractReactTypes = require('@atlaskit/extract-react-types'); + +const { extractReactTypes } = require('@atlaskit/extract-react-types'); ``` ### Patch Changes diff --git a/packages/extract-react-types/package.json b/packages/extract-react-types/package.json index 4511423d..59d2dd29 100644 --- a/packages/extract-react-types/package.json +++ b/packages/extract-react-types/package.json @@ -1,7 +1,7 @@ { - "name": "extract-react-types", + "name": "@atlaskit/extract-react-types", "version": "0.30.4", - "main": "dist/extract-react-types.cjs.js", + "main": "dist/atlaskit-extract-react-types.cjs.js", "repository": "atlassian/extract-react-types", "description": "Parse prop-types from react components using typescript or flow", "author": "James Kyle ", @@ -43,5 +43,8 @@ "flow-bin": "^0.98.0", "jest": "^27.0.0", "prettier": "^1.13.7" + }, + "publishConfig": { + "registry": "https://packages.atlassian.com/api/npm/npm-public/" } } diff --git a/packages/kind2string/package.json b/packages/kind2string/package.json index 96077434..dbdc4c96 100644 --- a/packages/kind2string/package.json +++ b/packages/kind2string/package.json @@ -1,8 +1,8 @@ { - "name": "kind2string", + "name": "@atlaskit/kind2string", "version": "0.8.1", - "main": "dist/kind2string.cjs.js", - "module": "dist/kind2string.esm.js", + "main": "dist/atlaskit-kind2string.cjs.js", + "module": "dist/atlaskit-kind2string.esm.js", "license": "MIT", "author": "Atlassian", "repository": "atlassian/extract-react-types", @@ -12,9 +12,12 @@ ], "devDependencies": { "babel-jest": "^27.0.0", - "extract-react-types": "^0.30.0" + "@atlaskit/extract-react-types": "^0.30.0" }, "dependencies": { "@babel/runtime": "^7.4.4" + }, + "publishConfig": { + "registry": "https://packages.atlassian.com/api/npm/npm-public/" } } diff --git a/packages/kind2string/src/index.js b/packages/kind2string/src/index.js index 57990241..b9d0235d 100644 --- a/packages/kind2string/src/index.js +++ b/packages/kind2string/src/index.js @@ -6,7 +6,7 @@ /* eslint-disable no-console */ /*:: -import * as K from 'extract-react-types' +import * as K from '@atlaskit/extract-react-types' */ import { resolveToLast, resolveFromGeneric, reduceToObj } from './utils'; diff --git a/packages/kind2string/test.js b/packages/kind2string/test.js index be546fcc..c94ba1ae 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 '@atlaskit/extract-react-types'; import convert, { converters } from './src'; const assembleERTAST = (propTypes, defaultProps, type = 'flow') => { diff --git a/packages/pretty-proptypes/package.json b/packages/pretty-proptypes/package.json index 443c98f2..c505bca6 100644 --- a/packages/pretty-proptypes/package.json +++ b/packages/pretty-proptypes/package.json @@ -1,10 +1,10 @@ { - "name": "pretty-proptypes", + "name": "@atlaskit/pretty-proptypes", "version": "1.7.1", "description": "prettily render prop types from react components", "repository": "atlassian/extract-react-types", - "main": "dist/pretty-proptypes.cjs.js", - "module": "dist/pretty-proptypes.esm.js", + "main": "dist/atlaskit-pretty-proptypes.cjs.js", + "module": "dist/atlaskit-pretty-proptypes.esm.js", "keywords": [ "extract-react-types", "react", @@ -16,14 +16,14 @@ "dependencies": { "@babel/runtime": "^7.4.4", "@emotion/core": "^10.0.14", - "kind2string": "^0.8.1", + "@atlaskit/kind2string": "^0.8.1", "react-markings": "^1.2.0" }, "files": [ "dist" ], "devDependencies": { - "extract-react-types": "^0.30.0", + "@atlaskit/extract-react-types": "^0.30.0", "jsdom": "^26.1.0", "react": "^16.3.1", "react-addons-test-utils": "^15.6.2", @@ -31,5 +31,8 @@ }, "peerDependencies": { "react": ">=16" + }, + "publishConfig": { + "registry": "https://packages.atlassian.com/api/npm/npm-public/" } } diff --git a/packages/pretty-proptypes/src/LayoutRenderer/index.test.js b/packages/pretty-proptypes/src/LayoutRenderer/index.test.js index 4541dc32..a024a177 100644 --- a/packages/pretty-proptypes/src/LayoutRenderer/index.test.js +++ b/packages/pretty-proptypes/src/LayoutRenderer/index.test.js @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; -import { extractReactTypes } from 'extract-react-types'; +import { extractReactTypes } from '@atlaskit/extract-react-types'; import LayoutRenderer from './index'; const assembleComponent = (propTypes, defaultProps, type = 'typescript') => { diff --git a/packages/pretty-proptypes/src/PrettyConvert/converters.js b/packages/pretty-proptypes/src/PrettyConvert/converters.js index 814dad0b..762ad5c5 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 '@atlaskit/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 '@atlaskit/extract-react-types' */ 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 b5838aeb..189c93b5 100644 --- a/packages/pretty-proptypes/src/PrettyConvert/converters.test.js +++ b/packages/pretty-proptypes/src/PrettyConvert/converters.test.js @@ -2,7 +2,7 @@ import React from 'react'; import { render } from '@testing-library/react'; -import { extractReactTypes } from 'extract-react-types'; +import { extractReactTypes } from '@atlaskit/extract-react-types'; import components from '../components'; import prettyConvert from './converters'; diff --git a/packages/pretty-proptypes/src/PrettyConvert/index.js b/packages/pretty-proptypes/src/PrettyConvert/index.js index e70067f1..58b19da2 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 '@atlaskit/kind2string'; import { gridSize } from '../components/constants'; import allComponents, { type Components } from '../components'; import Toggle from './Toggle'; diff --git a/packages/pretty-proptypes/src/Props/Props.test.js b/packages/pretty-proptypes/src/Props/Props.test.js index bf4081ea..235fcfad 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 { render, screen } from '@testing-library/react'; -import { extractReactTypes } from 'extract-react-types'; +import { extractReactTypes } from '@atlaskit/extract-react-types'; import Props from './'; diff --git a/packages/pretty-proptypes/src/getPropTypes.js b/packages/pretty-proptypes/src/getPropTypes.js index 0fbf303e..f78b8225 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 '@atlaskit/kind2string'; import type { Kind } from './types'; const getPropTypes = (propTypesObj: Kind) => { diff --git a/packages/pretty-proptypes/src/renderPropType.js b/packages/pretty-proptypes/src/renderPropType.js index 48144250..da327152 100644 --- a/packages/pretty-proptypes/src/renderPropType.js +++ b/packages/pretty-proptypes/src/renderPropType.js @@ -1,7 +1,7 @@ // @flow /* eslint-disable no-param-reassign */ import React, { type ComponentType } from 'react'; -import convert, { getKind, reduceToObj } from 'kind2string'; +import convert, { getKind, reduceToObj } from '@atlaskit/kind2string'; import allComponents from './components'; const IGNORE_COMMENTS_STARTING_WITH = ['eslint-disable', '@ts-'];