Skip to content

Commit b73f5a6

Browse files
Merge pull request #115 from blackjackkent/DependencyReboot
Dependency reboot
2 parents 8e91eea + 21d7743 commit b73f5a6

File tree

52 files changed

+15252
-19358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+15252
-19358
lines changed

.babelrc

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
{
22
"presets": [
3-
[
4-
"react"
5-
],
6-
[
7-
"env"
8-
]
3+
"@babel/env",
4+
"@babel/react"
95
],
106
"plugins": [
11-
"transform-object-rest-spread"
7+
"@babel/plugin-proposal-object-rest-spread"
128
]
13-
}
9+
}

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"linebreak-style": [
1919
"error",
20-
"windows"
20+
"unix"
2121
],
2222
"indent": [
2323
"error",

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

appveyor.yml

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
-
22
version: '1.0.{build}'
3-
image: Visual Studio 2017
3+
image: ubuntu
44
environment:
5-
nodejs_version: "8"
5+
nodejs_version: "10"
66
branches:
77
only:
88
- development
99
init:
10-
- cmd: git config --global core.autocrlf true
10+
- sh: git config --global core.autocrlf input
11+
- sh: git config --global core.eol lf
12+
cache:
13+
- '~/.npm'
1114
install:
1215
# Get the latest stable version of Node.js or io.js
13-
- ps: Install-Product node $env:nodejs_version
16+
- sh: nvm install $nodejs_version
1417
# install modules
15-
- yarn
18+
- npm ci
1619
test_script:
1720
# Output useful info for debugging.
1821
- node --version
19-
- yarn version
22+
- npm -v
2023
# run tests
21-
- yarn test:ci
24+
- npm run test:ci
2225
build_script:
23-
- yarn build:staging
26+
- npm run build:staging
2427
artifacts:
2528
- path: build\
2629
name: app
@@ -35,27 +38,30 @@
3538
- ps: ./send.ps1 failure $env:WEBHOOK_URL
3639
-
3740
version: '1.0.{build}'
38-
image: Visual Studio 2017
41+
image: ubuntu
3942
environment:
40-
nodejs_version: "8"
43+
nodejs_version: "10"
4144
branches:
4245
only:
4346
- production
4447
init:
45-
- cmd: git config --global core.autocrlf true
48+
- sh: git config --global core.autocrlf input
49+
- sh: git config --global core.eol lf
50+
cache:
51+
- '~/.npm'
4652
install:
4753
# Get the latest stable version of Node.js or io.js
48-
- ps: Install-Product node $env:nodejs_version
54+
- sh: nvm install $nodejs_version
4955
# install modules
50-
- yarn
56+
- npm ci
5157
test_script:
5258
# Output useful info for debugging.
5359
- node --version
54-
- yarn version
60+
- npm -v
5561
# run tests
56-
- yarn test:ci
62+
- npm run test:ci
5763
build_script:
58-
- yarn build
64+
- npm run build
5965
artifacts:
6066
- path: build\
6167
name: app

config/tests/jest.config.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@
66
"setupTestFrameworkScriptFile": "<rootDir>/node_modules/jest-enzyme/lib/index.js",
77
"testEnvironment": "enzyme",
88
"testEnvironmentOptions": {
9-
"enzymeAdapter": "react15"
9+
"enzymeAdapter": "react16"
1010
},
1111
"testPathIgnorePatterns": [
1212
"/node_modules/"
1313
],
1414
"coveragePathIgnorePatterns": [
1515
"/node_modules/",
1616
"/config/",
17-
"/src/index",
18-
"/src/infrastructure/reducers/index",
17+
"/src/.*index",
1918
"/src/infrastructure/getStore",
2019
"/src/infrastructure/icons",
2120
"/src/infrastructure/initSagas",

0 commit comments

Comments
 (0)