Skip to content

upgrade deps #12

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

Merged
merged 1 commit into from
May 15, 2020
Merged

upgrade deps #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 2 deletions example/controller/generated-router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function qsStringify(queries: { [k: string]: any }) {

// generated

// Generated with router-code-generator@0.2.6
// Generated with router-code-generator@0.2.7

export let genRouter = {
baseUpload: {
Expand Down Expand Up @@ -41,9 +41,11 @@ export let genRouter = {
},
};

export type GenRouterTypeMain = GenRouterTypeTree["baseUpload"] | GenRouterTypeTree["uploadWrapper"] | GenRouterTypeTree["dropzone"] | GenRouterTypeTree["$"];
/** Deprecating, use GenRouterTypeTree["next"] instead */
export type GenRouterTypeMain = GenRouterTypeTree["next"];

export interface GenRouterTypeTree {
next: GenRouterTypeTree["baseUpload"] | GenRouterTypeTree["uploadWrapper"] | GenRouterTypeTree["dropzone"] | GenRouterTypeTree["$"];
baseUpload: {
name: "base-upload";
params: {};
Expand Down
4 changes: 2 additions & 2 deletions example/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import { parseRoutePath } from "@jimengio/ruled-router";
import { routerRules } from "./models/router-rules";

import Container from "./pages/container";
import { GenRouterTypeMain } from "controller/generated-router";
import { GenRouterTypeTree } from "controller/generated-router";

const renderApp = () => {
let routerTree = parseRoutePath(window.location.hash.slice(1), routerRules) as GenRouterTypeMain;
let routerTree = parseRoutePath(window.location.hash.slice(1), routerRules) as GenRouterTypeTree["next"];

ReactDOM.render(<Container router={routerTree} />, document.querySelector(".app"));
};
Expand Down
28 changes: 14 additions & 14 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"license": "MIT",
"peerDependencies": {
"@jimengio/flex-styles": "^0.1.6",
"@jimengio/jimo-icons": "^0.2.0",
"@jimengio/jimo-icons": "^0.3.10",
"antd": "3.x.x",
"emotion": "^10.0.0",
"react": "^16.8.0",
Expand All @@ -30,46 +30,46 @@
"@jimengio/ci-progress-webpack-plugin": "^0.1.0",
"@jimengio/doc-frame": "^0.1.12",
"@jimengio/flex-styles": "^0.1.6",
"@jimengio/jimo-basics": "^0.1.2",
"@jimengio/jimo-icons": "^0.3.9",
"@jimengio/jimo-basics": "^0.1.4",
"@jimengio/jimo-icons": "^0.3.10",
"@jimengio/router-code-generator": "^0.2.7",
"@jimengio/ruled-router": "^0.2.25",
"@types/node": "^13.13.4",
"@types/node": "^14.0.1",
"@types/prettier": "^2.0.0",
"@types/react": "^16.9.34",
"@types/react-dom": "^16.9.7",
"@types/react": "^16.9.35",
"@types/react-dom": "^16.9.8",
"antd": "3.x.x",
"cache-loader": "^4.1.0",
"css-loader": "^3.5.3",
"duplicate-package-checker-webpack-plugin": "^3.0.0",
"emotion": "^10.0.27",
"file-loader": "^6.0.0",
"fork-ts-checker-webpack-plugin": "^4.1.3",
"html-webpack-plugin": "^4.2.0",
"html-webpack-plugin": "^4.2.2",
"html-webpack-tags-plugin": "^2.0.17",
"immer": "^6.0.3",
"immer": "^6.0.5",
"mini-css-extract-plugin": "^0.9.0",
"prettier": "^2.0.5",
"query-string": "^6.12.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"style-loader": "^1.2.0",
"style-loader": "^1.2.1",
"thread-loader": "^2.1.3",
"ts-loader": "^7.0.1",
"ts-node": "^8.9.1",
"ts-loader": "^7.0.4",
"ts-node": "^8.10.1",
"tsconfig-paths": "^3.9.0",
"tsconfig-paths-webpack-plugin": "^3.2.0",
"typescript": "^3.8.3",
"typescript": "3.8.3",
"typescript-styled-plugin": "^0.15.0",
"url-loader": "^4.1.0",
"webpack": "^4.43.0",
"webpack-bundle-analyzer": "^3.7.0",
"webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.10.3",
"webpack-dev-server": "^3.11.0",
"webpack-hud": "^0.1.2"
},
"dependencies": {
"@jimengio/api-base": "^0.3.1",
"@jimengio/api-base": "^0.3.2",
"mime-types": "^2.1.27"
}
}
Loading