Skip to content

Commit 47f5d95

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v3.3.1'
2 parents 66b7e57 + bc488ae commit 47f5d95

File tree

19 files changed

+163
-88
lines changed

19 files changed

+163
-88
lines changed

Diff for: ‎.github/stale.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 60
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- bug
8+
- known issue
9+
- project
10+
- feature
11+
- enhancement
12+
# Label to use when marking an issue as stale
13+
staleLabel: stale
14+
# Comment to post when marking an issue as stale. Set to `false` to disable
15+
markComment: >
16+
This issue has been automatically marked as stale because it has not had
17+
recent activity. Please provide more details or it will be closed if no
18+
further activity occurs. Thank you for your contributions.
19+
# Comment to post when closing a stale issue. Set to `false` to disable
20+
closeComment: false

Diff for: ‎.github/workflows/app.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: App
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Install Node.js
12+
uses: actions/setup-node@v1
13+
- run: npm install
14+
- run: npm run lint
15+
- run: npm run build

Diff for: ‎.travis.yml

-16
This file was deleted.

Diff for: ‎app/media/styles/modules/inspect.less

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
}
99
}
1010

11-
.inspect-processing-page {
11+
.inspect-module {
1212
.inspect-config-console {
13+
white-space: pre-line;
1314
background-color: @input-bg;
1415
border: 1px solid @input-border-color;
1516
border-radius: @border-radius-base;

Diff for: ‎app/modules/account/components/token-form.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export default class AccountTokenForm extends React.Component {
103103
)
104104
}
105105
>
106-
PIO Remote™
106+
Remote Development
107107
</a>{' '}
108108
operations when you can not authenticate manually.
109109
<div>

Diff for: ‎app/modules/core/containers/file-explorer.jsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import {
3030
Tooltip
3131
} from 'antd';
3232

33+
import { IS_WINDOWS } from '../../../config';
3334
import PropTypes from 'prop-types';
3435
import React from 'react';
3536
import { connect } from 'react-redux';
@@ -347,7 +348,7 @@ class FileExplorer extends React.Component {
347348
<li key={item.path}>
348349
<Icon type="hdd" />
349350
<a onClick={() => this.onDidChangeRoot(item.path)} title={item.name}>
350-
{item.path}
351+
{!IS_WINDOWS && item.name ? item.name : item.path}
351352
</a>
352353
</li>
353354
))}

