Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .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 Expand Up @@ -128,7 +127,7 @@ jobs:
- *build_cache_key
- run:
name: Build Dist
command: yarn build
command: yarn build && yarn build:umd
- save_cache:
paths: *build_cache_paths
key: *build_cache_key
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'
]
}
20 changes: 15 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@
},
"homepage": "https://github.com/patternfly/patternfly-react#readme",
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.0.0",
"@octokit/rest": "^16.39.0",
"@types/jest": "^24.0.11",
"@types/enzyme": "3.9.0",
"@typescript-eslint/eslint-plugin": "^2.18.0",
"@typescript-eslint/parser": "^2.18.0",
Expand Down Expand Up @@ -65,12 +72,15 @@
},
"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:generate && yarn build:esm && yarn build:cjs",
"build:cjs": "tsc --build packages/tsconfig.cjs.json -v",
"build:esm": "tsc --build packages/tsconfig.json -v",
"build:integration": "lerna run build:demo-app --stream",
"build:docs": "yarn workspace @patternfly/react-docs build:docs",
"build:umd": "yarn workspace @patternfly/react-core build:umd",
"build:generate": "lerna run generate --parallel --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",
Expand All @@ -81,7 +91,7 @@
"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 --kill-others \"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",
Expand Down
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.

1 change: 0 additions & 1 deletion packages/react-catalog-view-extension/.npmignore

This file was deleted.

28 changes: 6 additions & 22 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": "concurrently \"yarn build:sass\" \"yarn copy:sass\"",
"build:sass": "node-sass --output-style compressed --importer=./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,14 @@
"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",
"concurrently": "^3.5.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
Loading