Skip to content
Open
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
273 changes: 0 additions & 273 deletions .circleci/config.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .eslintrc-md.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"react/no-unknown-property": 2,
"react/jsx-no-undef": 2
}
}
}
20 changes: 18 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
name: lint
on: [push, pull-request]
on: [push]
jobs:
check-bats-version:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/cache@v2
id: yarn-cache
with:
path: '**/node_modules'
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
- run: yarn install --frozen-lockfile
if: steps.yarn-cache.outputs.cache-hit != 'true'
- run: yarn lint:md
- uses: actions/cache@v2
id: lint-cache
with:
path: '.eslintcache'
key: ${{ runner.os }}-lint-${{ hashFiles('package.json') }}
restore-keys: |
${{ runner.os }}-lint-
if: always()
- run: yarn lint:ts
if: always()
- run: yarn lint:versions
if: always()

9 changes: 3 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,11 @@
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.9.0",
"@octokit/rest": "^16.39.0",
"@types/enzyme": "3.9.0",
"@types/jest": "^24.0.11",
"@types/enzyme": "^3.10.8",
"@types/jest": "^26.0.0",
"@typescript-eslint/eslint-plugin": "^4.4.1",
"@typescript-eslint/parser": "^4.4.1",
"babel-jest": "^25.1.0",
"codecov": "^3.7.2",
"concurrently": "^5.3.0",
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.15.5",
"enzyme-to-json": "3.4.0",
Expand All @@ -60,7 +58,6 @@
"prettier": "^1.18.2",
"react": "^16.4.0",
"react-dom": "^16.4.0",
"surge": "^0.21.3",
"ttypescript": "^1.5.12"
},
"scripts": {
Expand All @@ -81,7 +78,7 @@
"lint:versions": "node scripts/verifyPatternflyVersions.js",
"serve:docs": "yarn workspace @patternfly/react-docs serve",
"serve:integration": "lerna run serve:demo-app",
"start": "yarn build && concurrently --kill-others \"yarn watch\" \"yarn workspace @patternfly/react-docs develop\"",
"start": "yarn build && node scripts/parallelshell \"yarn watch\" \"yarn workspace @patternfly/react-docs develop\"",
"start:cypress": "lerna run cypress:open",
"start:demo-app": "lerna run start:demo-app --stream",
"test": "jest packages",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function importer(url) {
if (url.startsWith('bootstrap')) {
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, `sass/patternfly/${url}`);
} else if (url.startsWith('font-awesome')) {
// font-awesome is for pf3 docs
url = path.join(__dirname, `../../node_modules/font-awesome/scss/${url}`);
Expand Down
5 changes: 2 additions & 3 deletions packages/react-catalog-view-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"homepage": "https://github.com/patternfly/patternfly-react/blob/master/packages/react-catalog-view-extension/README.md",
"scripts": {
"generate": "concurrently \"yarn build:sass\" \"yarn copy:sass\"",
"generate": "yarn copy:sass && yarn build: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"
Expand All @@ -38,8 +38,7 @@
"@patternfly/patternfly": "4.65.5",
"@patternfly/react-core": "^4.79.4",
"@patternfly/react-styles": "^4.7.16",
"classnames": "^2.2.5",
"patternfly": "^3.59.4"
"bootstrap-sass": "^3.4.0"
},
"devDependencies": {
"concurrently": "^5.3.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "bootstrap-compass";
@import "font-awesome-compass";
$pf-sass-asset-helper: true;
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "bootstrap-sprockets";
@import "font-awesome-sprockets";
$pf-sass-asset-helper: true;
Loading