Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
needs: [test]
runs-on: ubuntu-latest
steps:
- run: true
- run: 'true'

test:
name: yarn ${{ matrix.yarncmd }}
Expand All @@ -23,7 +23,6 @@ jobs:
- uses: actions/checkout@v2
- name: Configure
run: |
npm config set scripts-prepend-node-path auto
git config --global user.email [email protected]
git config --global user.name uirouter_github_actions
- name: Install Dependencies
Expand Down
18 changes: 8 additions & 10 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
pull_request_rules:
- name: Auto Squash and Merge
- name: 'Auto Squash and Merge'
conditions:
- base=master
- status-success=ci
- 'label=ready to squash and merge'
- check-success=ci
- label=ready to squash and merge
actions:
delete_head_branch: {}
delete_head_branch:
merge:
method: squash
strict: smart
- name: Auto Rebase and Merge
- name: 'Auto Rebase and Merge'
conditions:
- base=master
- status-success=ci
- 'label=ready to rebase and merge'
- check-success=ci
- label=ready to rebase and merge
actions:
delete_head_branch: {}
delete_head_branch:
merge:
method: rebase
strict: smart
2 changes: 1 addition & 1 deletion examples/typescript/components/Nest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ interface NextInjectedProps extends UIViewInjectedProps {

export class Nest extends React.Component<NextInjectedProps, any> {
uiCanExit = () => {
return new Promise(resolve => {
return new Promise<void>((resolve) => {
setTimeout(() => {
resolve();
}, 1000);
Expand Down
5 changes: 5 additions & 0 deletions examples/typescript/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ var config = {
},
],
},
devServer: {
static: {
directory: './examples/typescript',
},
},
};

module.exports = config;
14 changes: 5 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"test": "jest",
"test:debug": "node --inspect ./node_modules/.bin/jest --runInBand --watch",
"test:downstream": "npm run build && test_downstream_projects",
"start": "cross-env NODE_ENV=development webpack-dev-server --host 0.0.0.0 --port 8000 --config ./examples/typescript/webpack.config.js --history-api-fallback --content-base examples/typescript",
"start": "cross-env NODE_ENV=development webpack-dev-server --host 0.0.0.0 --port 8000 --config ./examples/typescript/webpack.config.js --history-api-fallback",
"clean": "shx rm -rf _bundles lib lib-esm build _doc",
"compile": "npm run clean && tsc && tsc -m es6 --outDir lib-esm",
"bundle": "cross-env NODE_ENV=production webpack",
Expand Down Expand Up @@ -63,9 +63,6 @@
"babel-polyfill": "^6.26.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"bufferutil": "4.0.3",
"canvas": "2.8.0",
"chalk": "^4.0.0",
"cross-env": "^7.0.3",
"husky": "^4.3.6",
"jest": "27.0.6",
Expand All @@ -77,12 +74,11 @@
"ts-jest": "^27.0.4",
"ts-loader": "^9.2.3",
"ts-node": "^10.1.0",
"tsconfig-paths-webpack-plugin": "^3.3.0",
"tsconfig-paths-webpack-plugin": "^4.2.0",
"typescript": "^4.3.5",
"utf-8-validate": "5.0.5",
"webpack": "^5.46.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.9.0"
"webpack": "^5.101.3",
"webpack-cli": "^6.0.1",
"webpack-dev-server": "^5.2.2"
},
"jest": {
"setupFiles": [
Expand Down
Loading
Loading