Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades babel, storybook, and postcss dependencies #1056

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/pr_check_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
if: steps.job_successful.outputs.job_successful != 'true'
uses: actions/setup-node@v2
with:
node-version: "10.24.1"
node-version: "14.18.2"
registry-url: 'https://registry.npmjs.org'

- name: Setup Yarn
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
- name: Run integration tests
if: steps.integration_tests_results.outputs.integration_tests_results != 'success'
id: integration-tests
run: node scripts/jest_integration --ci --colors --max-old-space-size=5120
run: node --no-deprecation scripts/jest_integration --ci --colors --max-old-space-size=5120

# Set cache if linter, unit tests, and integration tests were successful then the job will be marked successful
# Sets individual results to empower re-runs of the same build without re-running successful steps.
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
if: steps.ftr_tests_results.outputs.ftr_tests_results != 'success'
uses: actions/setup-node@v2
with:
node-version: "10.24.1"
node-version: "14.18.2"
registry-url: 'https://registry.npmjs.org'

- name: Setup Yarn
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.24.1
14.18.2
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.24.1
14.18.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NODE_VERSION=10.24.1
ARG NODE_VERSION=14.18.2
FROM node:${NODE_VERSION} AS base

ENV HOME '.'
Expand Down
2 changes: 1 addition & 1 deletion TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ In general, we recommend three tiers of tests:

