Skip to content

Commit

Permalink
fix: upgrade a lot of deps
Browse files Browse the repository at this point in the history
  • Loading branch information
jhpedemonte committed Jan 16, 2024
1 parent d0c6a57 commit c85fb60
Show file tree
Hide file tree
Showing 135 changed files with 13,197 additions and 15,062 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
# https://github.com/actions/checkout/issues/217 pulls all tags (needed for lerna to correctly version)
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
# https://github.com/actions/setup-node
- name: Setup Node 16
- name: Setup Node 20
uses: actions/setup-node@v2
with:
node-version: 16
node-version: 20
- name: Install
run: yarn install --immutable
- name: Lint
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
20
9 changes: 0 additions & 9 deletions .yarn/plugins/@yarnpkg/plugin-typescript.cjs

This file was deleted.

28 changes: 0 additions & 28 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

This file was deleted.

783 changes: 0 additions & 783 deletions .yarn/releases/yarn-3.2.3.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.2.cjs

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@ nmMode: hardlinks-global

nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-3.2.3.cjs
yarnPath: .yarn/releases/yarn-4.0.2.cjs
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ First, you will need to customize and improve your document retrieval project on

- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
- [nvm](https://github.com/nvm-sh/nvm#installation-and-update)
- Set Node version to 16.x.x via `nvm install 16` and `nvm use 16` (also compatible with Node 18)
- Set Node version `nvm use` (uses value defined in `.nvmrc` file)
- [yarn](https://yarnpkg.com/getting-started/install) or [npm](https://www.npmjs.com/get-npm)
- On MacOS, install any waiting OS Software Updates and install Xcode Command Line Tools by running `xcode-select --install` in terminal.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ describe('Pagination', () => {

it('items per page has the correct options available', () => {
itemsPerPageOptions.forEach(option => {
cy.findByLabelText(/^Items per page/)
.select(option)
.should('have.value', option);
cy.findByLabelText(/^Items per page/).select(option);
cy.findByLabelText(/^Items per page/).should('have.value', option);
});
});
});
Expand Down Expand Up @@ -77,6 +76,7 @@ describe('Pagination', () => {
describe('and we navigate to the last page of results', () => {
beforeEach(() => {
// click 'next' 5 times to get to end
// eslint-disable-next-line cypress/unsafe-to-chain-command
cy.findByLabelText('Next page').click().click().click().click().click();
cy.wait('@postQueryMultiPage');
});
Expand Down
18 changes: 9 additions & 9 deletions examples/discovery-search-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,31 @@
"server:setup": "node ./scripts/setSdkUrl.js"
},
"dependencies": {
"@carbon/icons": "^10.5.0",
"@carbon/icons": "^10.48.3",
"@ibm-watson/discovery-react-components": "workspace:*",
"@ibm-watson/discovery-styles": "workspace:*",
"body-parser": "^1.19.0",
"body-parser": "^1.20.2",
"carbon-components": "~10.46.0",
"carbon-components-react": "~7.46.0",
"carbon-icons": "^7.0.7",
"classnames": "^2.2.6",
"classnames": "^2.5.1",
"core-js": "^2.6.12",
"cors": "^2.8.5",
"dotenv": "^16.0.3",
"express": "^4.17.1",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"http-proxy-middleware": "^0.20.0",
"ibm-watson": "^6.2.1",
"ibm-watson": "^6.2.2",
"node-polyfill-webpack-plugin": "^2.0.1",
"proper-url-join": "^2.1.1",
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"devDependencies": {
"@testing-library/cypress": "^7.0.7",
"@types/proper-url-join": "^2",
"@types/proper-url-join": "^2.1.4",
"cross-env": "^7.0.3",
"cypress": "^10.8.0",
"cypress": "^10.11.0",
"react-scripts": "^5.0.1",
"start-server-and-test": "^1.14.0"
"start-server-and-test": "^1.15.4"
}
}
90 changes: 38 additions & 52 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,77 +7,62 @@
],
"scripts": {
"postinstall": "husky install",
"lint": "yarn workspaces foreach -v --parallel run lint",
"audit": "audit-ci --moderate",
"build:pkgs": "yarn workspaces foreach -v --parallel --include '@ibm-watson/*' run build",
"build:apps": "yarn workspaces foreach -v --parallel run build:app",
"test": "yarn workspaces foreach -v --parallel run test",
"lint": "yarn workspaces foreach -Av --parallel run lint",
"build:pkgs": "yarn workspaces foreach -Av --parallel --include '@ibm-watson/*' run build",
"build:apps": "yarn workspaces foreach -Av --parallel run build:app",
"test": "yarn workspaces foreach -Av --parallel run test",
"g:analyze": "cd $INIT_CWD && source-map-explorer",
"g:eslint": "cd $INIT_CWD && eslint"
},
"devDependencies": {
"@babel/core": "^7.16.12",
"@babel/preset-env": "^7.19.1",
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^11.2.7",
"@testing-library/react-hooks": "^8.0.1",
"@types/babel__preset-env": "^7.9.2",
"@types/classnames": "^2.2.9",
"@types/debounce": "^1.2.0",
"@types/dompurify": "^3.0.2",
"@types/jest": "^24.0.18",
"@types/lodash": "^4.14.141",
"@types/md5": "2.3.2",
"@types/mustache": "^4.2.2",
"@types/node": "^16.18.23",
"@types/react": "^17.0.38",
"@types/react-dom": "^17.0.11",
"@types/babel__preset-env": "^7.9.6",
"@types/classnames": "^2.3.1",
"@types/debounce": "^1.2.4",
"@types/dompurify": "^3.0.5",
"@types/jest": "^27.5.2",
"@types/lodash": "^4.14.202",
"@types/md5": "2.3.5",
"@types/mustache": "^4.2.5",
"@types/node": "^20.11.4",
"@types/react": "^17.0.75",
"@types/react-dom": "^17.0.25",
"@types/react-resize-detector": "^4.2.0",
"@types/react-virtualized": "^9.21.11",
"@types/seedrandom": "^3.0.2",
"@types/testing-library__cypress": "^5.0.9",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"audit-ci": "^5.1.2",
"@types/react-virtualized": "^9.21.29",
"@types/seedrandom": "^3.0.8",
"@types/testing-library__cypress": "^5.0.13",
"axios": "^0.21.4",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.2.3",
"doctoc": "^2.2.0",
"eslint": "^8.3.0",
"eslint-config-prettier": "^8.5.0",
"doctoc": "^2.2.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^8.10.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-no-only-tests": "^2.6.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"fast-xml-parser": "^3.14.0",
"gh-pages": "^2.1.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"fast-xml-parser": "^3.21.1",
"gh-pages": "^2.2.0",
"husky": "^8.0.3",
"ibm-watson": "^6.2.1",
"lerna": "^6.6.1",
"lint-staged": "^13.0.3",
"lorem-ipsum": "^2.0.3",
"ibm-watson": "^6.2.2",
"lerna": "^6.6.2",
"lint-staged": "^13.3.0",
"lorem-ipsum": "^2.0.8",
"md5": "^2.3.0",
"prettier": "^2.4.1",
"proper-url-join": "^2.1.1",
"raw-loader": "^4.0.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"react-test-renderer": "^17.0.2",
"regenerator-runtime": "^0.13.3",
"seedrandom": "^3.0.5",
"source-map-explorer": "2.0.1",
"ts-loader": "^9.4.2",
"typescript": "^3.8.2",
"vue": "^2.6.11",
"webpack": "5.72.1",
"yarnhook": "0.5.2-0"
"source-map-explorer": "2.5.3",
"yarnhook": "0.5.3"
},
"lint-staged": {
"{packages,examples}/**/*.{json,css,scss,md}": [
Expand All @@ -102,8 +87,9 @@
"last 1 safari version"
]
},
"packageManager": "yarn@3.2.3",
"packageManager": "yarn@4.0.2",
"resolutions": {
"react-scripts@^5.0.1": "patch:react-scripts@npm:5.0.1#.yarn/patches/react-scripts-npm-5.0.1-d06bd2d5ad"
"react-scripts@^5.0.1": "patch:react-scripts@npm:5.0.1#.yarn/patches/react-scripts-npm-5.0.1-d06bd2d5ad",
"@types/react@npm:*": "^17"
}
}
53 changes: 30 additions & 23 deletions packages/discovery-react-components/.storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,34 +1,41 @@
module.exports = {
stories: process.env.STORYBOOK_BUILD_MODE == 'production' ? ['../src/**/__stories__/*.stories.tsx'] : ['../src/**/*.stories.tsx'],
import { dirname, join } from 'path';
import { StorybookConfig } from '@storybook/react-vite';

const config: StorybookConfig = {
stories:
process.env.STORYBOOK_BUILD_MODE == 'production'
? ['../src/**/__stories__/*.stories.tsx']
: ['../src/**/*.stories.tsx'],

addons: [
'@storybook/preset-create-react-app',
'@storybook/addon-actions',
getAbsolutePath('@storybook/addon-actions'),
{
name: '@storybook/addon-docs',
options: {
configureJSX: true,
},
configureJSX: true
}
},
'@storybook/addon-knobs'
getAbsolutePath('@storybook/addon-knobs')
],

core: {
builder: 'webpack5',
disableTelemetry: true
},

staticDirs: ['../../../node_modules/pdfjs-dist/build/'],
webpackFinal: (config) => {
// ignore some Node.js packages
config.resolve.fallback.crypto = false;
config.resolve.fallback.fs = false;
config.resolve.fallback.https = false;
config.resolve.fallback.os = false;
config.resolve.fallback.stream = false;
config.resolve.fallback.zlib = false;

config.module.rules.push({
test: /\.worker\.min\.js$/,
use: 'raw-loader'
});

return config;

framework: {
name: getAbsolutePath('@storybook/react-vite'),
options: {}
},

docs: {
autodocs: true
}
};

function getAbsolutePath(value: string): any {
return dirname(require.resolve(join(value, 'package.json')));
}

export default config;
16 changes: 10 additions & 6 deletions packages/discovery-react-components/.storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import { addParameters } from '@storybook/react';
import { Preview } from '@storybook/react';
import { DocsPage, DocsContainer } from '@storybook/addon-docs/blocks';
import './styles.scss';

addParameters({
docs: {
container: DocsContainer,
page: DocsPage
const preview: Preview = {
parameters: {
docs: {
container: DocsContainer,
page: DocsPage
}
}
});
};

export default preview;
4 changes: 2 additions & 2 deletions packages/discovery-react-components/.storybook/styles.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@ibm-watson/discovery-styles/scss/index';
@import '@ibm-watson/discovery-styles/scss/index';

// for document-preview-toolbar story
@import '~carbon-components/scss/components/overflow-menu/overflow-menu';
@import 'carbon-components/scss/components/overflow-menu/overflow-menu';
Loading

0 comments on commit c85fb60

Please sign in to comment.