Skip to content

Commit 1889a7b

Browse files
authored
fix: fix publishing to npm (#1577)
1 parent 46cdd79 commit 1889a7b

File tree

5 files changed

+4588
-8246
lines changed

5 files changed

+4588
-8246
lines changed

.github/workflows/dhis2-verify-lib.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
runs-on: ubuntu-latest
3535
steps:
3636
- uses: actions/checkout@v2
37-
- uses: actions/setup-node@v1
37+
- uses: actions/setup-node@v3
3838
with:
3939
node-version: 20.x
4040

4141
- uses: c-hive/gha-yarn-cache@v1
4242
- run: |
4343
yarn install --frozen-lockfile
44-
NODE_OPTIONS=--openssl-legacy-provider yarn setup
44+
yarn setup
4545
4646
- name: Build
4747
run: yarn build
@@ -59,7 +59,7 @@ jobs:
5959
runs-on: ubuntu-latest
6060
steps:
6161
- uses: actions/checkout@v2
62-
- uses: actions/setup-node@v1
62+
- uses: actions/setup-node@v3
6363
with:
6464
node-version: 20.x
6565

@@ -80,7 +80,7 @@ jobs:
8080
needs: [build]
8181
steps:
8282
- uses: actions/checkout@v2
83-
- uses: actions/setup-node@v1
83+
- uses: actions/setup-node@v3
8484
with:
8585
node-version: 20.x
8686

@@ -112,7 +112,7 @@ jobs:
112112
- name: Checkout
113113
uses: actions/checkout@v2
114114

115-
- uses: actions/setup-node@v1
115+
- uses: actions/setup-node@v3
116116
with:
117117
node-version: 20.x
118118

@@ -175,7 +175,6 @@ jobs:
175175
- uses: actions/setup-node@v3
176176
with:
177177
node-version: 20.x
178-
cache: 'yarn'
179178

180179
- uses: actions/download-artifact@v2
181180
with:
@@ -184,9 +183,10 @@ jobs:
184183
- run: ./scripts/extract-artifact.sh
185184

186185
# ensure that d2-app-scripts is available
186+
- uses: c-hive/gha-yarn-cache@v1
187187
- run: yarn install --frozen-lockfile
188188

189-
- uses: dhis2/action-semantic-release@master
189+
- uses: dhis2/action-semantic-release@node20
190190
with:
191191
publish-npm: true
192192
publish-github: true

docs/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"file-loader": "^6.2.0",
2929
"prism-react-renderer": "^1.2.1",
3030
"prop-types": "^15.7.2",
31-
"react-docgen-props-table": "^1.0.3",
3231
"url-loader": "^4.1.1"
3332
},
3433
"peerDependencies": {

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"@badeball/cypress-cucumber-preprocessor": "^20.0.2",
5858
"@cypress/webpack-preprocessor": "^6.0.1",
5959
"@dhis2/app-runtime": "^3.9.0",
60-
"@dhis2/cli-app-scripts": "^8.0.0",
60+
"@dhis2/cli-app-scripts": "^11.7.0",
6161
"@dhis2/cli-style": "10.4.2",
6262
"@dhis2/cli-utils-docsite": "^3.1.2",
6363
"@dhis2/cypress-commands": "^10.0.5",
@@ -81,7 +81,8 @@
8181
"rimraf": "^3.0.2",
8282
"wait-on": "^6.0.0"
8383
},
84-
"resolutions": {
85-
"react": "16.13.1"
84+
"overrides": {
85+
"react": "$react",
86+
"react-dom": "$react"
8687
}
8788
}

storybook/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"build": "EXTEND_ESLINT=true storybook build -c config -o ../dist/demo"
1616
},
1717
"peerDependencies": {
18-
"styled-jsx": "^4"
18+
"styled-jsx": "^4",
19+
"typescript": "^4"
1920
},
2021
"dependencies": {
2122
"@babel/plugin-proposal-class-properties": "^7.13.0",

0 commit comments

Comments
 (0)