Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
db7c840
tsconfig
redallen Mar 26, 2020
5a750ca
use esm imports
redallen Mar 26, 2020
9b1472c
lots of tsconfig changes
redallen Mar 31, 2020
1633b63
working tsc -b
redallen Mar 31, 2020
e32a23c
bye incremental build
redallen Mar 31, 2020
893a38c
dont rely on `tsc` for react-styles css
redallen Mar 31, 2020
43ca0ba
Merge remote-tracking branch 'upstream/v4' into feat/remove-babel
redallen Apr 1, 2020
f4f2110
tweak source generation
redallen Apr 1, 2020
33ae0bd
use tslib
redallen Apr 1, 2020
83c2fb1
conditionally generate
redallen Apr 1, 2020
51c85b2
add cjs and umd builds
redallen Apr 1, 2020
7ce3c2d
remove copystyles from projects that don't use it
redallen Apr 1, 2020
813f777
convert inline edit extension to typescript
redallen Apr 1, 2020
2996c65
fix project x-refs
redallen Apr 1, 2020
1b179d4
babel-jest is a mess
redallen Apr 2, 2020
16da478
jest progress
redallen Apr 2, 2020
66dfd80
start tokenizing icons, remove umd
redallen Apr 2, 2020
86f60d9
move types back to JS folder
redallen Apr 3, 2020
e152930
improve icon generation
redallen Apr 3, 2020
6a32a82
stop tracking react-styles dist
redallen Apr 3, 2020
5030834
add sass generation
redallen Apr 3, 2020
13f00f8
start fixing jest
redallen Apr 3, 2020
c3809fd
passing jest tests
redallen Apr 3, 2020
243be5e
many declaration files
redallen Apr 3, 2020
21a9643
npm ignore and update plopfiles
redallen Apr 3, 2020
495a5b4
Merge remote-tracking branch 'upstream/v4' into feat/remove-babel
redallen Apr 3, 2020
1739102
fix test selector
redallen Apr 3, 2020
4b861d4
bump yarn.lock to new eslint versions
redallen Apr 3, 2020
c45e610
fix lint
redallen Apr 6, 2020
90a418f
remove react-icons from references
redallen Apr 6, 2020
2bc7e76
remove last react-icons ref
redallen Apr 6, 2020
b173ea4
remove autogenerated cypress files
redallen Apr 6, 2020
99e5859
fix test
redallen Apr 6, 2020
e8128fd
do entire build while waiting on gatsby
redallen Apr 6, 2020
42650cd
fix yarn start
redallen Apr 6, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ references:
- packages/react-codemods/node_modules/
- packages/react-icons/node_modules/
build_cache_paths: &build_cache_paths
- .cache/
- packages/react-charts/dist/
- packages/react-core/dist/
- packages/react-inline-edit-extension/dist/
Expand Down
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ coverage
**/Generated
**/build
css
packages/react-icons/src/icons
packages/react-docs/.cache
packages/react-docs/static
packages/react-docs/public

# package managers
yarn-error.log
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"plugin:jsdoc/recommended"
],
"parserOptions": {
"project": "packages/tsconfig.base.json",
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
Expand Down Expand Up @@ -101,6 +100,7 @@
}],
"no-unused-labels": "error",
"no-var": "error",
"no-prototype-builtins": "off",
"object-shorthand": "error",
"one-var": [
"error",
Expand Down
13 changes: 10 additions & 3 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
module.exports = {
extends: './packages/.babelrc',
presets: [['@babel/env', {'modules': 'commonjs'}], '@babel/react'],
};
presets: [
'@babel/preset-env',
'@babel/preset-typescript',
'@babel/preset-react'
],
plugins: [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-object-rest-spread"
]
}
34 changes: 12 additions & 22 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,19 @@
module.exports = {
collectCoverage: true,
coverageReporters: ['lcov'],
clearMocks: true,
testMatch: ['**/__tests__/**/*.{js,ts}?(x)', '**/*.test.{js,ts}?(x)'],
modulePathIgnorePatterns: [
'<rootDir>/packages/*.*/dist/*.*',
'<rootDir>/packages/*.*/public/*.*',
'<rootDir>/packages/*.*/.cache/*.*'
],
roots: ['<rootDir>/packages'],
setupFiles: ['<rootDir>/jest.env.js'],
snapshotSerializers: [
'enzyme-to-json/serializer',
],
transform: {
'^.+\\.[jt]sx?$': 'babel-jest'
},
transformIgnorePatterns: ['node_modules/(?!@patternfly|@novnc|tippy.js|lodash)'],
testPathIgnorePatterns: [
'<rootDir>/packages/react-integration/'
],
coveragePathIgnorePatterns: [
'/dist/'
],
testMatch: ['<rootDir>/packages/**/*.test.{js,ts}?(x)'],
testPathIgnorePatterns: ['<rootDir>/packages/react-integration/'],
moduleNameMapper: {
"\\.(css|less)$": "<rootDir>/packages/react-styles/__mocks__/styleMock.js"
}
'\\.css$': '<rootDir>/packages/react-styles/__mocks__/styleMock.js'
},
// Setup Enzyme
snapshotSerializers: ['enzyme-to-json/serializer'],
setupFilesAfterEnv: ['<rootDir>/packages/setupEnzyme.js'],
// Some suites expect this between test cases
clearMocks: true,
// Record results
collectCoverage: true,
coverageReporters: ['lcov']
};
10 changes: 0 additions & 10 deletions jest.env.js

