Skip to content

Commit

Permalink
chore(patternfly-3): remove patternfly-3 packages (#3852)
Browse files Browse the repository at this point in the history
* remove pf3 packages, move packages/patternfly-4 up

* build and test tweaks

* Update README.md

* rename build

* add back test:pf4 command

* rename lint in CI

* fix doc build

* tweak scripts

* fix linting errors

Co-authored-by: Evan <[email protected]>
  • Loading branch information
redallen and evwilkin authored Mar 3, 2020
1 parent 0c54629 commit dee2aaa
Show file tree
Hide file tree
Showing 2,900 changed files with 409 additions and 103,006 deletions.
155 changes: 46 additions & 109 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,47 +5,39 @@ version: 2
references:
js_deps_paths: &js_deps_paths
- node_modules/
- packages/patternfly-3/patternfly-react-extensions/node_modules/
- packages/patternfly-3/patternfly-react-wooden-tree/node_modules/
- packages/patternfly-3/patternfly-react/node_modules/
- packages/patternfly-3/react-console/node_modules/
- packages/patternfly-4/react-charts/node_modules/
- packages/patternfly-4/react-core/node_modules/
- packages/patternfly-4/react-docs/node_modules/
- packages/patternfly-4/react-docs/plugins/gatsby-transformer-react-docgen-typescript/node_modules/
- packages/patternfly-4/react-inline-edit-extension/node_modules/
- packages/patternfly-4/react-integration/demo-app-ts/node_modules/
- packages/patternfly-4/react-integration/node_modules/
- packages/patternfly-4/react-styled-system/node_modules/
- packages/patternfly-4/react-styles/node_modules/
- packages/patternfly-4/react-table/node_modules/
- packages/patternfly-4/react-tokens/node_modules/
- packages/patternfly-4/react-topology/node_modules/
- packages/patternfly-4/react-virtualized-extension/node_modules/
- packages/patternfly-4/react-catalog-view-extension/node_modules/
- packages/react-charts/node_modules/
- packages/react-core/node_modules/
- packages/react-docs/node_modules/
- packages/react-docs/plugins/gatsby-transformer-react-docgen-typescript/node_modules/
- packages/react-inline-edit-extension/node_modules/
- packages/react-integration/demo-app-ts/node_modules/
- packages/react-integration/node_modules/
- packages/react-styled-system/node_modules/
- packages/react-styles/node_modules/
- packages/react-table/node_modules/
- packages/react-tokens/node_modules/
- packages/react-topology/node_modules/
- packages/react-virtualized-extension/node_modules/
- packages/react-catalog-view-extension/node_modules/
- packages/react-codemods/node_modules/
- packages/react-icons/node_modules/
build_cache_paths: &build_cache_paths
- .cache/
- packages/patternfly-3/patternfly-react-extensions/dist/
- packages/patternfly-3/patternfly-react-wooden-tree/dist/
- packages/patternfly-3/patternfly-react/dist/
- packages/patternfly-3/react-console/dist/
- packages/patternfly-4/react-charts/dist/
- packages/patternfly-4/react-core/dist/
- packages/patternfly-4/react-inline-edit-extension/dist/
- packages/patternfly-4/react-styled-system/dist/
- packages/patternfly-4/react-styles/css/
- packages/patternfly-4/react-styles/dist/
- packages/patternfly-4/react-table/dist/
- packages/patternfly-4/react-tokens/dist/
- packages/patternfly-4/react-topology/dist/
- packages/patternfly-4/react-virtualized-extension/dist/
- packages/patternfly-4/react-catalog-view-extension/dist/
- packages/react-charts/dist/
- packages/react-core/dist/
- packages/react-inline-edit-extension/dist/
- packages/react-styled-system/dist/
- packages/react-styles/css/
- packages/react-styles/dist/
- packages/react-table/dist/
- packages/react-tokens/dist/
- packages/react-topology/dist/
- packages/react-virtualized-extension/dist/
- packages/react-catalog-view-extension/dist/
- packages/react-icons/dist/
gatsby_cache_paths: &gatsby_cache_paths
- packages/patternfly-4/react-docs/.cache
- packages/patternfly-4/react-docs/public
- packages/react-docs/.cache
- packages/react-docs/public
lint_cache_paths: &lint_cache_paths
- .eslintcache
js_deps_cache_key: &js_deps_cache_key
Expand Down Expand Up @@ -83,43 +75,35 @@ workflows:
version: 2
build_test_deploy:
jobs:
- build
- build_pf3_docs:
- build_pf4
- build_docs_pf4:
requires:
- build
- build_pf4_docs:
requires:
- build
- test_jest_other:
requires:
- build
- build_pf4
- test_jest_pf4:
requires:
- build
- lint:
- build_pf4
- lint_pf4:
requires:
- build
- build_pf4
- build_demo_app:
requires:
- build
- build_pf4
- test_integration:
requires:
- build_demo_app
- test_a11y_pf4:
requires:
- build_pf4_docs
- build_docs_pf4
- deploy_prerelease:
requires:
- test_jest_pf4
- test_jest_other
- test_integration
- build_pf3_docs
- build_pf4_docs
- build_docs_pf4
filters:
branches:
only: master
jobs:
build:
build_pf4:
docker:
- image: circleci/node:10
steps:
Expand Down Expand Up @@ -163,38 +147,11 @@ jobs:
- *js_deps_cache_key
- run:
name: PF4 Jest Tests
command: yarn test:pf4 --maxWorkers=2
command: yarn test --maxWorkers=2
- run:
name: Upload results to codecov
command: yarn run codecov -F patternfly4
when: always
test_jest_other:
docker:
- image: circleci/node:10
steps:
- *attach_workspace
- restore_cache:
keys:
- *js_deps_cache_key
- run:
name: PF3 Jest Tests
command: yarn test:pf3 --maxWorkers=2
- run:
name: Upload results to codecov
command: yarn run codecov -F patternfly3
when: always
- run:
name: Clear Coverage
command: rm -rf coverage
when: always
- run:
name: Other Tests
command: yarn test:misc --maxWorkers=2
when: always
- run:
name: Upload results to codecov
command: yarn run codecov -F misc
when: always
build_demo_app:
docker:
- image: circleci/node:10
Expand All @@ -209,7 +166,7 @@ jobs:
- persist_to_workspace:
root: ~/project
paths:
- packages/patternfly-4/react-integration/demo-app-ts/build/
- packages/react-integration/demo-app-ts/build/
test_integration:
docker:
- image: circleci/node:10
Expand All @@ -234,14 +191,12 @@ jobs:
command: sleep 5
- run:
name: Run Cypress Integration Tests
# We have to add || true so that we can run our fanned-in report step
# Issue: https://ideas.circleci.com/ideas/CCI-I-344
command: |
cd packages/patternfly-4/react-integration &&
cd packages/react-integration &&
yarn test:integration -s $(circleci tests glob "cypress/integration/*.spec.ts" | circleci tests split --split-by=timings)
- store_artifacts:
path: packages/patternfly-4/react-integration/results
lint:
path: packages/react-integration/results
lint_pf4:
docker:
- image: circleci/node:10
steps:
Expand All @@ -265,10 +220,6 @@ jobs:
name: "@patternfly/patternfly Versions Match"
command: yarn lint:versions
when: always
- run:
name: StyleLint
command: yarn lint:style
when: always
- run:
name: Breaking Change Lint
# https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit
Expand All @@ -279,21 +230,7 @@ jobs:
exit 1
fi
when: always
build_pf3_docs:
docker:
- image: circleci/node:10
steps:
- *attach_workspace
- restore_cache:
keys:
- *js_deps_cache_key
- run:
name: Build PF3 Storybook Static Site
command: yarn build:storybook
- run:
name: Upload docs to surge.sh
command: node .circleci/upload-preview.js .out
build_pf4_docs:
build_docs_pf4:
machine:
image: circleci/classic:latest
steps:
Expand All @@ -314,7 +251,7 @@ jobs:
key: *gatsby_cache_key
- run:
name: Upload docs to surge.sh
command: node .circleci/upload-preview.js packages/patternfly-4/react-docs/public
command: node .circleci/upload-preview.js packages/react-docs/public
- persist_to_workspace:
root: ~/project
paths: *gatsby_cache_paths
Expand All @@ -335,10 +272,10 @@ jobs:
command: yarn test:a11y
- run:
name: Upload a11y report
command: node .circleci/upload-preview.js packages/patternfly-4/react-docs/coverage
command: node .circleci/upload-preview.js packages/react-docs/coverage
when: always
- store_artifacts:
path: packages/patternfly-4/react-docs/coverage/
path: packages/react-docs/coverage/
deploy_prerelease:
docker:
- image: circleci/node:10
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"plugin:jsdoc/recommended"
],
"parserOptions": {
"project": "packages/patternfly-4/tsconfig.base.json",
"project": "packages/tsconfig.base.json",
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
Expand Down
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

4 changes: 0 additions & 4 deletions .stylelintrc

This file was deleted.

28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ Using PatternFly 3? Take a look at the [PatternFly 3 React component informatio
| Package link | Description |
| --- | --- |
| **:blue_heart: Core packages** |
| &nbsp;&nbsp;[@patternfly/react-core](https://github.com/patternfly/patternfly-react/tree/master/packages/patternfly-4/react-core) | Core set of components |
| &nbsp;&nbsp;[@patternfly/react-table](https://github.com/patternfly/patternfly-react/tree/master/packages/patternfly-4/react-table) | Table components |
| &nbsp;&nbsp;[@patternfly/react-charts](https://github.com/patternfly/patternfly-react/tree/master/packages/patternfly-4/react-charts) | Chart components
| &nbsp;&nbsp;[@patternfly/react-icons](https://github.com/patternfly/patternfly-react/tree/master/packages/react-icons) | Icon components |
| &nbsp;&nbsp;[@patternfly/react-styles](https://github.com/patternfly/patternfly-react/tree/master/packages/patternfly-4/react-styles) | PatternFly CSS styles |
| &nbsp;&nbsp;[@patternfly/react-tokens](https://github.com/patternfly/patternfly-react/tree/master/packages/patternfly-4/react-tokens) | PatternFly CSS variable tokens |
| &nbsp;&nbsp;[@patternfly/react-topology](https://github.com/patternfly/patternfly-react/tree/master/packages/patternfly-4/react-topology) | Topology components |
| &nbsp;&nbsp;[@patternfly/react-core](./packages/react-core/README.md) | Core set of components |
| &nbsp;&nbsp;[@patternfly/react-table](./packages/react-table/README.md) | Table components |
| &nbsp;&nbsp;[@patternfly/react-charts](./packages/react-charts/README.md) | Chart components
| &nbsp;&nbsp;[@patternfly/react-icons](https://github.com/patternfly/patternfly-react/tree/master/packages/react-icons/README.md) | Icon components |
| &nbsp;&nbsp;[@patternfly/react-styles](./packages/react-styles/README.md) | PatternFly CSS styles |
| &nbsp;&nbsp;[@patternfly/react-tokens](./packages/react-tokens/README.md) | PatternFly CSS variable tokens |
| &nbsp;&nbsp;[@patternfly/react-topology](./packages/react-topology/README.md) | Topology components |
| **:open_file_folder: Supporting packages** |
| &nbsp;&nbsp;[@patternfly/react-docs](https://github.com/patternfly/patternfly-react/tree/master/packages/patternfly-4/react-docs) | Gatsby documentation site for components |
| &nbsp;&nbsp;[@patternfly/react-integration](https://github.com/patternfly/patternfly-react/tree/master/packages/patternfly-4/react-integration) | Cypress integration tests |
| &nbsp;&nbsp;[@patternfly/react-docs](./packages/react-docs/README.md) | Gatsby documentation site for components |
| &nbsp;&nbsp;[@patternfly/react-integration](./packages/react-integration/README.md) | Cypress integration tests |
| **:family: Extension packages** *community supported* |
| &nbsp;&nbsp;[@patternfly/react-catalog-view-extension](https://github.com/patternfly/patternfly-react/tree/master/packages/patternfly-4/react-catalog-view-extension) | Catalog view extension |
| &nbsp;&nbsp;[@patternfly/react-virtualized-extension](https://github.com/patternfly/patternfly-react/tree/master/packages/patternfly-4/react-virtualized-extension) | Table and list row virtualization extension |
| &nbsp;&nbsp;[@patternfly/react-catalog-view-extension](./packages/react-catalog-view-extension/README.md) | Catalog view extension |
| &nbsp;&nbsp;[@patternfly/react-virtualized-extension](./packages/react-virtualized-extension/README.md) | Table and list row virtualization extension |
| **:x: Deprecated packages** |
| &nbsp;&nbsp;[@patternfly/react-inline-edit-extension](https://github.com/patternfly/patternfly-react/tree/master/packages/patternfly-4/react-inline-edit-extension) | Table inline edit extension |
| &nbsp;&nbsp;[@patternfly/react-styled-system](https://github.com/patternfly/patternfly-react/tree/master/packages/patternfly-4/react-styled-system) | Styled system component prototype |
| &nbsp;&nbsp;[@patternfly/react-codemods](https://github.com/patternfly/patternfly-react/tree/master/packages/react-codemods) | Codemods for upgrading PatternFly 3 components |
| &nbsp;&nbsp;[@patternfly/react-inline-edit-extension](./packages/react-inline-edit-extension/README.md) | Table inline edit extension |
| &nbsp;&nbsp;[@patternfly/react-styled-system](./packages/react-styled-system/README.md) | Styled system component prototype |
| &nbsp;&nbsp;[@patternfly/react-codemods](./packages/react-codemods/README.md) | Codemods for upgrading PatternFly 3 components |

### Setup

Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
extends: './packages/patternfly-4/.babelrc',
extends: './packages/.babelrc',
presets: [['@babel/env', {'modules': 'commonjs'}], '@babel/react'],
};
4 changes: 2 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ module.exports = {
],
transform: {
'^.+\\.[jt]sx?$': 'babel-jest',
'\\.(css)$': '<rootDir>/packages/patternfly-4/react-styles/jest-transform.js'
'\\.(css)$': '<rootDir>/packages/react-styles/jest-transform.js'
},
transformIgnorePatterns: ['node_modules/(?!@patternfly|@novnc|tippy.js|lodash)'],
testPathIgnorePatterns: [
'<rootDir>/packages/patternfly-4/react-integration/'
'<rootDir>/packages/react-integration/'
],
coveragePathIgnorePatterns: [
'/dist/'
Expand Down
Loading

0 comments on commit dee2aaa

Please sign in to comment.