Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: folio-org/stripes-cli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.2.0
Choose a base ref
...
head repository: folio-org/stripes-cli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 6 commits
  • 7 files changed
  • 3 contributors

Commits on Oct 21, 2024

  1. bump minor to 3.3 for new development work (#359)

    zburke authored Oct 21, 2024
    Copy the full SHA
    a3d8d4c View commit details

Commits on Nov 4, 2024

  1. STCLI-252 Add more ACQ modules to the apps list (#361)

    https://folio-org.atlassian.net/browse/STCLI-252
    https://folio-org.atlassian.net/browse/FOLIO-4111
    
    Include the following apps into environment inventory list:
    - `ui-claims`
    - `ui-gobi-settings`
    usavkov-epam authored Nov 4, 2024
    Copy the full SHA
    082c7db View commit details

Commits on Nov 14, 2024

  1. STCLI-248 prune STS headers from server responses in the proxy (#358)

    Prune the STS header from server responses when forwarding it through
    the proxy, thus allowing non-SSL access via, e.g. http://localhost:3000,
    even when the remote server supplies an STS header that requires
    end-to-end SSL.
    
    Refs STCLI-248
    zburke authored Nov 14, 2024
    Copy the full SHA
    8bcddbf View commit details

Commits on Nov 21, 2024

  1. STCLI-256 turn off StrictMode when running tests (#363)

    `<StrictMode>` is intended to be a development-only setting so it should
    be disabled when running tests. e.g. a component that fetches data on
    mount with `accumulate: true` would see that data duplicated.
    
    Refs STCLI-256
    zburke authored Nov 21, 2024
    Copy the full SHA
    798f10c View commit details

Commits on Jan 9, 2025

  1. STCLI-257 implement CODEOWNERS (#365)

    Refs STCLI-257
    zburke authored Jan 9, 2025
    Copy the full SHA
    65e5e5a View commit details

Commits on Jan 13, 2025

  1. STCLI-258 Check for main branch in stripes platform pull command. (

    …#366)
    
    ## Description
    Since a few of UI modules are now using `main` instead of `master`
    branch we should update the pull command to check for it also.
    
    ## Issues
    [STCLI-258](https://folio-org.atlassian.net/browse/STCLI-258)
    BogdanDenis authored Jan 13, 2025
    Copy the full SHA
    0e680c0 View commit details
Showing with 26 additions and 6 deletions.
  1. +2 −0 .github/CODEOWNERS
  2. +8 −1 CHANGELOG.md
  3. +2 −2 lib/commands/platform/pull.js
  4. +1 −1 lib/environment/inventory.json
  5. +4 −0 lib/platform/tenant-config.js
  6. +7 −0 lib/run-proxy.js
  7. +2 −2 package.json
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* @folio-org/stripes-force

9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Change history for stripes-cli

## 3.2.0 IN PROGRESS
## 3.3.0 IN PROGRESS

* Prune STS headers, permitting local non-SSL access via proxy. Refs STCLI-248.
* Turn off `<StrictMode>` when running tests. Refs STCLI-256.
* Check for `main` branch in `stripes platform pull` command. Refs STCLI-258.

## [3.2.0](https://github.com/folio-org/stripes-cli/tree/v3.2.0) (2024-10-09)
[Full Changelog](https://github.com/folio-org/stripes-cli/compare/v3.1.0...v3.2.0)

* Add a proxy server to overcome issues with cookies SameSite policy. Refs STCLI-246.
* Bug fix: don't pass unused arguments to `okToPull()`. Refs STCLI-250.
4 changes: 2 additions & 2 deletions lib/commands/platform/pull.js
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@ function pullRepository(dir) {
if (status.ahead) {
reject(new Error('Branch contains committed changes to push.'));
}
if (status.current !== 'master') {
reject(new Error(`Branch is not master. (${status.current})`));
if (status.current !== 'master' && status.current !== 'main') {
reject(new Error(`Branch is not master or main. (${status.current})`));
}
resolve(status);
})
2 changes: 1 addition & 1 deletion lib/environment/inventory.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"apps":["ui-acquisition-units","ui-agreements","ui-audit","ui-bulk-edit","ui-calendar","ui-checkin","ui-checkout","ui-circulation","ui-consortia-settings","ui-courses","ui-data-export","ui-data-import","ui-datasets","ui-developer","ui-eholdings","ui-erm-comparison","ui-erm-usage","ui-finance","ui-finc-config","ui-finc-select","ui-inventory","ui-invoice","ui-licenses","ui-lists","ui-local-kb-admin","ui-marccat","ui-myprofile","ui-notes","ui-oai-pmh","ui-okapi-console","ui-orders","ui-organizations","ui-quick-marc","ui-receiving","ui-requests","ui-search","ui-servicepoints","ui-tags","ui-tenant-settings","ui-users"],"libs":["stripes-acq-components","stripes-components","stripes-connect","stripes-core","stripes-data-transfer-components","stripes-erm-components","stripes-final-form","stripes-form","stripes-react-hotkeys","stripes-marc-components","stripes-smart-components","stripes-ui","stripes-util"],"other":["eslint-config-stripes","stripes","stripes-cli","stripes-testing","stripes-types","stripes-webpack","ui-app-template","ui-plugin-example"],"platforms":["platform-complete","platform-core","platform-erm","stripes-demo-platform","stripes-sample-platform"],"plugins":["ui-plugin-bursar-export","ui-plugin-create-inventory-records","ui-plugin-create-item","ui-plugin-find-agreement","ui-plugin-find-contact","ui-plugin-find-eresource","ui-plugin-find-erm-usage-data-provider","ui-plugin-find-finc-metadata-collection","ui-plugin-find-finc-metadata-source","ui-plugin-find-import-profile","ui-plugin-find-instance","ui-plugin-find-interface","ui-plugin-find-license","ui-plugin-find-organization","ui-plugin-find-package-title","ui-plugin-find-po-line","ui-plugin-find-user","ui-plugin-query-builder"]}
{"apps":["ui-acquisition-units","ui-agreements","ui-audit","ui-bulk-edit","ui-calendar","ui-checkin","ui-checkout","ui-circulation","ui-claims","ui-consortia-settings","ui-courses","ui-data-export","ui-data-import","ui-datasets","ui-developer","ui-eholdings","ui-erm-comparison","ui-erm-usage","ui-finance","ui-finc-config","ui-finc-select","ui-gobi-settings","ui-inventory","ui-invoice","ui-licenses","ui-lists","ui-local-kb-admin","ui-marccat","ui-myprofile","ui-notes","ui-oai-pmh","ui-okapi-console","ui-orders","ui-organizations","ui-quick-marc","ui-receiving","ui-requests","ui-search","ui-servicepoints","ui-tags","ui-tenant-settings","ui-users"],"libs":["stripes-acq-components","stripes-components","stripes-connect","stripes-core","stripes-data-transfer-components","stripes-erm-components","stripes-final-form","stripes-form","stripes-react-hotkeys","stripes-marc-components","stripes-smart-components","stripes-ui","stripes-util"],"other":["eslint-config-stripes","stripes","stripes-cli","stripes-testing","stripes-types","stripes-webpack","ui-app-template","ui-plugin-example"],"platforms":["platform-complete","platform-core","platform-erm","stripes-demo-platform","stripes-sample-platform"],"plugins":["ui-plugin-bursar-export","ui-plugin-create-inventory-records","ui-plugin-create-item","ui-plugin-find-agreement","ui-plugin-find-contact","ui-plugin-find-eresource","ui-plugin-find-erm-usage-data-provider","ui-plugin-find-finc-metadata-collection","ui-plugin-find-finc-metadata-source","ui-plugin-find-fund","ui-plugin-find-import-profile","ui-plugin-find-instance","ui-plugin-find-interface","ui-plugin-find-license","ui-plugin-find-organization","ui-plugin-find-package-title","ui-plugin-find-po-line","ui-plugin-find-user","ui-plugin-query-builder"]}
4 changes: 4 additions & 0 deletions lib/platform/tenant-config.js
Original file line number Diff line number Diff line change
@@ -12,6 +12,10 @@ const defaultConfig = {
hasAllPerms: false,
languages: ['en'],
useSecureTokens: true,

// run tests in production-mode
// <StrictMode> is intended for dev-only
disableStrictMode: true,
},
modules: {
},
7 changes: 7 additions & 0 deletions lib/run-proxy.js
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ const { createProxyMiddleware } = require('http-proxy-middleware');

const app = express();

// [argv.okapi, argv.port, argv.proxyHost, argv.proxyPort]);
const OKAPI = process.argv[2];
const PORT = process.argv[3];
const PROXY_HOST = process.argv[4];
@@ -15,8 +16,14 @@ app.use(
changeOrigin: true,
on: {
proxyRes: (proxyRes) => {
// STCOM-247: overwrite any CORS headers in responses with those of
// the proxy, thus allowing access from any browser pointed at the proxy.
proxyRes.headers['Access-Control-Allow-Origin'] = `${PROXY_HOST}:${PORT}`;
proxyRes.headers['Access-Control-Allow-Credentials'] = 'true';

// STCOM-248: omit STS headers in responses, thus allowing non-ssl access,
// e.g. access via http://localhost:3000
delete proxyRes.headers['Strict-Transport-Security'];
},
},
}),
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@folio/stripes-cli",
"version": "3.2.0",
"version": "3.3.0",
"description": "Stripes Command Line Interface",
"repository": "https://github.com/folio-org/stripes-cli",
"publishConfig": {
@@ -23,7 +23,7 @@
},
"dependencies": {
"@folio/stripes-testing": "^3.0.0",
"@folio/stripes-webpack": "^5.0.0",
"@folio/stripes-webpack": "^5.2.0",
"@formatjs/cli": "^6.1.3",
"@formatjs/cli-lib": "^6.1.3",
"@octokit/rest": "^19.0.7",