Skip to content

Commit

Permalink
feat(deps): Upgrade React and UI-Router modules to latest versions
Browse files Browse the repository at this point in the history
Any references to 'ui-router-x' should be renamed to '@uirouter/x'
  • Loading branch information
wms committed Sep 13, 2017
1 parent c0509a7 commit 1d8361e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Create a UI-Router instance pre-configured with all of our favourite things usin

```javascript
// AppEntryPoint.jsx
const {UIRouter} = require('ui-router-react');
const {UIRouter} = require('@uirouter/react');
const {buildRouter} = require('basalplatten/ui-router');

var router = buildRouter();
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
"@types/jest": "^18.1.1",
"@types/node": "^7.0.5",
"@types/ramda": "0.0.3",
"@types/react": "^15.0.11",
"@types/react": "^15.6.2",
"@types/react-dom": "^0.14.23",
"@types/react-hot-loader": "^3.0.1",
"@types/uri-templates": "^0.1.28",
"@uirouter/react": "^0.5.1",
"@uirouter/rx": "^0.4.1",
"antd": "^2.7.2",
"awesome-typescript-loader": "^3.0.4",
"babel-core": "^6.23.1",
Expand All @@ -31,17 +33,15 @@
"less": "^2.7.2",
"less-loader": "^2.2.3",
"ramda": "^0.23.0",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-hot-loader": "^3.0.0-beta.6",
"rxjs": "^5.2.0",
"style-ext-html-webpack-plugin": "^2.0.6",
"style-loader": "^0.13.1",
"ts-jest": "^19.0.0",
"typescript": "~2.2.0",
"uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
"ui-router-react": "^0.4.0",
"ui-router-rx": "^0.2.1",
"uri-templates": "^0.2.0",
"webpack": "^2.2.1",
"webpack-dev-server": "^2.4.1"
Expand Down
6 changes: 3 additions & 3 deletions ui-router.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import {UIRouterReact, UIRouter, UIView, servicesPlugin, pushStateLocationPlugin} from 'ui-router-react';
import {ParamTypeDefinition, UrlParts} from 'ui-router-core';
import {UIRouterRx} from 'ui-router-rx';
import {UIRouterReact, UIRouter, UIView, servicesPlugin, pushStateLocationPlugin} from '@uirouter/react';
import {ParamTypeDefinition, UrlParts} from '@uirouter/react';
import {UIRouterRx} from '@uirouter/rx';
import notification from 'antd/lib/notification';
import * as paramTypes from './ui-router/paramTypes';
import 'antd/lib/notification/style';
Expand Down
4 changes: 2 additions & 2 deletions ui-router/paramTypes.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {ParamTypeDefinition} from 'ui-router-core';
import { ParamTypeDefinition } from '@uirouter/core';

import {
is,
Expand Down Expand Up @@ -85,7 +85,7 @@ export const order: ParamTypeDefinition = {

decode: (value) => {
var [field, direction] = value.split(':');
return {[field]: direction};
return { [field]: direction };
},

pattern: /\w+:(?:asc|desc)|^$/
Expand Down
6 changes: 3 additions & 3 deletions webpack/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import { defaultsDeep } from 'lodash';
export const DEFAULT_VENDORS = [
'react',
'react-dom',
'ui-router-react',
'ui-router-core',
'ui-router-rx',
'@uirouter/react',
'@uirouter/core',
'@uirouter/rx',
'moment',
'lodash',
'ramda'
Expand Down

0 comments on commit 1d8361e

Please sign in to comment.