Skip to content

Commit 7562546

Browse files
committed
Merge branch 'release/v3.3.3'
2 parents a63a2c9 + 257c9fc commit 7562546

File tree

5 files changed

+42
-10
lines changed

5 files changed

+42
-10
lines changed

Diff for: app/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
if (pathname[pathname.length - 1] !== '/') {
5959
pathname += '/';
6060
}
61-
link.href = pathname + 'themes/' + workspace + '-' + theme + '.css';
61+
link.href = pathname + 'themes/' + workspace + '.' + theme + '.min.css';
6262
link.type = 'text/css';
6363
link.rel = 'stylesheet';
6464
document.getElementsByTagName('head')[0].appendChild(link);

Diff for: app/modules/core/sagas.jsx

+14-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function* watchNotifyError() {
7373
'https://github.com/platformio/platform-linux_arm/issues/2'
7474
],
7575
[
76-
/\[Error 2\] The system cannot find the file specified.*WindowsError/g,
76+
/\[Error 2\]|\[WinError 2\]|\[Errno 13\]/g,
7777
'https://github.com/platformio/platformio-core/issues/2321'
7878
],
7979
[
@@ -85,7 +85,7 @@ function* watchNotifyError() {
8585
'https://github.com/platformio/platformio-core/issues/2811'
8686
],
8787
[
88-
/Error: You are not connected to the Internet/g,
88+
/Error: You are not connected to the Internet|HTTPSConnectionPool/g,
8989
'https://github.com/platformio/platformio-core/issues/1348'
9090
],
9191
[
@@ -99,6 +99,18 @@ function* watchNotifyError() {
9999
[
100100
/Error: Could not find the package/g,
101101
'https://github.com/platformio/platformio-home/issues/2144'
102+
],
103+
[
104+
/Error: Unknown development platform/g,
105+
'https://github.com/platformio/platformio-home/issues/2123'
106+
],
107+
[
108+
/Error: Unknown board ID/g,
109+
'https://github.com/platformio/platformio-home/issues/1768'
110+
],
111+
[
112+
/Error: Could not find one of .* manifest files/g,
113+
'https://github.com/platformio/platformio-home/issues/1785'
102114
]
103115
];
104116
for (const [regex, url] of knownIssues) {

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

+15-4
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,22 @@ class LibraryDetailExamplesBlock extends React.Component {
3535
osFsGlob: PropTypes.func.isRequired
3636
};
3737

38-
static getGlobPatterns(custom) {
39-
if (custom) {
40-
return typeof custom === 'string' ? [custom] : custom;
41-
}
38+
static getGlobPatterns(examples) {
4239
const result = [];
40+
if (examples) {
41+
if (typeof examples === 'string') {
42+
return [examples];
43+
} else if (typeof examples[0] === 'string') {
44+
return examples;
45+
} else if (examples[0].base && examples[0].files) {
46+
examples.forEach(example => {
47+
example.files.forEach(filename => {
48+
result.push(path.join(example.base, filename));
49+
});
50+
});
51+
return result;
52+
}
53+
}
4354
for (const ext of ['*.ino', '*.pde', '*.c', '*.cpp', '*.h', '*.hpp']) {
4455
const exmDir = '[Ee]xamples';
4556
result.push(path.join(exmDir, ext));

Diff for: package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "platformio-home",
3-
"version": "3.3.2",
3+
"version": "3.3.3",
44
"description": "PlatformIO Home",
55
"repository": {
66
"type": "git",
@@ -52,6 +52,7 @@
5252
"babel-plugin-redux-saga": "~1.1.2",
5353
"copy-webpack-plugin": "~7.0.0",
5454
"css-loader": "~5.0.1",
55+
"css-minimizer-webpack-plugin": "^1.2.0",
5556
"eslint": "~7.18.0",
5657
"eslint-config-prettier": "~7.2.0",
5758
"eslint-import-resolver-webpack": "~0.13.0",
@@ -68,6 +69,7 @@
6869
"react-hot-loader": "~4.13.0",
6970
"redux-logger": "~3.0.6",
7071
"style-loader": "~2.0.0",
72+
"terser-webpack-plugin": "^5.1.1",
7173
"url-loader": "~4.1.1",
7274
"webpack": "~5.17.0",
7375
"webpack-bundle-analyzer": "~3.9.0",

Diff for: scripts/webpack.prod.config.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ const common = require('./webpack.common');
1515
const HtmlWebpackPlugin = require('html-webpack-plugin');
1616
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
1717
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
18+
const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
19+
const TerserPlugin = require('terser-webpack-plugin');
1820

1921
// Create multiple instances
20-
const cssOutputFile = `themes/${common.workspace}-${common.theme}.css`;
22+
const cssOutputFile = `themes/${common.workspace}.${common.theme}.min.css`;
2123
const extractThemeCSS = new MiniCssExtractPlugin({
2224
filename: cssOutputFile,
2325
chunkFilename: cssOutputFile, // '[name].[contenthash].css',
@@ -47,6 +49,10 @@ module.exports = {
4749
optimization: {
4850
concatenateModules: true,
4951
minimize: true,
52+
minimizer: [
53+
new TerserPlugin(),
54+
new CssMinimizerPlugin(),
55+
],
5056
moduleIds: 'hashed',
5157
nodeEnv: 'production',
5258
splitChunks: {
@@ -66,7 +72,8 @@ module.exports = {
6672
output: {
6773
publicPath: './',
6874
path: common.outputDir,
69-
filename: '[name].[contenthash].min.js'
75+
// filename: '[name].[contenthash].min.js'
76+
filename: '[name].min.js'
7077
},
7178
resolve: {
7279
alias: common.resolve.alias,

0 commit comments

Comments
 (0)