Skip to content

Commit

Permalink
refactor(Move patternfly-3 and patternfly-4 specific packages into re… (
Browse files Browse the repository at this point in the history
#570)

* refactor(Move patternfly-3 and patternfly-4 specific packages into relevant sub-folders)

affects: patternfly-react, @patternfly/react-console, @patternfly/react-core,
@patternfly/react-docs, @patternfly/react-icons, @patternfly/react-styles, @patternfly/react-tokens

ISSUES CLOSED: #522
  • Loading branch information
jschuler committed Aug 29, 2018
1 parent 8c90f23 commit aa839a8
Show file tree
Hide file tree
Showing 1,070 changed files with 59 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = {
'import/no-extraneous-dependencies': [
'error',
// docs and examples are copied to react-docs
{ packageDir: './packages/react-docs' }
{ packageDir: './packages/patternfly-4/react-docs' }
]
}
}
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"build:icons": "lerna run prebuild --scope=@patternfly/react-icons --stream",
"build:ts": "node ./scripts/copyTS.js",
"clean": "yarn clean:build",
"clean:build": "rm -rf packages/*/dist",
"clean:build": "rm -rf packages/*/dist && rm -rf packages/patternfly-?/*/dist",
"commit": "git-cz",
"coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
"generate": "yarn plop",
Expand All @@ -133,7 +133,7 @@
"storybook:openurl": "node ./storybook/openBrowser.js",
"storybook:run": "start-storybook -c storybook -p 6006",
"storybook": "yarn storybook:run",
"stylelint": "stylelint --fix 'packages/*/sass/**/*.scss'",
"stylelint": "stylelint --fix 'packages/**/sass/**/*.scss'",
"test": "yarn lint && jest",
"test:current": "jest --watch",
"test:watch": "jest --watchAll",
Expand Down Expand Up @@ -161,11 +161,11 @@
],
"snapshotSerializers": [
"enzyme-to-json/serializer",
"<rootDir>/packages/react-styles/snapshot-serializer"
"<rootDir>/packages/patternfly-4/react-styles/snapshot-serializer"
],
"transform": {
"^.+\\.jsx?$": "babel-jest",
"\\.(css)$": "<rootDir>/packages/react-styles/jest-transform.js"
"\\.(css)$": "<rootDir>/packages/patternfly-4/react-styles/jest-transform.js"
},
"testPathIgnorePatterns": [
"<rootDir>/scripts/generators/"
Expand All @@ -187,7 +187,7 @@
},
"workspaces": {
"packages": [
"packages/*"
"packages/**"
],
"nohoist": [
"**/gatsby*",
Expand All @@ -206,4 +206,4 @@
"dependencies": {
"babel-plugin-transform-imports": "^1.5.0"
}
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@
"react-dom": "^15.6.2 || ^16.2.0"
},
"sassIncludes": {
"patternfly": "../../node_modules/patternfly/dist/sass",
"bootstrap": "../../node_modules/bootstrap-sass/assets/stylesheets",
"fontAwesome": "../../node_modules/font-awesome-sass/assets/stylesheets"
"patternfly": "../../../node_modules/patternfly/dist/sass",
"bootstrap": "../../../node_modules/bootstrap-sass/assets/stylesheets",
"fontAwesome": "../../../node_modules/font-awesome-sass/assets/stylesheets"
},
"scripts": {
"prebuild": "yarn build:sass && yarn build:less",
"build:less": "mkdir -p dist/less && cp -r less/* dist/less",
"build:sass": "mkdir -p dist/sass && cp -r sass/patternfly-react/* dist/sass && node-sass --output-style compressed --include-path sass --include-path $npm_package_sassIncludes_patternfly --include-path $npm_package_sassIncludes_bootstrap --include-path $npm_package_sassIncludes_fontAwesome -o dist/css sass/patternfly-react.scss"
}
}
}
Loading

0 comments on commit aa839a8

Please sign in to comment.