Skip to content

Commit 6fe7d00

Browse files
committed
updating pipelines for workspaces
1 parent 528a42d commit 6fe7d00

File tree

5 files changed

+23
-32
lines changed

5 files changed

+23
-32
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ on:
88

99
jobs:
1010
build:
11-
defaults:
12-
run:
13-
working-directory: react-static-web-apps-auth
1411
runs-on: ${{ matrix.os }}
1512
strategy:
1613
matrix:
@@ -23,16 +20,13 @@ jobs:
2320
uses: actions/setup-node@v1
2421
with:
2522
node-version: ${{ matrix.node-version }}
26-
- run: npm ci
27-
- run: npm run lint
28-
- run: npm run build
23+
- run: npm ci -ws
24+
- run: npm run lint -ws
25+
- run: npm run build -ws
2926
# TODO - tests
3027
# - run: npm test
3128

3229
package:
33-
defaults:
34-
run:
35-
working-directory: react-static-web-apps-auth
3630
needs: [build]
3731
runs-on: ubuntu-18.04
3832
steps:
@@ -42,10 +36,10 @@ jobs:
4236
with:
4337
node-version: 14.x
4438

45-
- run: npm ci
46-
- run: npm run build
47-
- run: npm version prerelease --preid=ci-$GITHUB_RUN_ID --no-git-tag-version
48-
- run: npm pack
39+
- run: npm i -ws
40+
- run: npm run build -ws
41+
- run: npm version prerelease --preid=ci-$GITHUB_RUN_ID --no-git-tag-version -ws
42+
- run: npm pack -ws
4943
- name: Upload
5044
uses: actions/upload-artifact@v2
5145
with:

.github/workflows/npm-release.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ env:
1111
jobs:
1212
build:
1313
runs-on: ubuntu-latest
14-
defaults:
15-
run:
16-
working-directory: react-static-web-apps-auth
1714
environment:
1815
name: build
1916
url: ${{ steps.create_release.outputs.html_url }}
@@ -33,10 +30,10 @@ jobs:
3330
with:
3431
node-version: ${{ env.NODE_VERSION }}
3532
- run: |
36-
npm ci
37-
npm run lint
38-
npm run build
39-
npm pack
33+
npm ci -ws
34+
npm run lint -ws
35+
npm run build -ws
36+
npm pack -ws
4037
- name: Upload
4138
uses: actions/upload-artifact@v2
4239
with:

example/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"start": "react-scripts start",
1111
"build": "react-scripts build",
1212
"test": "react-scripts test",
13-
"eject": "react-scripts eject"
13+
"eject": "react-scripts eject",
14+
"lint": ""
1415
},
1516
"eslintConfig": {
1617
"extends": [

react-static-web-apps-auth/.eslintrc.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
module.exports = {
2+
extends: [
3+
"eslint:recommended",
4+
"plugin:@typescript-eslint/recommended",
5+
"prettier",
6+
"plugin:react/recommended",
7+
],
28
parser: "@typescript-eslint/parser",
39
parserOptions: {
4-
ecmaVersion: 2020,
10+
ecmaVersion: "latest",
511
sourceType: "module",
6-
ecmaFeatures: {
7-
jsx: true,
8-
},
912
},
13+
plugins: ["@typescript-eslint"],
14+
1015
settings: {
1116
react: {
1217
version: "detect",
1318
},
1419
},
15-
extends: [
16-
"plugin:react/recommended",
17-
"plugin:@typescript-eslint/recommended",
18-
"prettier/@typescript-eslint",
19-
"plugin:prettier/recommended",
20-
],
2120
rules: {
2221
"@typescript-eslint/explicit-module-boundary-types": "off",
2322
},

react-static-web-apps-auth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@typescript-eslint/parser": "^5.23.0",
3333
"eslint": "^8.15.0",
3434
"eslint-config-prettier": "^8.5.0",
35-
"eslint-plugin-prettier": "^4.0.0",
35+
"eslint-plugin-import": "^2.26.0",
3636
"eslint-plugin-react": "^7.29.4",
3737
"husky": "^8.0.1",
3838
"prettier": "^2.6.2",

0 commit comments

Comments
 (0)