Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions isomorphic-react-app/functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"name": "functions-isomorphic-react-app",
"description": "A sample isomorphic React app using Functions and Hosting",
"dependencies": {
"express": "4.15.2",
"firebase": "5.9.1",
"react": "15.5.4",
"react-dom": "15.5.4",
"request": "2.81.0",
"firebase-admin": "~7.1.1",
"firebase-functions": "^2.2.1"
"express": "4.17.1",
"firebase": "7.6.1",
"firebase-admin": "8.9.0",
"firebase-functions": "3.3.0",
"react": "16.12.0",
"react-dom": "16.12.0",
"request": "2.88.0"
},
"devDependencies": {
"eslint": "^4.13.1",
"eslint-plugin-promise": "^3.6.0"
"eslint": "6.8.0",
"eslint-plugin-promise": "4.2.1"
},
"scripts": {
"lint": "./node_modules/.bin/eslint --max-warnings=0 .",
Expand Down
9 changes: 9 additions & 0 deletions isomorphic-react-app/src/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"presets": [
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-proposal-class-properties"
]
}
34 changes: 15 additions & 19 deletions isomorphic-react-app/src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,25 @@
"description": "Sample employee directory app built with React and Firebase",
"scripts": {
"createfirebaseconf": "firebase setup:web --json > ../functions/firebase-config.json",
"buildClient": "./node_modules/.bin/webpack --config ./webpack.client.config.js",
"buildServer": "./node_modules/.bin/webpack --config ./webpack.server.config.js",
"buildClient": "./node_modules/.bin/webpack --mode production --config ./webpack.client.config.js",
"buildServer": "./node_modules/.bin/webpack --mode production --config ./webpack.server.config.js",
"build": "npm run createfirebaseconf && npm run buildClient && npm run buildServer"
},
"dependencies": {
"firebase": "5.9.1",
"lodash": "4.17.4",
"react": "15.5.4",
"react-dom": "15.5.4",
"react-router": "5.0.0",
"react-router-dom": "5.0.0"
"firebase": "7.6.1",
"lodash": "4.17.15",
"react": "16.12.0",
"react-dom": "16.12.0",
"react-router": "5.1.2",
"react-router-dom": "5.1.2"
},
"devDependencies": {
"babel-core": "6.24.1",
"babel-loader": "7.0.0",
"babel-preset-react": "6.24.1",
"babel-preset-stage-0": "6.24.1",
"webpack": "2.5.0"
},
"babel": {
"presets": [
"react",
"stage-0"
]
"@babel/core": "7.7.7",
"@babel/plugin-proposal-class-properties": "7.7.4",
"@babel/preset-env": "7.7.7",
"@babel/preset-react": "7.7.4",
"babel-loader": "8.0.6",
"webpack": "4.41.5",
"webpack-cli": "3.3.10"
}
}
14 changes: 9 additions & 5 deletions isomorphic-react-app/src/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,14 @@ module.exports = {
modules: [path.resolve(__dirname, "./node_modules")],
},
module: {
rules: [{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
loader: 'babel-loader'
}]
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: {
loader: "babel-loader"
}
}
]
}
};