Skip to content

Commit

Permalink
deps fix; files mod
Browse files Browse the repository at this point in the history
  • Loading branch information
dangreen committed Jun 11, 2019
1 parent 711cd3e commit 2b8911a
Show file tree
Hide file tree
Showing 8 changed files with 1,428 additions and 1,171 deletions.
30 changes: 18 additions & 12 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
{
"exclude": "node_modules/**",
"presets": [
["babel-preset-trigen", {
"corejs": 2,
"react": true
}]
[
"babel-preset-trigen",
{
"react": true
}
]
],
"env": {
"test": {
"presets": [
["babel-preset-trigen", {
"targets": { "node": "current" },
"corejs": 2,
"commonjs": true,
"typescript": true,
"react": true,
"transformDynamicImport": true
}]
[
"babel-preset-trigen",
{
"targets": {
"node": "current"
},
"commonjs": true,
"typescript": true,
"react": true,
"transformDynamicImport": true
}
]
]
}
}
Expand Down
10 changes: 8 additions & 2 deletions .lintstagedrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{
"src/**/*.css": ["trigen-scripts lint:styles", "git add"],
"src/**/*.{ts,tsx}": ["trigen-scripts lint:ts", "git add"]
"src/**/*.css": [
"trigen-scripts lint:styles",
"git add"
],
"src/**/*.{ts,tsx}": [
"trigen-scripts lint:ts",
"git add"
]
}
2 changes: 1 addition & 1 deletion .trigenscriptsrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[
"preset-react-app"
"@trigen/scripts-preset-react-app"
]
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 - present, TrigenSoftware
Copyright (c) 2018 - present, TrigenSoftware

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# weather

# Weather

[![Dependency status][deps]][deps-url]
[![Dev dependency status][dev-deps]][dev-deps-url]
[![Dependencies status][deps]][deps-url]
[![Dev dependencies status][dev-deps]][dev-deps-url]
[![Build status][build]][build-url]
[![Greenkeeper badge][greenkeeper]][greenkeeper-url]

Expand Down
4 changes: 2 additions & 2 deletions jest.config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"testRegex": "/src/App/.*(\\.|/)spec\\.ts$",
"testRegex": "/src/App/.*(\\.|/)spec\\.(jsx?|tsx?)$",
"transform": {
"^.+\\.(jsx?|tsx?)$": "babel-jest"
},
Expand All @@ -8,7 +8,7 @@
},
"collectCoverage": true,
"collectCoverageFrom": [
"src/**/*.{ts,tsx}",
"src/**/*.{js,jsx,ts,tsx}",
"!src/**/spec.ts",
"!src/**/*.spec.ts",
"!**/*.d.ts",
Expand Down
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
},
"dependencies": {
"@babel/runtime": "^7.4.5",
"@flexis/redux": "^0.3.1-alpha",
"@flexis/ui": "^0.14.9-alpha",
"@flexis/redux": "^0.4.0-alpha",
"@flexis/ui": "^0.15.0-alpha",
"@loadable/component": "^5.10.1",
"@stylable/runtime": "^1.0.3",
"@types/loadable__component": "^5.9.0",
Expand All @@ -39,6 +39,7 @@
"@types/react": "16.8.19",
"@types/react-router-dom": "^4.3.3",
"axios": "^0.19.0",
"core-js": "3",
"date-fns": "^2.0.0-alpha.27",
"date-fns-timezone": "^0.1.4",
"immutable": "4.0.0-rc.12",
Expand All @@ -50,8 +51,9 @@
"redux": "^4.0.0"
},
"devDependencies": {
"@trigen/scripts": "^2.0.1",
"@trigen/scripts-preset-react-app": "^2.0.2",
"@trigen/scripts": "2",
"@trigen/scripts-plugin-eslint": "2",
"@trigen/scripts-preset-react-app": "2",
"@types/faker": "^4.1.4",
"faker": "^4.1.0",
"moxios": "^0.4.0"
Expand Down
2,534 changes: 1,389 additions & 1,145 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 2b8911a

Please sign in to comment.