# Requirements
* Install the latest NodeJS, [NPM](https://www.npmjs.com/get-npm) and [Yarn](https://classic.yarnpkg.com/en/docs/install/#mac-stable)
* `nvm install v10.24.1`
* `nvm install v14.18.2`
* `npm install -g yarn`

# Running tests
Expand Down
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dashboarding"
],
"private": true,
"version": "2.0.0",
"version": "1.2.0",
"branch": "main",
"types": "./opensearch_dashboards.d.ts",
"tsdocMetadata": "./build/tsdoc-metadata.json",
Expand Down Expand Up @@ -42,7 +42,7 @@
"opensearch": "node scripts/opensearch",
"test": "grunt test",
"test:jest": "node scripts/jest",
"test:jest_integration": "node scripts/jest_integration",
"test:jest_integration": "node --no-deprecation scripts/jest_integration",
"test:mocha": "node scripts/mocha",
"test:mocha:coverage": "grunt test:mochaCoverage",
"test:ftr": "node scripts/functional_tests",
Expand Down Expand Up @@ -75,14 +75,12 @@
"url": "https://github.com/opensearch-project/opensearch-dashboards.git"
},
"resolutions": {
"**/@types/node": ">=10.17.17 <10.20.0",
"**/axios": "^0.21.4",
"**/@types/node": "^14.17.32",
"**/ejs": "^3.1.6",
"**/front-matter": "^4.0.2",
"**/glob-parent": "^6.0.0",
"**/hoist-non-react-statics": "^3.3.2",
"**/immer": "^9.0.6",
"**/istanbul-instrumenter-loader/schema-utils": "^1.0.0",
"**/kind-of": ">=6.0.3",
"**/lodash": "^4.17.21",
"**/merge": "^2.1.1",
Expand Down Expand Up @@ -120,7 +118,7 @@
"@elastic/datemath": "5.0.3",
"@elastic/elasticsearch": "7.10.0-rc.1",
"@elastic/eui": "29.3.2",
"@elastic/good": "8.1.1-kibana2",
"@elastic/good": "^9.0.1-kibana3",
"@elastic/numeral": "^2.5.0",
"@elastic/request-crypto": "1.1.4",
"@elastic/safer-lodash-set": "0.0.0",
Expand Down Expand Up @@ -193,11 +191,11 @@
"proxy-from-env": "1.0.0",
"query-string": "^6.13.2",
"re2": "^1.15.4",
"react": "^16.12.0",
"react": "^16.14.0",
"react-color": "^2.13.8",
"react-dom": "^16.12.0",
"react-input-range": "^1.3.0",
"react-router": "^5.2.0",
"react-router": "^5.2.1",
"react-use": "^13.27.0",
"redux-thunk": "^2.3.0",
"regenerator-runtime": "^0.13.3",
Expand All @@ -219,10 +217,10 @@
"yauzl": "^2.10.0"
},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/parser": "^7.11.2",
"@babel/register": "^7.10.5",
"@babel/types": "^7.11.0",
"@babel/core": "^7.16.5",
"@babel/parser": "^7.16.6",
"@babel/register": "^7.16.5",
"@babel/types": "^7.16.0",
"@elastic/apm-rum": "^5.6.1",
"@elastic/charts": "23.2.2",
"@elastic/ems-client": "7.10.0",
Expand All @@ -246,8 +244,8 @@
"@osd/test": "1.0.0",
"@osd/test-subj-selector": "0.2.1",
"@osd/utility-types": "1.0.0",
"@microsoft/api-documenter": "7.7.2",
"@microsoft/api-extractor": "7.7.0",
"@microsoft/api-documenter": "^7.13.65",
"@microsoft/api-extractor": "^7.18.17",
"@percy/agent": "^0.28.6",
"@testing-library/dom": "^7.24.2",
"@testing-library/jest-dom": "^5.11.4",
Expand All @@ -257,7 +255,7 @@
"@types/angular": "^1.6.56",
"@types/angular-mocks": "^1.7.0",
"@types/archiver": "^3.1.0",
"@types/babel__core": "^7.1.10",
"@types/babel__core": "^7.1.17",
"@types/bluebird": "^3.1.1",
"@types/boom": "^7.2.0",
"@types/chance": "^1.0.0",
Expand Down Expand Up @@ -303,7 +301,7 @@
"@types/mock-fs": "^4.10.0",
"@types/moment-timezone": "^0.5.12",
"@types/mustache": "^0.8.31",
"@types/node": ">=10.17.17 <10.20.0",
"@types/node": "^14.17.32",
"@types/node-forge": "^0.9.5",
"@types/normalize-path": "^3.0.0",
"@types/pegjs": "^0.10.1",
Expand All @@ -316,16 +314,16 @@
"@types/react-grid-layout": "^0.16.7",
"@types/react-redux": "^7.1.9",
"@types/react-resize-detector": "^4.0.1",
"@types/react-router": "^5.1.7",
"@types/react-router-dom": "^5.1.5",
"@types/react-router": "^5.1.17",
"@types/react-router-dom": "^5.3.2",
"@types/react-virtualized": "^9.18.7",
"@types/recompose": "^0.30.6",
"@types/request": "^2.48.2",
"@types/selenium-webdriver": "^4.0.9",
"@types/semver": "^5.5.0",
"@types/sinon": "^7.0.13",
"@types/strip-ansi": "^5.2.1",
"@types/styled-components": "^5.1.0",
"@types/styled-components": "^5.1.19",
"@types/supertest": "^2.0.5",
"@types/supertest-as-promised": "^2.0.38",
"@types/tapable": "^1.0.6",
Expand All @@ -336,8 +334,8 @@
"@types/uuid": "^3.4.4",
"@types/vinyl": "^2.0.4",
"@types/vinyl-fs": "^2.4.11",
"@types/webpack": "^4.41.3",
"@types/webpack-env": "^1.15.2",
"@types/webpack": "^4.41.31",
"@types/webpack-env": "^1.16.3",
"@types/zen-observable": "^0.8.0",
"@typescript-eslint/eslint-plugin": "^3.10.0",
"@typescript-eslint/parser": "^3.10.0",
Expand Down Expand Up @@ -431,16 +429,18 @@
"nyc": "^14.1.1",
"pixelmatch": "^5.1.0",
"pngjs": "^3.4.0",
"postcss": "^8.2.10",
"postcss": "^8.4.5",
"prettier": "^2.1.1",
"prop-types": "^15.7.2",
"react": "^16.14.0",
"react-grid-layout": "^0.16.2",
"react-markdown": "^4.3.1",
"react-monaco-editor": "~0.27.0",
"react-redux": "^7.2.0",
"react-resize-detector": "^4.2.0",
"react-router-dom": "^5.2.0",
"react-router-dom": "^5.3.0",
"react-sizeme": "^2.3.6",
"react-test-renderer": "^16.12.0",
"reactcss": "1.2.3",
"redux": "^4.0.5",
"regenerate": "^1.4.0",
Expand Down Expand Up @@ -468,7 +468,7 @@
"zlib": "^1.0.5"
},
"engines": {
"node": "10.24.1",
"node": "14.18.2",
"yarn": "^1.21.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@typescript-eslint/parser": "^3.10.0",
"babel-eslint": "^10.0.3",
"eslint": "^6.8.0",
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-babel": "^5.3.1",
"eslint-plugin-ban": "^1.4.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-eslint-comments": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"osd:watch": "node scripts/build --source-maps --watch"
},
"devDependencies": {
"@babel/cli": "^7.14.5",
"@babel/cli": "^7.16.0",
"@osd/dev-utils": "1.0.0",
"@osd/babel-preset": "1.0.0",
"typescript": "4.0.2"
Expand Down
20 changes: 10 additions & 10 deletions packages/osd-babel-preset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
"devOnly": true
},
"dependencies": {
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-proposal-export-namespace-from": "^7.10.4",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
"@babel/plugin-proposal-optional-chaining": "^7.11.0",
"@babel/plugin-proposal-private-methods": "^7.10.4",
"@babel/preset-env": "^7.11.0",
"@babel/preset-react": "^7.10.4",
"@babel/preset-typescript": "^7.10.4",
"@babel/plugin-proposal-class-properties": "^7.16.5",
"@babel/plugin-proposal-export-namespace-from": "^7.16.5",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.5",
"@babel/plugin-proposal-optional-chaining": "^7.16.5",
"@babel/plugin-proposal-private-methods": "^7.16.5",
"@babel/preset-env": "^7.16.5",
"@babel/preset-react": "^7.16.5",
"@babel/preset-typescript": "^7.16.5",
"babel-plugin-add-module-exports": "^1.0.4",
"babel-plugin-styled-components": "^1.10.7",
"babel-plugin-styled-components": "^2.0.2",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"react-is": "^16.8.0",
"styled-components": "^5.1.0"
"styled-components": "^5.3.3"
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion packages/osd-config-schema/src/types/stream_type.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,13 @@ test('includes namespace in failure', () => {
describe('#defaultValue', () => {
test('returns default when undefined', () => {
const value = new Stream();
expect(schema.stream({ defaultValue: value }).validate(undefined)).toStrictEqual(value);
expect(schema.stream({ defaultValue: value }).validate(undefined)).toMatchInlineSnapshot(`
Stream {
"_events": Object {},
"_eventsCount": 0,
"_maxListeners": undefined,
}
`);
});

test('returns value when specified', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-dev-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"devOnly": true
},
"dependencies": {
"@babel/core": "^7.11.6",
"@babel/core": "^7.16.5",
"@osd/utils": "1.0.0",
"axios": "^0.21.4",
"chalk": "^4.1.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/osd-dev-utils/src/proc_runner/proc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ export function startProc(name: string, options: ProcOptions, log: ToolingLog) {
});

if (stdin) {
childProcess.stdin.end(stdin, 'utf8');
childProcess.stdin!.end(stdin, 'utf8');
} else {
childProcess.stdin.end();
childProcess.stdin!.end();
}

let stopCalled = false;
Expand Down Expand Up @@ -136,8 +136,8 @@ export function startProc(name: string, options: ProcOptions, log: ToolingLog) {
).pipe(share());

const lines$ = Rx.merge(
observeLines(childProcess.stdout),
observeLines(childProcess.stderr)
observeLines(childProcess.stdout!),
observeLines(childProcess.stderr!)
).pipe(
tap((line) => log.write(` ${chalk.gray('proc')} [${chalk.gray(name)}] ${line}`)),
share()
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/osd-i18n/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"osd:watch": "node scripts/build --watch --source-maps"
},
"devDependencies": {
"@babel/cli": "^7.14.5",
"@babel/core": "^7.11.6",
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.5",
"@osd/babel-preset": "1.0.0",
"@osd/dev-utils": "1.0.0",
"@types/intl-relativeformat": "^2.1.0",
Expand All @@ -28,7 +28,7 @@
"intl-messageformat": "^2.2.0",
"intl-relativeformat": "^2.1.0",
"prop-types": "^15.7.2",
"react": "^16.12.0",
"react": "^16.14.0",
"react-intl": "^2.8.0"
}
}
2 changes: 1 addition & 1 deletion packages/osd-i18n/src/__snapshots__/loader.test.ts.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions packages/osd-interpreter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@
"osd:watch": "node scripts/build --dev --watch"
},
"dependencies": {
"@babel/runtime": "^7.11.2",
"@babel/runtime": "^7.16.5",
"@osd/i18n": "1.0.0",
"lodash": "^4.17.21",
"uuid": "3.3.2"
},
"devDependencies": {
"@babel/cli": "^7.14.5",
"@babel/core": "^7.11.6",
"@babel/plugin-transform-modules-commonjs": "^7.10.4",
"@babel/plugin-transform-runtime": "^7.11.0",
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.5",
"@babel/plugin-transform-modules-commonjs": "^7.16.5",
"@babel/plugin-transform-runtime": "^7.16.5",
"@osd/babel-preset": "1.0.0",
"@osd/dev-utils": "1.0.0",
"babel-loader": "^8.0.6",
"babel-loader": "^8.2.3",
"copy-webpack-plugin": "^6.0.2",
"css-loader": "^3.4.2",
"css-loader": "^5.2.7",
"del": "^5.1.0",
"getopts": "^2.2.5",
"pegjs": "0.10.0",
"sass-loader": "^8.0.2",
"sass-loader": "^10.2.0",
"style-loader": "^1.1.3",
"supports-color": "^7.0.0",
"url-loader": "^2.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/osd-monaco/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"devDependencies": {
"@osd/babel-preset": "1.0.0",
"@osd/dev-utils": "1.0.0",
"babel-loader": "^8.0.6",
"css-loader": "^3.4.2",
"babel-loader": "^8.2.3",
"css-loader": "^5.2.7",
"del": "^5.1.0",
"raw-loader": "^3.1.0",
"supports-color": "^7.0.0",
Expand Down
Loading