This file was deleted.

67 changes: 42 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,68 +25,76 @@
},
"homepage": "https://github.com/patternfly/patternfly-react#readme",
"devDependencies": {
"@babel/core": "^7.9.0",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-object-rest-spread": "^7.9.0",
"@babel/preset-env": "^7.9.0",
"@babel/preset-react": "^7.9.4",
"@babel/preset-typescript": "^7.9.0",
"@octokit/rest": "^16.39.0",
"@types/enzyme": "3.9.0",
"@typescript-eslint/eslint-plugin": "^2.18.0",
"@typescript-eslint/parser": "^2.18.0",
"babel-jest": "^25.1.0",
"babel-plugin-typescript-to-proptypes": "^0.17.1",
"@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jest": "^25.1.4",
"@typescript-eslint/eslint-plugin": "^2.26.0",
"@typescript-eslint/parser": "^2.26.0",
"change-case": "^3.0.2",
"codecov": "^3.2.0",
"commitizen": "^3.0.7",
"concurrently": "^3.5.1",
"concurrently": "^5.1.0",
"cz-conventional-changelog": "^2.1.0",
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.14.0",
"enzyme-to-json": "3.4.0",
"eslint": "5.6.0",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.2",
"enzyme-to-json": "3.4.4",
"eslint": "^6.8.0",
"eslint-plugin-jsdoc": "^21.0.0",
"eslint-plugin-markdown": "^1.0.1",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-react": "^7.18.0",
"fs-extra": "^6.0.1",
"glob": "^7.1.2",
"http-get": "^0.5.10",
"jest": "24.1.0",
"jest-cli": "24.1.0",
"lerna": "3.16.2",
"jest": "25.2.7",
"jest-cli": "25.2.7",
"lerna": "3.20.2",
"libnpm": "^3.0.1",
"minimist": "^1.2.0",
"mutation-observer": "^1.0.3",
"plop": "^2.0.0",
"prettier": "^1.18.2",
"react": "^16.4.0",
"react-dom": "^16.4.0",
"surge": "^0.21.3",
"tslint": "^5.12.0",
"tslint": "^6.1.1",
"tslint-config-prettier": "^1.18.0",
"tslint-plugin-prettier": "^2.0.1",
"tslint-react": "^3.6.0"
"tslint-plugin-prettier": "^2.3.0",
"tslint-react": "^4.2.0"
},
"scripts": {
"bootstrap": "lerna bootstrap",
"build": "node scripts/incrementalBuild.js",
"build:docs": "lerna run build:docs --stream",
"build:integration:report": "lerna run build:integration:report --stream",
"build": "yarn build:esm && concurrently \"yarn build:cjs\" \"yarn build:umd\"",
"build:esm": "yarn generate && tsc -b packages/tsconfig.json -v",
"build:cjs": "yarn generate && tsc -b packages/tsconfig.cjs.json -v",
"build:umd": "yarn workspace @patternfly/react-core build:umd",
"build:docs": "yarn workspace @patternfly/react-docs build:docs",
"build:integration": "lerna run build:demo-app --stream",
"clean": "yarn clean:build && yarn clean:pf3 && lerna run clean --parallel",
"clean:build": "rimraf .cache",
"clean:build": "rimraf .cache .eslintcache coverage",
"clean:pf3": "rimraf packages/patternfly-3 packages/patternfly-4",
"commit": "git-cz",
"generate": "yarn plop",
"generate": "lerna run generate --parallel --stream",
"lint": "node --max-old-space-size=4096 node_modules/.bin/eslint --ext js,jsx,ts,tsx --cache",
"lint:md": "yarn eslint packages --ext md --no-eslintrc --config .eslintrc-md.json --cache",
"lint:ts": "yarn lint packages",
"lint:versions": "node scripts/verifyPatternflyVersions.js",
"plop": "plop",
"prettier": "node node_modules/.bin/prettier --write \"packages/**/*.{js,jsx,ts,tsx}\" \"scripts/**/*.{js,jsx,ts,tsx}\"",
"serve:docs": "lerna run serve",
"serve:integration": "lerna run serve:demo-app",
"start": "yarn build && lerna run develop --parallel --stream",
"start": "concurrently \"yarn build && yarn build:esm --watch\" \"yarn workspace @patternfly/react-docs develop\"",
"start:cypress": "lerna run cypress:open",
"start:demo-app": "lerna run start:demo-app --stream",
"start:pf4": "yarn start",
"storybook": "start-storybook -c storybook -p 6006",
"test": "jest packages",
"template": "plop",
"test": "jest",
"test:pf4": "yarn test",
"test:a11y": "lerna run test:a11y --stream",
"test:current": "jest --watch",
Expand All @@ -103,5 +111,14 @@
"packages": [
"packages/**"
]
},
"resolutions": {
"@babel/helpers": "^7.9.2",
"@babel/parser": "^7.9.2",
"@babel/plugin-transform-classes": "^7.9.2",
"@babel/runtime-corejs3": "^7.9.2",
"@babel/runtime": "^7.9.2",
"@babel/standalone": "^7.9.2",
"browserslist": "4.11.1"
}
}
11 changes: 0 additions & 11 deletions packages/.babelrc

