Skip to content

Commit 4c86c2b

Browse files
dlabajdlabaj
authored
Merge pull request #15 from patternfly/replace-yarn
chore(CI, packaging): Replace yarn
2 parents 3e813c1 + 7bbacad commit 4c86c2b

File tree

9 files changed

+108
-111
lines changed

9 files changed

+108
-111
lines changed

‎.eslintignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ generated
1313
__tests__
1414

1515
# package managers
16-
yarn-error.log
1716
lerna-debug.log
1817

1918
# IDEs and editors

‎.github/workflows/build-lint-test.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ jobs:
1818
with:
1919
node-version: '16'
2020
- uses: actions/cache@v2
21-
id: yarn-cache
21+
id: npm-cache
2222
name: Cache npm deps
2323
with:
2424
path: |
2525
node_modules
2626
**/node_modules
27-
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
28-
- run: yarn install --frozen-lockfile
29-
if: steps.yarn-cache.outputs.cache-hit != 'true'
27+
key: ${{ runner.os }}-npm-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json') }}
28+
- run: npm install --frozen-lockfile
29+
if: steps.npm-cache.outputs.cache-hit != 'true'
3030
- uses: actions/cache@v2
3131
id: dist
3232
name: Cache dist
3333
with:
3434
path: |
3535
packages/*/dist
36-
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
36+
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
3737
- name: Build dist
38-
run: yarn build
38+
run: npm run build
3939
if: steps.dist.outputs.cache-hit != 'true'
4040
lint:
4141
runs-on: ubuntu-latest
@@ -54,25 +54,25 @@ jobs:
5454
with:
5555
node-version: '16'
5656
- uses: actions/cache@v2
57-
id: yarn-cache
57+
id: npm-cache
5858
name: Cache npm deps
5959
with:
6060
path: |
6161
node_modules
6262
**/node_modules
63-
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
64-
- run: yarn install --frozen-lockfile
65-
if: steps.yarn-cache.outputs.cache-hit != 'true'
63+
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json') }}
64+
- run: npm install --frozen-lockfile
65+
if: steps.npm-cache.outputs.cache-hit != 'true'
6666
- uses: actions/cache@v2
6767
id: lint-cache
6868
name: Load lint cache
6969
with:
7070
path: '.eslintcache'
71-
key: ${{ runner.os }}-lint-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
71+
key: ${{ runner.os }}-lint-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json') }}
7272
- name: ESLint
73-
run: yarn lint:js
73+
run: npm run lint:js
7474
- name: MDLint
75-
run: yarn lint:md
75+
run: npm run lint:md
7676
test_jest:
7777
runs-on: ubuntu-latest
7878
env:
@@ -91,29 +91,29 @@ jobs:
9191
with:
9292
node-version: '16'
9393
- uses: actions/cache@v2
94-
id: yarn-cache
94+
id: npm-cache
9595
name: Cache npm deps
9696
with:
9797
path: |
9898
node_modules
9999
**/node_modules
100100
~/.cache/Cypress
101-
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
102-
- run: yarn install --frozen-lockfile
103-
if: steps.yarn-cache.outputs.cache-hit != 'true'
101+
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json') }}
102+
- run: npm install --frozen-lockfile
103+
if: steps.npm-cache.outputs.cache-hit != 'true'
104104
- uses: actions/cache@v2
105105
id: dist
106106
name: Cache dist
107107
with:
108108
path: |
109109
packages/*/dist
110110
packages/react-styles/css
111-
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
111+
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
112112
- name: Build dist
113-
run: yarn build
113+
run: npm run build
114114
if: steps.dist.outputs.cache-hit != 'true'
115115
- name: PF4 Jest Tests
116-
run: yarn test --maxWorkers=2
116+
run: npm run test --maxWorkers=2
117117
test_a11y:
118118
runs-on: ubuntu-latest
119119
env:
@@ -132,28 +132,28 @@ jobs:
132132
with:
133133
node-version: '16'
134134
- uses: actions/cache@v2
135-
id: yarn-cache
135+
id: npm-cache
136136
name: Cache npm deps
137137
with:
138138
path: |
139139
node_modules
140140
**/node_modules
141141
~/.cache/Cypress
142-
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
143-
- run: yarn install --frozen-lockfile
144-
if: steps.yarn-cache.outputs.cache-hit != 'true'
142+
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json') }}
143+
- run: npm install --frozen-lockfile
144+
if: steps.npm-cache.outputs.cache-hit != 'true'
145145
- uses: actions/cache@v2
146146
id: dist
147147
name: Cache dist
148148
with:
149149
path: |
150150
packages/*/dist
151151
packages/react-styles/css
152-
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
152+
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
153153
- name: Build dist
154-
run: yarn build
154+
run: npm run build
155155
if: steps.dist.outputs.cache-hit != 'true'
156156
- name: Build docs
157-
run: yarn build:docs
157+
run: npm run build:docs
158158
- name: A11y tests
159-
run: yarn serve:docs & yarn test:a11y
159+
run: npm run serve:docs & npm run test:a11y

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,22 @@ jobs:
3434
with:
3535
node-version: '16'
3636
- uses: actions/cache@v2
37-
id: yarn-cache
37+
id: npm-cache
3838
name: Cache npm deps
3939
with:
4040
path: |
4141
node_modules
4242
**/node_modules
43-
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
44-
- run: yarn install --frozen-lockfile
45-
if: steps.yarn-cache.outputs.cache-hit != 'true'
43+
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json') }}
44+
- run: npm install --frozen-lockfile
45+
if: steps.npm-cache.outputs.cache-hit != 'true'
4646
- uses: actions/cache@v2
4747
id: dist
4848
name: Cache dist
4949
with:
5050
path: |
5151
packages/*/dist
52-
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
52+
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
5353
- name: Build dist
54-
run: yarn build
54+
run: npm run build
5555
if: steps.dist.outputs.cache-hit != 'true'

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@ jobs:
1818
with:
1919
node-version: '16'
2020
- uses: actions/cache@v2
21-
id: yarn-cache
21+
id: npm-cache
2222
name: Cache npm deps
2323
with:
2424
path: |
2525
node_modules
2626
**/node_modules
2727
~/.cache/Cypress
28-
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
29-
- run: yarn install --frozen-lockfile
30-
if: steps.yarn-cache.outputs.cache-hit != 'true'
28+
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json') }}
29+
- run: npm install --frozen-lockfile
30+
if: steps.npm-cache.outputs.cache-hit != 'true'
3131
- uses: actions/cache@v2
3232
id: dist
3333
name: Cache dist
3434
with:
3535
path: |
3636
packages/*/dist
3737
packages/react-styles/css
38-
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
38+
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
3939
- name: Build dist
40-
run: yarn build
40+
run: npm run build
4141
if: steps.dist.outputs.cache-hit != 'true'
4242
- name: Release to NPM
4343
run: cd packages/module && npx semantic-release@19.0.5

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ coverage
1212
generated
1313

1414
# package managers
15-
yarn-error.log
1615
lerna-debug.log
1716

1817
# IDEs and editors

‎.prettierignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ coverage
1212
generated
1313

1414
# package managers
15-
yarn-error.log
1615
lerna-debug.log
1716

1817
# IDEs and editors

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ This repo contains a set of opinionated react component groups used to standardi
44

55
## Building for production
66

7-
- run yarn install
8-
- run yarn build
7+
- run npm install
8+
- run npm run build
99

1010
## Development
11-
- run yarn install
12-
- run yarn start to build and start the development server
11+
- run npm install
12+
- run npm run start to build and start the development server
1313

1414
## Testing and Linting
15-
- run yarn test to run the tests for the demo component
16-
- run yarn lint to run the linter
15+
- run npm run test to run the tests for the demo component
16+
- run npm run lint to run the linter
1717

1818
## A11y testing
1919

20-
- run yarn build:docs followed by yarn serve:docs, then run yarn test:a11y in a new terminal window to run our accessibility tests for the components. Once the accessibility tests have finished running you can run yarn
21-
- serve:a11y to locally view the generated report.
20+
- run npm run build:docs followed by npm run serve:docs, then run npm run test:a11y in a new terminal window to run our accessibility tests for the components. Once the accessibility tests have finished running you can run
21+
- npm run serve:a11y to locally view the generated report.
2222

0 commit comments

Comments
 (0)