From afa24b2a8d4fda8fb13990c690a10071c32f4c01 Mon Sep 17 00:00:00 2001 From: Ian Hardy Date: Fri, 8 Dec 2023 15:19:01 -0500 Subject: [PATCH] CI: update scope --- .github/workflows/build-npm-release.yml | 36 +++++++++++++++++++++++++ .github/workflows/build-npm.yml | 31 +++++++++++++++++++++ package.json | 8 ++++-- src/index.js | 2 +- 4 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/build-npm-release.yml create mode 100644 .github/workflows/build-npm.yml diff --git a/.github/workflows/build-npm-release.yml b/.github/workflows/build-npm-release.yml new file mode 100644 index 0000000..4ac1952 --- /dev/null +++ b/.github/workflows/build-npm-release.yml @@ -0,0 +1,36 @@ +name: Publish release npm + +on: + release: + types: [published] + +jobs: + build: + env: + FOLIO_NPM_REGISTRY: 'https://repository.folio.org/repository/npm-folioci/' + RESHARE_NPM_REGISTRY: 'https://registry.npmjs.org' + NODEJS_VERSION: '18' + + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-node@v3 + with: + node-version: ${{ env.NODEJS_VERSION }} + registry-url: ${{ env.RESHARE_NPM_REGISTRY }} + scope: '@projectreshare' + + - name: Set yarn config + run: | + yarn config set @folio:registry ${{ env.FOLIO_NPM_REGISTRY }} + yarn config set @projectreshare:registry ${{ env.RESHARE_NPM_REGISTRY }} + + - run: yarn install + + - run: npm publish + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/build-npm.yml b/.github/workflows/build-npm.yml new file mode 100644 index 0000000..9476c4e --- /dev/null +++ b/.github/workflows/build-npm.yml @@ -0,0 +1,31 @@ +name: Build NPM + +on: + push: + +jobs: + build: + env: + FOLIO_NPM_REGISTRY: 'https://repository.folio.org/repository/npm-folioci/' + RESHARE_NPM_REGISTRY: 'https://registry.npmjs.org' + NODEJS_VERSION: '18' + + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-node@v3 + with: + node-version: ${{ env.NODEJS_VERSION }} + registry-url: ${{ env.RESHARE_NPM_REGISTRY }} + scope: '@projectreshare' + + - name: Set yarn config + run: | + yarn config set @folio:registry ${{ env.FOLIO_NPM_REGISTRY }} + yarn config set @projectreshare:registry ${{ env.RESHARE_NPM_REGISTRY }} + + - run: yarn install diff --git a/package.json b/package.json index 7b9778a..bef55cf 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@reshare/plugin-rs-siquery-vufind", + "name": "@projectreshare/plugin-rs-siquery-vufind", "version": "1.2.0", "description": "Plugin to find an instance from an SI via the Vufind API", "main": "src/index.js", @@ -19,10 +19,14 @@ "eslint": "^7.32.0" }, "dependencies": { - "@reshare/stripes-reshare": "^1.11.0", + "@projectreshare/stripes-reshare": "^1.11.0", "ky": "^0.23.0", "query-string": "^8.1.0" }, + "resolutions": { + "@rehooks/local-storage": "2.4.4", + "postcss-nesting" : "^10.0.0" + }, "peerDependencies": { "@folio/stripes": "^7.1.0 || ^8.0.0", "react": "*", diff --git a/src/index.js b/src/index.js index bc07ecc..03193ed 100644 --- a/src/index.js +++ b/src/index.js @@ -5,7 +5,7 @@ import { useInfiniteQuery } from 'react-query'; import { useState } from 'react'; import { Button, LoadingPane, Modal, MultiColumnList, Pane, Paneset } from '@folio/stripes/components'; -import { useIntlCallout } from '@reshare/stripes-reshare'; +import { useIntlCallout } from '@projectreshare/stripes-reshare'; import SearchAndFilter from './components/SearchAndFilter'; import css from './index.css';