Skip to content

Commit e99dace

Browse files
chore: pull in changes from webpack version in prep to switch branches
1 parent 92a7cfe commit e99dace

File tree

7 files changed

+136
-36
lines changed

7 files changed

+136
-36
lines changed

.github/workflows/ci.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: 'CI'
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
9+
jobs:
10+
11+
ci:
12+
needs: [test]
13+
runs-on: ubuntu-latest
14+
steps:
15+
- run: true
16+
17+
test:
18+
name: yarn ${{ matrix.yarncmd }}
19+
runs-on: ubuntu-latest
20+
strategy:
21+
matrix:
22+
yarncmd: ['test']
23+
steps:
24+
- uses: actions/checkout@v2
25+
- name: Configure
26+
run: |
27+
npm config set scripts-prepend-node-path auto
28+
git config --global user.email [email protected]
29+
git config --global user.name uirouter_github_actions
30+
- name: Install Dependencies
31+
run: yarn install --pure-lockfile
32+
#- name: Check Peer Dependencies
33+
# run: npx check-peer-dependencies
34+
- name: Run Tests
35+
run: yarn ${{ matrix.yarncmd }}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# This workflow requires a personal access token for uirouterbot
2+
name: Weekly Dependency Bumps
3+
on:
4+
repository_dispatch:
5+
types: [update_dependencies]
6+
schedule:
7+
- cron: '0 19 * * 0'
8+
9+
jobs:
10+
upgrade:
11+
runs-on: ubuntu-latest
12+
name: 'Update ${{ matrix.deptype }} (latest: ${{ matrix.latest }})'
13+
strategy:
14+
matrix:
15+
excludes: ['']
16+
deptype: ['dependencies', 'devDependencies']
17+
latest: [false]
18+
steps:
19+
- uses: actions/checkout@v2
20+
- run: |
21+
git config user.name uirouterbot
22+
git config user.password ${{ secrets.UIROUTERBOT_PAT }}
23+
git remote set-url origin $(git remote get-url origin | sed -e 's/ui-router/uirouterbot/')
24+
git fetch --unshallow -p origin
25+
- name: Update dependencies
26+
id: upgrade
27+
uses: ui-router/publish-scripts/actions/[email protected]
28+
with:
29+
excludes: ${{ matrix.excludes }}
30+
deptype: ${{ matrix.deptype }}
31+
latest: ${{ matrix.latest }}
32+
- name: Create Pull Request
33+
id: cpr
34+
if: ${{ steps.upgrade.outputs.upgrades != '' }}
35+
# the following hash is from https://github.com/peter-evans/create-pull-request/releases/tag/v2.7.0
36+
uses: peter-evans/create-pull-request@340e629d2f63059fb3e3f15437e92cfbc7acd85b
37+
with:
38+
token: ${{ secrets.UIROUTERBOT_PAT }}
39+
request-to-parent: true
40+
branch-suffix: 'random'
41+
commit-message: 'chore(package): Update ${{ steps.upgrade.outputs.upgradecount }} ${{ matrix.deptype }} to ${{ steps.upgrade.outputs.upgradestrategy }}'
42+
title: 'chore(package): Update ${{ steps.upgrade.outputs.upgradecount }} ${{ matrix.deptype }} to ${{ steps.upgrade.outputs.upgradestrategy }}'
43+
body: |
44+
chore(package): Update ${{ steps.upgrade.outputs.upgradecount }} ${{ matrix.deptype }} to ${{ steps.upgrade.outputs.upgradestrategy }}
45+
46+
```
47+
${{ steps.upgrade.outputs.upgrades }}
48+
```
49+
50+
Auto-generated by [create-pull-request][1]
51+
52+
[1]: https://github.com/peter-evans/create-pull-request
53+
- name: Apply Merge Label
54+
if: ${{ steps.cpr.outputs.pr_number != '' }}
55+
uses: actions/[email protected]
56+
with:
57+
github-token: ${{ secrets.UIROUTERBOT_PAT }}
58+
script: |
59+
await github.issues.addLabels({
60+
owner: context.repo.owner,
61+
repo: context.repo.repo,
62+
issue_number: ${{ steps.cpr.outputs.pr_number }},
63+
labels: ['ready to squash and merge']
64+
});

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ node_modules/
55
.*
66
transpiled
77
_bundles
8+
yarn-error.log
89

910
cypress/screenshots
1011
cypress/videos

.mergify.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
pull_request_rules:
2+
- name: Auto Squash and Merge
3+
conditions:
4+
- base=master
5+
- status-success=ci
6+
- 'label=ready to squash and merge'
7+
actions:
8+
delete_head_branch: {}
9+
merge:
10+
method: squash
11+
strict: smart
12+
- name: Auto Rebase and Merge
13+
conditions:
14+
- base=master
15+
- status-success=ci
16+
- 'label=ready to rebase and merge'
17+
actions:
18+
delete_head_branch: {}
19+
merge:
20+
method: rebase
21+
strict: smart

