Skip to content

Restore v2 #133

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

Merged
merged 2 commits into from
Apr 17, 2019
Merged

Restore v2 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5498e4f
restored v2
Apr 17, 2019
4e3d19a
2.2.3
Apr 17, 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
6 changes: 5 additions & 1 deletion .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"parser": "babel-eslint",
"plugins": [
"react"
],
"rules": {
"max-len": 0,
"comma-dangle": 0,
Expand All @@ -13,7 +16,8 @@
"arrow-parens": 0,
"consistent-return": 0,
"no-useless-escape": 0,
"no-underscore-dangle": 0
"no-underscore-dangle": 0,
"react/jsx-uses-vars": 2
},
"extends": "airbnb-base",
"env": {
Expand Down
6 changes: 3 additions & 3 deletions demo/app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import React from 'react';
import Daemon from '../src';

import { HEX } from './serial_mirror';
// import V2 from './v2/v2.jsx';
import V2 from './v2/v2.jsx';

const chromeExtensionID = 'hfejhkbipnickajaidoppbadcomekkde';

Expand Down Expand Up @@ -274,9 +274,9 @@ class App extends React.Component {
<textarea aria-label="Serial Monitor output" id="serial-textarea" value={ this.state.serialMonitorContent } readOnly/>
</div>

{/* <div className="v2">
<div className="v2">
<V2 daemon={daemon}></V2>
</div> */}
</div>

<div className="section">
<h2>Upload a sample sketch on a MKR1000 at /dev/ttyACM0</h2>
Expand Down
177 changes: 152 additions & 25 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "arduino-create-agent-js-client",
"version": "2.2.2",
"version": "2.2.3",
"description": "JS module providing discovery of the Arduino Create Plugin and communication with it",
"main": "lib/index.js",
"module": "es/index.js",
Expand All @@ -15,7 +15,7 @@
"lib": "lib"
},
"dependencies": {
"detect-browser": "^4.1.0",
"detect-browser": "^4.4.0",
"rxjs": "^6.4.0",
"semver-compare": "^1.0.0",
"socket.io-client": "2.2.0"
Expand All @@ -29,11 +29,12 @@
"babel-preset-env": "^1.7.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"clean-webpack-plugin": "^1.0.1",
"clean-webpack-plugin": "^2.0.1",
"cross-env": "^5.2.0",
"eslint": "^5.16.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-import": "^2.17.1",
"eslint-plugin-import": "^2.17.2",
"eslint-plugin-react": "^7.12.4",
"html-webpack-plugin": "^3.2.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
Expand All @@ -51,6 +52,7 @@
},
"scripts": {
"test": "",
"https": "webpack-dev-server --https",
"dev": "webpack-dev-server",
"lint": "./node_modules/.bin/eslint src",
"lint-fix": "./node_modules/.bin/eslint --fix src --ext .js",
Expand Down
Loading