Skip to content

Commit

Permalink
Merge pull request #24 from openscript/develop
Browse files Browse the repository at this point in the history
Upgrade dependencies
  • Loading branch information
openscript committed Apr 5, 2021
2 parents 3385c4b + c995993 commit 8734ef1
Show file tree
Hide file tree
Showing 6 changed files with 2,993 additions and 2,242 deletions.
16 changes: 16 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.163.1/containers/typescript-node/.devcontainer/base.Dockerfile

# [Choice] Node.js version: 14, 12, 10
ARG VARIANT="14-buster"
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>

# [Optional] Uncomment if you want to install an additional version of node using nvm
# ARG EXTRA_NODE_VERSION=10
# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"

# [Optional] Uncomment if you want to install more global node packages
# RUN su node -c "npm install -g <your-package-list -here>"
31 changes: 31 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.163.1/containers/typescript-node
{
"name": "React DSV Import",
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick a Node version: 10, 12, 14
"args": {
"VARIANT": "14"
}
},

// Set *default* container specific settings.json values on container create.
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint"
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "yarn install",

// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "node"
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@
"javascriptreact",
"typescript",
"typescriptreact"
],
"cSpell.words": [
"middlewares"
]
}
72 changes: 37 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,49 @@
"react"
],
"homepage": "https://openscript.github.io/react-dsv-import/",
"version": "0.3.7",
"version": "0.3.9",
"main": "dist/index.js",
"module": "dist/es/index.js",
"types": "dist/index.d.ts",
"devDependencies": {
"@babel/core": "^7.12.3",
"@babel/core": "^7.13.14",
"@emotion/core": "^10.1.1",
"@emotion/styled": "^10.0.27",
"@rollup/plugin-typescript": "^6.1.0",
"@storybook/addon-actions": "^6.0.28",
"@storybook/addon-docs": "^6.0.28",
"@storybook/addon-links": "^6.0.28",
"@storybook/addon-storysource": "^6.0.28",
"@storybook/addons": "^6.0.28",
"@storybook/react": "^6.0.28",
"@testing-library/jest-dom": "^5.11.5",
"@testing-library/react": "^11.1.0",
"@testing-library/react-hooks": "^3.4.2",
"@types/jest": "^26.0.15",
"@types/node": "^14.14.6",
"@types/react": "^16.9.55",
"@types/react-dom": "^16.9.9",
"@typescript-eslint/eslint-plugin": "^4.6.0",
"@typescript-eslint/parser": "^4.6.0",
"babel-loader": "^8.1.0",
"@rollup/plugin-typescript": "^8.2.1",
"@storybook/addon-actions": "^6.2.2",
"@storybook/addon-docs": "^6.2.2",
"@storybook/addon-links": "^6.2.2",
"@storybook/addon-storysource": "^6.2.2",
"@storybook/addons": "^6.2.2",
"@storybook/react": "^6.2.2",
"@testing-library/jest-dom": "^5.11.10",
"@testing-library/react": "^11.2.6",
"@testing-library/react-hooks": "^5.1.1",
"@types/jest": "^26.0.22",
"@types/node": "^14.14.37",
"@types/react": "^17.0.3",
"@types/react-dom": "^17.0.3",
"@typescript-eslint/eslint-plugin": "^4.20.0",
"@typescript-eslint/parser": "^4.20.0",
"babel-loader": "^8.2.2",
"babel-preset-react-app": "^10.0.0",
"eslint": "^7.12.1",
"eslint-config-prettier": "^6.15.0",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.21.5",
"jest": "^26.6.2",
"prettier": "^2.1.2",
"eslint": "^7.23.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.23.1",
"jest": "^26.6.3",
"prettier": "^2.2.1",
"react": "^17.0.2",
"react-docgen": "^5.3.1",
"react-is": "^17.0.1",
"react-test-renderer": "^17.0.1",
"rollup": "^2.33.1",
"ts-jest": "^26.4.3",
"ts-loader": "^8.0.7",
"ts-node": "^9.0.0",
"tslib": "^2.0.3",
"typescript": "^4.0.5"
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"react-test-renderer": "^17.0.2",
"rollup": "^2.44.0",
"ts-jest": "^26.5.4",
"ts-loader": "^8.0.18",
"ts-node": "^9.1.1",
"tslib": "^2.1.0",
"typescript": "^4.2.3"
},
"scripts": {
"build": "yarn build:rollup",
Expand All @@ -64,7 +66,7 @@
"dist"
],
"peerDependencies": {
"react": "^16.13.1",
"react-dom": "^16.13.1"
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
}
6 changes: 6 additions & 0 deletions src/models/models.stories.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { Meta, ArgsTable } from '@storybook/addon-docs/blocks';
import { Transformer } from './transformer';

<Meta title="API/Models" />

# Models
Loading

0 comments on commit 8734ef1

Please sign in to comment.