Diff for: ‎app/modules/device/sagas.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ function* watchLoadMDNSDevices() {
6363
try {
6464
items = yield call(apiFetchData, {
6565
query: 'core.call',
66-
params: [['device', 'list', '--mdns', '--json-output']]
66+
params: [
67+
['device', 'list', '--mdns', '--json-output'],
68+
{ force_subprocess: true }
69+
]
6770
});
6871
yield put(updateEntity('mDNSDevices', items));
6972
} catch (err) {

Diff for: ‎app/modules/inspect/containers/configuration.jsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,9 @@ class InspectionFormComponent extends React.Component {
274274
<div className="ant-form-item-label">
275275
<label>Errors</label>
276276
</div>
277-
<div className="inspect-config-console">{this.props.error}</div>
277+
<div className="inspect-config-console">
278+
{this.props.error.replace(/\\\\n/g, '\n')}
279+
</div>
278280
</div>
279281
)}
280282
</div>

Diff for: ‎app/modules/inspect/sagas.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ function* _inspectMemory({ projectDir, env }) {
4646
const start = Date.now();
4747
yield call(apiFetchData, {
4848
query: 'core.call',
49-
params: [['run', '-d', projectDir, '-e', env, '-t', 'sizedata']]
49+
params: [
50+
['run', '-d', projectDir, '-e', env, '-t', 'sizedata'],
51+
{ force_subprocess: true }
52+
]
5053
});
5154

5255
const buildDir = yield call(apiFetchData, {
@@ -78,7 +81,10 @@ function* _inspectCode({ projectDir, env }) {
7881
try {
7982
codeCheckResults = yield call(apiFetchData, {
8083
query: 'core.call',
81-
params: [['check', '-d', projectDir, '-e', env, '--json-output']]
84+
params: [
85+
['check', '-d', projectDir, '-e', env, '--json-output'],
86+
{ force_subprocess: true }
87+
]
8288
});
8389
yield _updateMetric('code', projectDir, env, Date.now() - start);
8490

Diff for: ‎app/modules/library/components/storage-item.jsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,14 @@ export default class LibraryStorageItem extends React.Component {
175175
loading={this.state.actionInProgress}
176176
disabled={
177177
this.state.actionInProgress ||
178-
this.props.item.versionWanted !== this.props.item.versionLatest
178+
(this.props.item.versionWanted &&
179+
this.props.item.versionWanted !== this.props.item.versionLatest)
179180
}
180181
onClick={e => this.onDidUninstallOrUpdateItem(e, 'update')}
181182
>
182183
{this.props.item.versionWanted
183184
? `Update to ${this.props.item.versionLatest}${
185+
this.props.item.versionWanted &&
184186
this.props.item.versionWanted !== this.props.item.versionLatest
185187
? ' (incompatible)'
186188
: ''

Diff for: ‎app/modules/library/containers/detail-installation-block.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export default class LibraryDetailInstallationBlock extends React.Component {
6060
const ownedLib = this.props.data.ownername
6161
? `${this.props.data.ownername}/${this.props.data.name}`
6262
: this.props.data.name;
63-
let content = `; platformio.ini – project configuration file
63+
let content = `# platformio.ini – project configuration file
6464
6565
[env:my_build_env]`;
6666

@@ -95,7 +95,7 @@ lib_deps =`;
9595
# Accept new functionality in a backwards compatible manner and patches
9696
${ownedLib} @ ^${versionName}
9797
98-
# Acept only backwards compatible bug fixes
98+
# Accept only backwards compatible bug fixes
9999
# (any version with the same major and minor versions, and an equal or greater patch version)
100100
${ownedLib} @ ~${versionName}
101101

Diff for: ‎app/modules/library/sagas.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ function* watchLoadBuiltinLibs() {
156156
try {
157157
items = yield call(apiFetchData, {
158158
query: 'core.call',
159-
params: [['lib', 'builtin', '--json-output']]
159+
params: [['lib', 'builtin', '--json-output'], { force_subprocess: true }]
160160
});
161161
yield put(updateEntity('builtinLibs', items));
162162
} catch (err) {
@@ -185,7 +185,7 @@ function* watchLoadInstalledLibs() {
185185
args = args.concat(['list', '--json-output']);
186186
const items = yield call(apiFetchData, {
187187
query: 'core.call',
188-
params: [args]
188+
params: [args, { force_subprocess: true }]
189189
});
190190
yield put(updateEntity(`installedLibs${storage.initialPath}`, items));
191191
} catch (err) {
@@ -219,7 +219,7 @@ function* fetchStorageUpdates(storage) {
219219
args = args.concat(['update', '--only-check', '--json-output']);
220220
return yield call(apiFetchData, {
221221
query: 'core.call',
222-
params: [args]
222+
params: [args, { force_subprocess: true }]
223223
});
224224
}
225225

@@ -301,7 +301,7 @@ function* watchInstallLibrary() {
301301
args = args.concat(['install', lib]);
302302
result = yield call(apiFetchData, {
303303
query: 'core.call',
304-
params: [args]
304+
params: [args, { force_subprocess: true }]
305305
});
306306
yield put(notifySuccess('Congrats!', cleanupPackageManagerOutput(result)));
307307
} catch (err_) {
@@ -344,7 +344,8 @@ function* watchUninstallOrUpdateLibrary() {
344344
storage.path,
345345
action.type === actions.UNINSTALL_LIBRARY ? 'uninstall' : 'update',
346346
pkg.__pkg_dir
347-
]
347+
],
348+
{ force_subprocess: true }
348349
]
349350
});
350351

Diff for: ‎app/modules/platform/sagas.js

+11-4
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,10 @@ function* watchLoadPlatformUpdates() {
225225
try {
226226
const items = yield call(apiFetchData, {
227227
query: 'core.call',
228-
params: [['platform', 'update', '--only-check', '--json-output']]
228+
params: [
229+
['platform', 'update', '--only-check', '--json-output'],
230+
{ force_subprocess: true }
231+
]
229232
});
230233
yield put(updateEntity('platformUpdates', items));
231234
} catch (err) {
@@ -256,7 +259,10 @@ function* watchAutoCheckPlatformUpdates() {
256259
try {
257260
const result = yield call(apiFetchData, {
258261
query: 'core.call',
259-
params: [['platform', 'update', '--only-check', '--json-output']]
262+
params: [
263+
['platform', 'update', '--only-check', '--json-output'],
264+
{ force_subprocess: true }
265+
]
260266
});
261267
yield put(updateRouteBadge('/platforms/updates', result.length));
262268
} catch (err) {
@@ -273,7 +279,7 @@ function* watchInstallPlatform() {
273279

274280
result = yield call(apiFetchData, {
275281
query: 'core.call',
276-
params: [['platform', 'install', platform]]
282+
params: [['platform', 'install', platform], { force_subprocess: true }]
277283
});
278284

279285
ReactGA.timing({
@@ -311,7 +317,8 @@ function* watchUninstallOrUpdatePlatform() {
311317
'platform',
312318
action.type === actions.UNINSTALL_PLATFORM ? 'uninstall' : 'update',
313319
pkgDir
314-
]
320+
],
321+
{ force_subprocess: true }
315322
]
316323
});
317324

Diff for: ‎app/modules/project/components/draggable-tabs.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

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

19-
import HTML5Backend from 'react-dnd-html5-backend';
19+
import { HTML5Backend } from 'react-dnd-html5-backend';
2020
import PropTypes from 'prop-types';
2121
import React from 'react';
2222
import { Tabs } from 'antd';

Diff for: ‎app/modules/project/containers/examples-modal.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class ProjectExamplesModal extends React.Component {
143143
</a>
144144
. Please install more platforms to see the new examples.
145145
</p>
146-
Examples already contain pre-configured build environemnts (boards, flags,
146+
Examples already contain pre-configured build environments (boards, flags,
147147
etc.). You can edit them later in{' '}
148148
<a
149149
onClick={() =>
@@ -152,7 +152,7 @@ class ProjectExamplesModal extends React.Component {
152152
>
153153
Project Configuration File &quot;platformio.ini&quot;
154154
</a>{' '}
155-
located in a root of project.
155+
located in the root of your project.
156156
</div>
157157
)}
158158
<Select

0 commit comments

Comments
 (0)