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.

Sign up for GitHub

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

Jump to bottom

Upgrade dependencies #600

Merged
merged 4 commits into from
Jun 24, 2022
Merged

Upgrade dependencies #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
389bf69
WIP
Janpot Jun 24, 2022
ac50fa3
lock fix
Janpot Jun 24, 2022
a36a9a6
upgrade
Janpot Jun 24, 2022
70a3f28
upgarde
Janpot Jun 24, 2022
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
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"prisma": "dotenv yarn workspace @mui/toolpad-app run --cwd=\"./packages/toolpad-app\" prisma",
"release:build": "lerna run --stream build",
"release:version": "lerna version --no-changelog --no-push --no-git-tag-version",
"release:docker": "node ./scripts/releaseDocker.js",
"release:docker": "node ./scripts/releaseDocker.mjs",
"release:changelog": "dotenv -- node ./scripts/releaseChangelog.js --repo mui-toolpad",
"test:build": "lerna run build --scope @mui/toolpad-core --scope @mui/toolpad-components --stream",
"e2e:smoke": "playwright test --config ./test/e2e-smoke/playwright.config.ts",
Expand All @@ -38,8 +38,8 @@
"@swc/helpers": "^0.4.2",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^13.0.0",
"@types/jest": "^27.4.0",
"@types/node": "^17.0.23",
"@types/jest": "^28.1.3",
"@types/node": "^18.0.0",
"@types/rimraf": "^3.0.2",
"@typescript-eslint/eslint-plugin": "^5.21.0",
"@typescript-eslint/parser": "^5.21.0",
Expand All @@ -58,19 +58,19 @@
"execa": "^6.1.0",
"format-util": "^1.0.5",
"jest": "^28.0.0-alpha.8",
"lerna": "^4.0.0",
"lerna": "^5.1.5",
"prettier": "^2.6.2",
"prettier-plugin-prisma": "^3.11.0",
"regenerator-runtime": "^0.13.9",
"rimraf": "^3.0.2",
"ts-node": "^10.7.0",
"typescript": "^4.7.4",
"yarn-deduplicate": "^4.0.0"
"yarn-deduplicate": "^5.0.0"
},
"dependencies": {
"cross-env": "^7.0.3",
"dotenv-cli": "^5.1.0",
"inquirer": "^8.2.4",
"inquirer": "^9.0.0",
"jest-environment-jsdom": "^28.0.0-alpha.8",
"semver": "^7.3.7",
"yargs": "^17.5.1"
Expand Down
25 changes: 12 additions & 13 deletions packages/toolpad-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
],
"dependencies": {
"@babel/code-frame": "^7.16.7",
"@emotion/cache": "^11.7.1",
"@emotion/react": "^11.8.2",
"@emotion/cache": "^11.9.3",
"@emotion/react": "^11.9.3",
"@emotion/server": "^11.4.0",
"@emotion/styled": "^11.8.1",
"@emotion/styled": "^11.9.3",
"@monaco-editor/react": "^4.4.4",
"@mui/icons-material": "^5.8.0",
"@mui/lab": "^5.0.0-alpha.82",
"@mui/material": "^5.8.0",
"@mui/system": "^5.8.0",
"@mui/icons-material": "^5.8.4",
"@mui/lab": "^5.0.0-alpha.87",
"@mui/material": "^5.8.5",
"@mui/system": "^5.8.5",
"@mui/toolpad-components": "^0.0.7",
"@mui/toolpad-core": "^0.0.7",
"@mui/x-data-grid-pro": "^5.11.0",
"@mui/x-data-grid-pro": "^5.12.3",
"@prisma/client": "^3.13.0",
"@swc/wasm": "^1.2.204",
"@types/cors": "^2.8.12",
Expand All @@ -56,9 +56,8 @@
"es-module-shims": "^1.5.4",
"esbuild": "^0.14.31",
"find-up": "^6.2.0",
"fractional-indexing": "^2.0.0",
"fractional-indexing": "^3.0.1",
"googleapis": "^97.0.0",
"import-meta-resolve": "^1.1.1",
"json-to-ts": "^1.7.0",
"json5": "^2.2.1",
"lodash-es": "^4.17.21",
Expand All @@ -67,7 +66,7 @@
"prettier": "^2.6.2",
"pretty-bytes": "^6.0.0",
"prisma": "^3.13.0",
"quickjs-emscripten": "^0.20.0",
"quickjs-emscripten": "^0.21.0",
"react": "^18.1.0",
"react-devtools-inline": "^4.24.6",
"react-dom": "^18.1.0",
Expand All @@ -93,11 +92,11 @@
"@types/react-inspector": "^4.0.2",
"@types/serialize-javascript": "^5.0.2",
"ajv": "^8.11.0",
"eslint": "8.14.0",
"eslint": "8.18.0",
"eslint-config-next": "^12.1.5",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.25.3",
"glob": "^7.2.0",
"glob": "^8.0.3",
"monaco-editor": "^0.33.0"
},
"typings": "./index.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions packages/toolpad-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"url": "https://github.com/mui/mui-toolpad/issues"
},
"dependencies": {
"@mui/material": "^5.8.0",
"@mui/material": "^5.8.5",
"@mui/toolpad-core": "^0.0.7",
"@mui/x-data-grid-pro": "^5.11.0"
"@mui/x-data-grid-pro": "^5.12.3"
},
"devDependencies": {
"react": "^18.1.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/toolpad-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"url": "https://github.com/mui/mui-toolpad/issues"
},
"dependencies": {
"@mui/x-data-grid-pro": "^5.11.0",
"quickjs-emscripten": "^0.20.0",
"@mui/x-data-grid-pro": "^5.12.3",
"quickjs-emscripten": "^0.21.0",
"react-error-boundary": "^3.1.4",
"react-query": "^3.39.1"
},
Expand Down
18 changes: 7 additions & 11 deletions scripts/releaseDocker.js → scripts/releaseDocker.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
const yargs = require('yargs');
const inquirer = require('inquirer');
const semver = require('semver');
import inquirer from 'inquirer';
import { execa } from 'execa';
import yargs from 'yargs';
import { hideBin } from 'yargs/helpers';
import chalk from 'chalk';
import semver from 'semver';

