Skip to content

Commit

Permalink
Merge branch 'release/v3.3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Oct 27, 2020
2 parents 66b7e57 + bc488ae commit 47f5d95
Show file tree
Hide file tree
Showing 19 changed files with 163 additions and 88 deletions.
20 changes: 20 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
# Issues with these labels will never be considered stale
exemptLabels:
- bug
- known issue
- project
- feature
- enhancement
# Label to use when marking an issue as stale
staleLabel: stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. Please provide more details or it will be closed if no
further activity occurs. Thank you for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
15 changes: 15 additions & 0 deletions .github/workflows/app.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: App

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Install Node.js
uses: actions/setup-node@v1
- run: npm install
- run: npm run lint
- run: npm run build
16 changes: 0 additions & 16 deletions .travis.yml

This file was deleted.

3 changes: 2 additions & 1 deletion app/media/styles/modules/inspect.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
}
}

.inspect-processing-page {
.inspect-module {
.inspect-config-console {
white-space: pre-line;
background-color: @input-bg;
border: 1px solid @input-border-color;
border-radius: @border-radius-base;
Expand Down
2 changes: 1 addition & 1 deletion app/modules/account/components/token-form.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default class AccountTokenForm extends React.Component {
)
}
>
PIO Remote
Remote Development
</a>{' '}
operations when you can not authenticate manually.
<div>
Expand Down
3 changes: 2 additions & 1 deletion app/modules/core/containers/file-explorer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
Tooltip
} from 'antd';

import { IS_WINDOWS } from '../../../config';
import PropTypes from 'prop-types';
import React from 'react';
import { connect } from 'react-redux';
Expand Down Expand Up @@ -347,7 +348,7 @@ class FileExplorer extends React.Component {
<li key={item.path}>
<Icon type="hdd" />
<a onClick={() => this.onDidChangeRoot(item.path)} title={item.name}>
{item.path}
{!IS_WINDOWS && item.name ? item.name : item.path}
</a>
</li>
))}
Expand Down
5 changes: 4 additions & 1 deletion app/modules/device/sagas.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ function* watchLoadMDNSDevices() {
try {
items = yield call(apiFetchData, {
query: 'core.call',
params: [['device', 'list', '--mdns', '--json-output']]
params: [
['device', 'list', '--mdns', '--json-output'],
{ force_subprocess: true }
]
});
yield put(updateEntity('mDNSDevices', items));
} catch (err) {
Expand Down
4 changes: 3 additions & 1 deletion app/modules/inspect/containers/configuration.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,9 @@ class InspectionFormComponent extends React.Component {
<div className="ant-form-item-label">
<label>Errors</label>
</div>
<div className="inspect-config-console">{this.props.error}</div>
<div className="inspect-config-console">
{this.props.error.replace(/\\\\n/g, '\n')}
</div>
</div>
)}
</div>
Expand Down
10 changes: 8 additions & 2 deletions app/modules/inspect/sagas.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ function* _inspectMemory({ projectDir, env }) {
const start = Date.now();
yield call(apiFetchData, {
query: 'core.call',
params: [['run', '-d', projectDir, '-e', env, '-t', 'sizedata']]
params: [
['run', '-d', projectDir, '-e', env, '-t', 'sizedata'],
{ force_subprocess: true }
]
});

const buildDir = yield call(apiFetchData, {
Expand Down Expand Up @@ -78,7 +81,10 @@ function* _inspectCode({ projectDir, env }) {
try {
codeCheckResults = yield call(apiFetchData, {
query: 'core.call',
params: [['check', '-d', projectDir, '-e', env, '--json-output']]
params: [
['check', '-d', projectDir, '-e', env, '--json-output'],
{ force_subprocess: true }
]
});
yield _updateMetric('code', projectDir, env, Date.now() - start);

Expand Down
4 changes: 3 additions & 1 deletion app/modules/library/components/storage-item.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,14 @@ export default class LibraryStorageItem extends React.Component {
loading={this.state.actionInProgress}
disabled={
this.state.actionInProgress ||
this.props.item.versionWanted !== this.props.item.versionLatest
(this.props.item.versionWanted &&
this.props.item.versionWanted !== this.props.item.versionLatest)
}
onClick={e => this.onDidUninstallOrUpdateItem(e, 'update')}
>
{this.props.item.versionWanted
? `Update to ${this.props.item.versionLatest}${
this.props.item.versionWanted &&
this.props.item.versionWanted !== this.props.item.versionLatest
? ' (incompatible)'
: ''
Expand Down
4 changes: 2 additions & 2 deletions app/modules/library/containers/detail-installation-block.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default class LibraryDetailInstallationBlock extends React.Component {
const ownedLib = this.props.data.ownername
? `${this.props.data.ownername}/${this.props.data.name}`
: this.props.data.name;
let content = `; platformio.ini – project configuration file
let content = `# platformio.ini – project configuration file
[env:my_build_env]`;

Expand Down Expand Up @@ -95,7 +95,7 @@ lib_deps =`;
# Accept new functionality in a backwards compatible manner and patches
${ownedLib} @ ^${versionName}
# Acept only backwards compatible bug fixes
# Accept only backwards compatible bug fixes
# (any version with the same major and minor versions, and an equal or greater patch version)
${ownedLib} @ ~${versionName}
Expand Down
11 changes: 6 additions & 5 deletions app/modules/library/sagas.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function* watchLoadBuiltinLibs() {
try {
items = yield call(apiFetchData, {
query: 'core.call',
params: [['lib', 'builtin', '--json-output']]
params: [['lib', 'builtin', '--json-output'], { force_subprocess: true }]
});
yield put(updateEntity('builtinLibs', items));
} catch (err) {
Expand Down Expand Up @@ -185,7 +185,7 @@ function* watchLoadInstalledLibs() {
args = args.concat(['list', '--json-output']);
const items = yield call(apiFetchData, {
query: 'core.call',
params: [args]
params: [args, { force_subprocess: true }]
});
yield put(updateEntity(`installedLibs${storage.initialPath}`, items));
} catch (err) {
Expand Down Expand Up @@ -219,7 +219,7 @@ function* fetchStorageUpdates(storage) {
args = args.concat(['update', '--only-check', '--json-output']);
return yield call(apiFetchData, {
query: 'core.call',
params: [args]
params: [args, { force_subprocess: true }]
});
}

Expand Down Expand Up @@ -301,7 +301,7 @@ function* watchInstallLibrary() {
args = args.concat(['install', lib]);
result = yield call(apiFetchData, {
query: 'core.call',
params: [args]
params: [args, { force_subprocess: true }]
});
yield put(notifySuccess('Congrats!', cleanupPackageManagerOutput(result)));
} catch (err_) {
Expand Down Expand Up @@ -344,7 +344,8 @@ function* watchUninstallOrUpdateLibrary() {
storage.path,
action.type === actions.UNINSTALL_LIBRARY ? 'uninstall' : 'update',
pkg.__pkg_dir
]
],
{ force_subprocess: true }
]
});

Expand Down
15 changes: 11 additions & 4 deletions app/modules/platform/sagas.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,10 @@ function* watchLoadPlatformUpdates() {
try {
const items = yield call(apiFetchData, {
query: 'core.call',
params: [['platform', 'update', '--only-check', '--json-output']]
params: [
['platform', 'update', '--only-check', '--json-output'],
{ force_subprocess: true }
]
});
yield put(updateEntity('platformUpdates', items));
} catch (err) {
Expand Down Expand Up @@ -256,7 +259,10 @@ function* watchAutoCheckPlatformUpdates() {
try {
const result = yield call(apiFetchData, {
query: 'core.call',
params: [['platform', 'update', '--only-check', '--json-output']]
params: [
['platform', 'update', '--only-check', '--json-output'],
{ force_subprocess: true }
]
});
yield put(updateRouteBadge('/platforms/updates', result.length));
} catch (err) {
Expand All @@ -273,7 +279,7 @@ function* watchInstallPlatform() {

result = yield call(apiFetchData, {
query: 'core.call',
params: [['platform', 'install', platform]]
params: [['platform', 'install', platform], { force_subprocess: true }]
});

ReactGA.timing({
Expand Down Expand Up @@ -311,7 +317,8 @@ function* watchUninstallOrUpdatePlatform() {
'platform',
action.type === actions.UNINSTALL_PLATFORM ? 'uninstall' : 'update',
pkgDir
]
],
{ force_subprocess: true }
]
});

Expand Down
2 changes: 1 addition & 1 deletion app/modules/project/components/draggable-tabs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import { DndProvider, DragSource, DropTarget } from 'react-dnd';

import HTML5Backend from 'react-dnd-html5-backend';
import { HTML5Backend } from 'react-dnd-html5-backend';
import PropTypes from 'prop-types';
import React from 'react';
import { Tabs } from 'antd';
Expand Down
4 changes: 2 additions & 2 deletions app/modules/project/containers/examples-modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class ProjectExamplesModal extends React.Component {
</a>
. Please install more platforms to see the new examples.
</p>
Examples already contain pre-configured build environemnts (boards, flags,
Examples already contain pre-configured build environments (boards, flags,
etc.). You can edit them later in{' '}
<a
onClick={() =>
Expand All @@ -152,7 +152,7 @@ class ProjectExamplesModal extends React.Component {
>
Project Configuration File &quot;platformio.ini&quot;
</a>{' '}
located in a root of project.
located in the root of your project.
</div>
)}
<Select
Expand Down
Loading

0 comments on commit 47f5d95

Please sign in to comment.