summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWes Bos <wesbos@gmail.com>2018-08-14 12:01:21 -0400
committerWes Bos <wesbos@gmail.com>2018-08-14 12:01:21 -0400
commita07aad867cdfc3d5f270be25e571901af500f625 (patch)
treeb0edf4e5613cb4de64a6554bafa2bd92a2eada98
parent268e7cee101a1beba0e80af3550fe83ab56fdd04 (diff)
parentbcc53164b32a6648577c0139de7b93f25a024da7 (diff)
Merge branch 'master' of https://github.com/wesbos/Advanced-React
-rw-r--r--finished-application/frontend/package.json2
-rw-r--r--sick-fits/frontend/package.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/finished-application/frontend/package.json b/finished-application/frontend/package.json
index 2fe111a..e75435b 100644
--- a/finished-application/frontend/package.json
+++ b/finished-application/frontend/package.json
@@ -45,7 +45,6 @@
"jest": "^22.4.4",
"jest-transform-graphql": "^2.1.0"
},
- "//": "This is out babel config, I prefer this over a .babelrc file",
"jest": {
"setupTestFrameworkScriptFile": "<rootDir>/jest.setup.js",
"testPathIgnorePatterns": [
@@ -57,6 +56,7 @@
".*": "babel-jest"
}
},
+ "//": "This is our babel config, I prefer this over a .babelrc file",
"babel": {
"env": {
"development": {
diff --git a/sick-fits/frontend/package.json b/sick-fits/frontend/package.json
index 987b7d6..e6b4878 100644
--- a/sick-fits/frontend/package.json
+++ b/sick-fits/frontend/package.json
@@ -45,7 +45,6 @@
"jest": "^22.4.4",
"jest-transform-graphql": "^2.1.0"
},
- "//": "This is out babel config, I prefer this over a .babelrc file",
"jest": {
"setupTestFrameworkScriptFile": "<rootDir>/jest.setup.js",
"testPathIgnorePatterns": [
@@ -57,6 +56,7 @@
".*": "babel-jest"
}
},
+ "//": "This is our babel config, I prefer this over a .babelrc file",
"babel": {
"env": {
"development": {