const IMAGE_NAME = 'muicom/toolpad';
const LATEST_TAG = 'latest';

async function checkTagExists(image, tag) {
const { execa } = await import('execa');
try {
const { exitCode } = await execa('docker', ['manifest', 'inspect', `${image}:${tag}`]);
return exitCode === 0;
Expand All @@ -20,7 +22,6 @@ async function checkTagExists(image, tag) {
}

async function dockerCreateTag(image, srcTag, destTags) {
const { execa } = await import('execa');
const { exitCode, stderr } = await execa(
'docker',
[
Expand All @@ -38,7 +39,6 @@ async function dockerCreateTag(image, srcTag, destTags) {
}

async function commitLog(count = 100) {
const { execa } = await import('execa');
const { exitCode, stderr, stdout } = await execa('git', ['log', `-${count}`, `--pretty=oneline`]);
if (exitCode !== 0) {
throw new Error(stderr);
Expand All @@ -53,7 +53,6 @@ async function commitLog(count = 100) {
}

async function showFile(commit, file) {
const { execa } = await import('execa');
const { exitCode, stderr, stdout } = await execa('git', ['show', `${commit}:${file}`]);
if (exitCode !== 0) {
throw new Error(stderr);
Expand All @@ -62,14 +61,11 @@ async function showFile(commit, file) {
}

async function currentBranch() {
const { execa } = await import('execa');
const { stdout } = await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
return stdout;
}

async function main({ yes, force, commit, releaseTag, 'no-latest': noLatest }) {
const { default: chalk } = await import('chalk');

if (!commit) {
const branch = await currentBranch();
if (branch !== 'master') {
Expand Down Expand Up @@ -164,7 +160,7 @@ async function main({ yes, force, commit, releaseTag, 'no-latest': noLatest }) {
await dockerCreateTag(IMAGE_NAME, commit, tags);
}

yargs
yargs(hideBin(process.argv))
.command({
command: '$0',
description: 'Creates a Docker release',
Expand Down
Loading