Skip to content

Feature/react refresh #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/react refresh #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
254569d
update zen to run with -x option
veeramarni Nov 12, 2019
f10794a
update webpack and webpack-dev version
veeramarni Dec 11, 2019
8102f38
Merge branch 'zen-update-0.1.32' into develop
veeramarni Dec 11, 2019
0e1521f
update packages
veeramarni Dec 11, 2019
1ea13f3
work in progress to test ReactRefresh
veeramarni Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = {
'@babel/plugin-proposal-class-properties',
['@babel/plugin-proposal-decorators', { legacy: true }],
'@babel/plugin-proposal-object-rest-spread',
'react-refresh/babel'
// ['styled-components', { ssr: true }],
// ['import', { libraryName: 'antd-mobile' }]
],
Expand Down
4,417 changes: 2,714 additions & 1,703 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 11 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sample-stack",
"version": "0.4.9",
"version": "0.4.10",
"private": true,
"homepage": "https://github.com/cdmbase/fullstack-pro#readme",
"bugs": {
Expand Down Expand Up @@ -60,7 +60,7 @@
"watch": "lerna exec --no-sort --ignore *server --stream --parallel -- webpack --watch",
"zen:build": "cross-env NODE_ENV=production zen build",
"zen:exp": "zen exp",
"zen:watch": "zen watch",
"zen:watch": "zen watch -x",
"zen:watch:debug": "npm run zen:watch -- -v"
},
"dependencies": {
Expand Down Expand Up @@ -114,7 +114,8 @@
"@graphql-codegen/typescript-react-apollo": "1.8.0",
"@graphql-codegen/typescript-resolvers": "1.8.0",
"@hot-loader/react-dom": "^16.10.2",
"@larix/zen": "0.1.32",
"@larix/zen": "0.1.34",
"@pmmmwh/react-refresh-webpack-plugin": "^0.1.0",
"@types/async": "^2.4.1",
"@types/body-parser": "1.17.0",
"@types/bunyan": "^1.8.6",
Expand Down Expand Up @@ -215,6 +216,7 @@
"raw-loader": "^2.0.0",
"react-addons-test-utils": "^15.6.2",
"react-hot-loader": "^4.8.4",
"react-refresh": "^0.7.0",
"react-test-renderer": "^16.8.6",
"redux-devtools": "^3.5.0",
"redux-devtools-dock-monitor": "^1.1.3",
Expand Down Expand Up @@ -248,16 +250,16 @@
"uglifyjs-webpack-plugin": "^2.1.2",
"url-loader": "^1.1.2",
"wait-on": "^3.2.0",
"webpack": "4.28.4",
"webpack": "4.41.2",
"webpack-cli": "^3.3.1",
"webpack-dev-middleware": "^3.6.2",
"webpack-dev-server": "3.2.1",
"webpack-dev-middleware": "^3.7.2",
"webpack-dev-server": "3.9.0",
"webpack-fail-plugin": "^2.0.0",
"webpack-hot-middleware": "^2.24.4",
"webpack-manifest-plugin": "^2.0.4",
"webpack-hot-middleware": "^2.25.0",
"webpack-manifest-plugin": "^2.2.0",
"webpack-merge": "^4.2.1",
"webpack-node-externals": "^1.7.2",
"webpack-sources": "^1.3.0",
"webpack-sources": "^1.4.3",
"webpack-virtual-modules": "^0.1.10",
"webpack-visualizer-plugin": "^0.1.11",
"ws": "^6.2.1"
Expand Down
9 changes: 5 additions & 4 deletions servers/backend-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@
"test:watch": "npm test -- --watch",
"preupver": "npm test",
"upver": "standard-version",
"watch": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env zen watch",
"watch:debug": "npm run watch -- -v",
"watch:staging": "cross-env NODE_ENV=test ENV_FILE=../../config/staging/staging.env zen watch",
"watch:test": "cross-env NODE_ENV=test ENV_FILE=../../config/test/test.env zen watch"
"zen:watch": "zen watch -x",
"watch": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env npm run zen:watch",
"watch:debug": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env npm run zen:watch -- -v",
"watch:staging": "cross-env NODE_ENV=test ENV_FILE=../../config/staging/staging.env npm run zen:watch",
"watch:test": "cross-env NODE_ENV=test ENV_FILE=../../config/test/test.env npm run zen:watch"
},
"dependencies": {
"@cdm-logger/server": "^5.0.5",
Expand Down
16 changes: 9 additions & 7 deletions servers/frontend-server/.zenrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const webpack = require('webpack');
const Dotenv = require('dotenv-webpack');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const LodashModuleReplacementPlugin = require('lodash-webpack-plugin');
const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');

const config = {
builders: {
Expand Down Expand Up @@ -36,15 +37,16 @@ const config = {
// Necessary as a workaround for https://github.com/apollographql/react-apollo/issues/1831
flattening: true
}),
new ReactRefreshWebpackPlugin(),
],
// for additional webpack configuration.
resolve: process.env.NODE_ENV !== 'production'
? {
alias: {
'react-dom': '@hot-loader/react-dom'
}
}
: {},
// resolve: process.env.NODE_ENV !== 'production'
// ? {
// alias: {
// 'react-dom': '@hot-loader/react-dom'
// }
// }
// : {},
}
},
server: {
Expand Down
9 changes: 5 additions & 4 deletions servers/frontend-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@
"test": "jest",
"test:debug": "npm test -- --runInBand",
"test:watch": "npm test -- --watch",
"watch": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env zen watch",
"watch:debug": "npm run watch -- -v",
"zen:watch": "zen watch -x",
"watch": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env npm run zen:watch",
"watch:debug": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env npm run zen:watch -- -v",
"watch:ssr": "cross-env SSR=true && npm run watch",
"watch:staging": "cross-env ENV_FILE=../../config/staging/staging.env zen watch",
"watch:test": "cross-env ENV_FILE=../../config/test/test.env zen watch"
"watch:staging": "cross-env ENV_FILE=../../config/staging/staging.env npm run zen:watch",
"watch:test": "cross-env ENV_FILE=../../config/test/test.env npm run zen:watch"
},
"jest": {
"moduleFileExtensions": [
Expand Down
3 changes: 1 addition & 2 deletions servers/frontend-server/src/app/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/// <reference path='../../../../typings/index.d.ts' />
///<reference types="webpack-env" />
import { hot } from 'react-hot-loader/root';
import * as React from 'react';
import * as ReactFela from 'react-fela';
import { ApolloProvider } from 'react-apollo';
Expand Down Expand Up @@ -104,4 +103,4 @@ export class Main extends React.Component<any, MainState> {
}
}

export default hot(Main);
export default Main;
2 changes: 1 addition & 1 deletion tools/templates/module/browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"cross-env": "^5.2.0",
"jest": "^22.4.2",
"rimraf": "^2.6.1",
"webpack": "4.28.4"
"webpack": "4.41.2"
},
"dependencies": {
},
Expand Down
2 changes: 1 addition & 1 deletion tools/templates/module/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"cross-env": "^5.2.0",
"jest": "^22.4.2",
"rimraf": "^2.6.1",
"webpack": "4.28.4"
"webpack": "4.41.2"
},
"typings": "lib/index.d.ts",
"typescript": {
Expand Down