This file was deleted.

3 changes: 0 additions & 3 deletions packages/react-catalog-view-extension/.babelrc

This file was deleted.

3 changes: 2 additions & 1 deletion packages/react-catalog-view-extension/.npmignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
build
dist/**/*.map
dist/*.tsbuildinfo
26 changes: 6 additions & 20 deletions packages/react-catalog-view-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,10 @@
},
"homepage": "https://github.com/patternfly/patternfly-react/blob/master/packages/react-catalog-view-extension/README.md",
"scripts": {
"build": "yarn build:babel && yarn build:types && yarn build:sass",
"build:babel": "concurrently 'yarn build:babel:esm && yarn build:babel:umd' 'yarn build:babel:cjs'",
"build:babel:cjs": "babel --source-maps --extensions '.js,.ts,.tsx' src --out-dir dist/js --presets=@babel/env",
"build:babel:esm": "babel --source-maps --extensions '.js,.ts,.tsx' src --out-dir dist/esm",
"build:babel:umd": "babel --source-maps --extensions '.js' dist/esm --out-dir dist/umd --plugins=transform-es2015-modules-umd",
"build:types": "tsc -p tsconfig.gen-dts.json",
"build:sass": "shx mkdir -p dist/sass && shx cp -r sass/react-catalog-view-extension/* dist/sass && node-sass --output-style compressed --importer=./node-sass-patternfly-importer.js -o dist/css sass/react-catalog-view-extension.scss",
"clean": "rimraf dist",
"develop": "yarn build:babel:esm --skip-initial-build --watch --verbose --source-maps"
"generate": "yarn copy:sass && yarn build:sass",
"build:sass": "node-sass --output-style compressed --importer=./scripts/node-sass-patternfly-importer.js -o dist/css sass/react-catalog-view-extension.scss",
"copy:sass": "shx mkdir -p dist/sass && shx cp -r sass/react-catalog-view-extension/* dist/sass",
"clean": "rimraf dist"
},
"dependencies": {
"@patternfly/patternfly": "4.6.0",
Expand All @@ -47,25 +42,16 @@
"patternfly": "^3.59.4"
},
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/plugin-proposal-export-default-from": "^7.0.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-transform-typescript": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@types/react": "^16.4.0",
"@types/react-dom": "^16.4.0",
"babel-plugin-transform-es2015-modules-umd": "^6.24.1",
"babel-plugin-typescript-to-proptypes": "^0.17.1",
"bootstrap-sass": "3.4.1",
"node-sass": "^4.12.0",
"rimraf": "^2.6.2",
"shx": "^0.3.2",
"tslib": "^1.11.1",
"typescript": "^3.8.3"
},
"peerDependencies": {
"prop-types": "^15.6.1",
"react": "^16.4.0",
"react-dom": "^15.6.2 || ^16.4.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ const path = require('path');
function importer(url) {
// Assume yarn hoists these.
if (url.startsWith('bootstrap')) {
url = path.join(__dirname, `../../node_modules/bootstrap-sass/assets/stylesheets/${url}`);
url = path.join(__dirname, `../../../node_modules/bootstrap-sass/assets/stylesheets/${url}`);
} else if (url.startsWith('patternfly')) {
url = path.join(__dirname, `../../node_modules/patternfly/dist/sass/${url}`);
url = path.join(__dirname, `../../../node_modules/patternfly/dist/sass/${url}`);
} else if (url.startsWith('font-awesome')) {
// font-awesome is for pf3 docs
url = path.join(__dirname, `../../node_modules/font-awesome/scss/${url}`);
url = path.join(__dirname, `../../../node_modules/font-awesome/scss/${url}`);
} else if (url.startsWith('~')) {
url = path.join(__dirname, `../../node_modules/${url.substr(1)}`);
url = path.join(__dirname, `../../../node_modules/${url.substr(1)}`);
}
return { file: url };
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import * as React from 'react';
import { Card } from '@patternfly/react-core/dist/js/components/Card/Card';
import { CardActions } from '@patternfly/react-core/dist/js/components/Card/CardActions';
import { CardHead } from '@patternfly/react-core/dist/js/components/Card/CardHead';
import { CardHeader } from '@patternfly/react-core/dist/js/components/Card/CardHeader';
import { CardBody } from '@patternfly/react-core/dist/js/components/Card/CardBody';
import { CardFooter } from '@patternfly/react-core/dist/js/components/Card/CardFooter';
import { Card, CardActions, CardHead, CardHeader, CardBody, CardFooter } from '@patternfly/react-core';
import classNames from 'classnames';

export interface CatalogTileProps extends Omit<React.HTMLProps<HTMLElement>, 'title'> {
Expand Down
Loading