Skip to content

Commit 8734ef1

Browse files
authored
Merge pull request #24 from openscript/develop
Upgrade dependencies
2 parents 3385c4b + c995993 commit 8734ef1

File tree

6 files changed

+2993
-2242
lines changed

6 files changed

+2993
-2242
lines changed

.devcontainer/Dockerfile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.163.1/containers/typescript-node/.devcontainer/base.Dockerfile
2+
3+
# [Choice] Node.js version: 14, 12, 10
4+
ARG VARIANT="14-buster"
5+
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
6+
7+
# [Optional] Uncomment this section to install additional OS packages.
8+
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
9+
# && apt-get -y install --no-install-recommends <your-package-list-here>
10+
11+
# [Optional] Uncomment if you want to install an additional version of node using nvm
12+
# ARG EXTRA_NODE_VERSION=10
13+
# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
14+
15+
# [Optional] Uncomment if you want to install more global node packages
16+
# RUN su node -c "npm install -g <your-package-list -here>"

.devcontainer/devcontainer.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2+
// https://github.com/microsoft/vscode-dev-containers/tree/v0.163.1/containers/typescript-node
3+
{
4+
"name": "React DSV Import",
5+
"build": {
6+
"dockerfile": "Dockerfile",
7+
// Update 'VARIANT' to pick a Node version: 10, 12, 14
8+
"args": {
9+
"VARIANT": "14"
10+
}
11+
},
12+
13+
// Set *default* container specific settings.json values on container create.
14+
"settings": {
15+
"terminal.integrated.shell.linux": "/bin/bash"
16+
},
17+
18+
// Add the IDs of extensions you want installed when the container is created.
19+
"extensions": [
20+
"dbaeumer.vscode-eslint"
21+
],
22+
23+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
24+
// "forwardPorts": [],
25+
26+
// Use 'postCreateCommand' to run commands after the container is created.
27+
// "postCreateCommand": "yarn install",
28+
29+
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
30+
"remoteUser": "node"
31+
}

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@
88
"javascriptreact",
99
"typescript",
1010
"typescriptreact"
11+
],
12+
"cSpell.words": [
13+
"middlewares"
1114
]
1215
}

package.json

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,47 +7,49 @@
77
"react"
88
],
99
"homepage": "https://openscript.github.io/react-dsv-import/",
10-
"version": "0.3.7",
10+
"version": "0.3.9",
1111
"main": "dist/index.js",
1212
"module": "dist/es/index.js",
1313
"types": "dist/index.d.ts",
1414
"devDependencies": {
15-
"@babel/core": "^7.12.3",
15+
"@babel/core": "^7.13.14",
1616
"@emotion/core": "^10.1.1",
1717
"@emotion/styled": "^10.0.27",
18-
"@rollup/plugin-typescript": "^6.1.0",
19-
"@storybook/addon-actions": "^6.0.28",
20-
"@storybook/addon-docs": "^6.0.28",
21-
"@storybook/addon-links": "^6.0.28",
22-
"@storybook/addon-storysource": "^6.0.28",
23-
"@storybook/addons": "^6.0.28",
24-
"@storybook/react": "^6.0.28",
25-
"@testing-library/jest-dom": "^5.11.5",
26-
"@testing-library/react": "^11.1.0",
27-
"@testing-library/react-hooks": "^3.4.2",
28-
"@types/jest": "^26.0.15",
29-
"@types/node": "^14.14.6",
30-
"@types/react": "^16.9.55",
31-
"@types/react-dom": "^16.9.9",
32-
"@typescript-eslint/eslint-plugin": "^4.6.0",
33-
"@typescript-eslint/parser": "^4.6.0",
34-
"babel-loader": "^8.1.0",
18+
"@rollup/plugin-typescript": "^8.2.1",
19+
"@storybook/addon-actions": "^6.2.2",
20+
"@storybook/addon-docs": "^6.2.2",
21+
"@storybook/addon-links": "^6.2.2",
22+
"@storybook/addon-storysource": "^6.2.2",
23+
"@storybook/addons": "^6.2.2",
24+
"@storybook/react": "^6.2.2",
25+
"@testing-library/jest-dom": "^5.11.10",
26+
"@testing-library/react": "^11.2.6",
27+
"@testing-library/react-hooks": "^5.1.1",
28+
"@types/jest": "^26.0.22",
29+
"@types/node": "^14.14.37",
30+
"@types/react": "^17.0.3",
31+
"@types/react-dom": "^17.0.3",
32+
"@typescript-eslint/eslint-plugin": "^4.20.0",
33+
"@typescript-eslint/parser": "^4.20.0",
34+
"babel-loader": "^8.2.2",
3535
"babel-preset-react-app": "^10.0.0",
36-
"eslint": "^7.12.1",
37-
"eslint-config-prettier": "^6.15.0",
38-
"eslint-plugin-prettier": "^3.1.4",
39-
"eslint-plugin-react": "^7.21.5",
40-
"jest": "^26.6.2",
41-
"prettier": "^2.1.2",
36+
"eslint": "^7.23.0",
37+
"eslint-config-prettier": "^8.1.0",
38+
"eslint-plugin-prettier": "^3.3.1",
39+
"eslint-plugin-react": "^7.23.1",
40+
"jest": "^26.6.3",
41+
"prettier": "^2.2.1",
42+
"react": "^17.0.2",
4243
"react-docgen": "^5.3.1",
43-
"react-is": "^17.0.1",
44-
"react-test-renderer": "^17.0.1",
45-
"rollup": "^2.33.1",
46-
"ts-jest": "^26.4.3",
47-
"ts-loader": "^8.0.7",
48-
"ts-node": "^9.0.0",
49-
"tslib": "^2.0.3",
50-
"typescript": "^4.0.5"
44+
"react-dom": "^17.0.2",
45+
"react-is": "^17.0.2",
46+
"react-test-renderer": "^17.0.2",
47+
"rollup": "^2.44.0",
48+
"ts-jest": "^26.5.4",
49+
"ts-loader": "^8.0.18",
50+
"ts-node": "^9.1.1",
51+
"tslib": "^2.1.0",
52+
"typescript": "^4.2.3"
5153
},
5254
"scripts": {
5355
"build": "yarn build:rollup",
@@ -64,7 +66,7 @@
6466
"dist"
6567
],
6668
"peerDependencies": {
67-
"react": "^16.13.1",
68-
"react-dom": "^16.13.1"
69+
"react": "^17.0.2",
70+
"react-dom": "^17.0.2"
6971
}
7072
}

src/models/models.stories.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { Meta, ArgsTable } from '@storybook/addon-docs/blocks';
2+
import { Transformer } from './transformer';
3+
4+
<Meta title="API/Models" />
5+
6+
# Models

0 commit comments

Comments
 (0)