Skip to content

Commit

Permalink
Frontend Development Workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
15Dkatz committed Sep 29, 2022
1 parent f5c382e commit a492c16
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 25 deletions.
3 changes: 1 addition & 2 deletions .gitignore
@@ -1,2 +1 @@
*node_modules*
.cache/
*node_modules*
18 changes: 0 additions & 18 deletions client/dist/src.0527f627.js

This file was deleted.

1 change: 0 additions & 1 deletion client/dist/src.0527f627.js.map

This file was deleted.

8 changes: 8 additions & 0 deletions client/dist/src.e31bb0bc.js
Expand Up @@ -23117,7 +23117,11 @@ var _reactDom = require("react-dom");

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

<<<<<<< HEAD
(0, _reactDom.render)( /*#__PURE__*/_react.default.createElement("div", null, "Cryptochain in React!"), document.getElementById('root'));
=======
(0, _reactDom.render)( /*#__PURE__*/_react.default.createElement("div", null, "Cryptochain in React! Third live update"), document.getElementById('root'));
>>>>>>> 99ddfbb (Frontend Development Workflow)
},{"react":"../../node_modules/react/index.js","react-dom":"../../node_modules/react-dom/index.js"}],"../../node_modules/parcel-bundler/src/builtins/hmr-runtime.js":[function(require,module,exports) {
var global = arguments[3];
var OVERLAY_ID = '__parcel__error__overlay__';
Expand Down Expand Up @@ -23146,7 +23150,11 @@ var parent = module.bundle.parent;
if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
var hostname = "" || location.hostname;
var protocol = location.protocol === 'https:' ? 'wss' : 'ws';
<<<<<<< HEAD
var ws = new WebSocket(protocol + '://' + hostname + ':' + "54827" + '/');
=======
var ws = new WebSocket(protocol + '://' + hostname + ':' + "60022" + '/');
>>>>>>> 99ddfbb (Frontend Development Workflow)

ws.onmessage = function (event) {
checkedAssets = {};
Expand Down
2 changes: 1 addition & 1 deletion client/dist/src.e31bb0bc.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/src/index.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { render } from 'react-dom';

render(
<div>Cryptochain in React!</div>,
<div>Cryptochain in React! Third live update</div>,
document.getElementById('root')
);

6 changes: 4 additions & 2 deletions package.json
Expand Up @@ -6,10 +6,12 @@
"scripts": {
"test": "jest --watchAll",
"start": "node index.js",
"dev": "npm run start-redis && nodemon index.js",
"dev": "npm run dev-client & npm run start-redis && nodemon index.js",
"dev-peer": "cross-env GENERATE_PEER_PORT='true' nodemon index.js",
"start-redis": "redis-server --daemonize yes",
"build-client": "parcel build client/src/index.html --out-dir client/dist"
"build-client": "npm run clean && parcel build client/src/index.html --out-dir client/dist",
"dev-client": "npm run clean && parcel client/src/index.html --out-dir client/dist",
"clean": "rm -rf .cache client/dist"
},
"jest": {
"testEnvironment": "node"
Expand Down

0 comments on commit a492c16

Please sign in to comment.