.travis.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

cypress.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2+
"baseUrl": "http://localhost:4000",
23
"video": false
34
}

cypress/integration/sample_app_spec.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ describe('unauthenticated sample app', () => {
66
});
77

88
it('loads', () => {
9-
cy.visit('http://localhost:4000');
9+
cy.visit('');
1010
});
1111

1212
it('renders home', () => {
13-
cy.visit('http://localhost:4000/#/home');
13+
cy.visit('/#/home');
1414
cy.get('button.btn').contains('Messages');
1515
cy.get('button.btn').contains('Contacts');
1616
cy.get('button.btn').contains('Preferences');
1717
});
1818

1919
it('asks for authentication', () => {
20-
cy.visit('http://localhost:4000/#/home')
20+
cy.visit('/#/home')
2121
.get('button.btn')
2222
.contains('Preferences')
2323
.click();
@@ -32,7 +32,7 @@ describe('unauthenticated sample app', () => {
3232
it('can authenticate', () => {
3333
expect(sessionStorage.getItem('appConfig')).to.equal(null);
3434

35-
cy.visit('http://localhost:4000/#/prefs');
35+
cy.visit('/#/prefs');
3636

3737
cy.contains('Log In');
3838
cy.contains('Username');
@@ -59,7 +59,7 @@ describe('authenticated sample app', () => {
5959
};
6060

6161
if (!_appConfig) {
62-
cy.visit('http://localhost:4000/#/login');
62+
cy.visit('/#/login');
6363
cy.get('select').contains('myself').parent('select').select(EMAIL_ADDRESS);
6464
cy.get('button').contains('Log in').click();
6565
cy.url().should('include', '#/home')
@@ -76,23 +76,23 @@ describe('authenticated sample app', () => {
7676
});
7777

7878
it('navigates to Preferences by url', () => {
79-
cy.visit('http://localhost:4000/#/prefs');
79+
cy.visit('/#/prefs');
8080
cy.contains('Reset All Data');
8181
});
8282

8383
it('navigates to Contacts by url', () => {
84-
cy.visit('http://localhost:4000/#/contacts');
84+
cy.visit('/#/contacts');
8585
cy.contains('Select a contact');
8686
});
8787

8888
it('navigates to Messages by url', () => {
89-
cy.visit('http://localhost:4000/#/mymessages');
89+
cy.visit('/#/mymessages');
9090
cy.get('table').contains('Sender');
9191
cy.get('table').contains('Subject');
9292
});
9393

9494
it('can send a message', () => {
95-
cy.visit('http://localhost:4000/#/mymessages');
95+
cy.visit('/#/mymessages');
9696
cy.url().should('include', '#/mymessages/inbox');
9797
cy.contains('New Message').click();
9898
cy.url().should('include', '#/mymessages/compose');
@@ -109,7 +109,7 @@ describe('authenticated sample app', () => {
109109
});
110110

111111
it('can save a draft', () => {
112-
cy.visit('http://localhost:4000/#/mymessages');
112+
cy.visit('/#/mymessages');
113113
cy.url().should('include', '#/mymessages/inbox');
114114
cy.contains('New Message').click();
115115
cy.get('input#to').type('[email protected]');
@@ -125,7 +125,7 @@ describe('authenticated sample app', () => {
125125
});
126126

127127
it('prompts to save a message being composed', () => {
128-
cy.visit('http://localhost:4000/#/mymessages');
128+
cy.visit('/#/mymessages');
129129
cy.url().should('include', '#/mymessages/inbox');
130130
cy.contains('New Message').click();
131131
cy.get('input#to').type('[email protected]');
@@ -150,7 +150,7 @@ describe('authenticated sample app', () => {
150150
});
151151

152152
it('navigates through folders', () => {
153-
cy.visit('http://localhost:4000/#/mymessages');
153+
cy.visit('/#/mymessages');
154154
cy.url().should('include', '#/mymessages/inbox');
155155

156156
cy.contains('inbox').parent('li').should('have.class', 'selected');
@@ -176,7 +176,7 @@ describe('authenticated sample app', () => {
176176
cy.get('.message h4').contains(subject);
177177
};
178178

179-
cy.visit('http://localhost:4000/#/mymessages/finance');
179+
cy.visit('/#/mymessages/finance');
180180
cy.contains('finance').parent('li').should('have.class', 'selected');
181181

182182
selectMessage('You look angerly', '5648b50cf8ea6dfc7d1a40a8');
@@ -186,7 +186,7 @@ describe('authenticated sample app', () => {
186186
});
187187

188188
it('navigates through contacts', () => {
189-
cy.visit('http://localhost:4000/#/contacts');
189+
cy.visit('/#/contacts');
190190

191191
const selectContact = (name, id) => {
192192
cy.contains(name).click();

0 commit comments

Comments
 (0)