From 905e7c14ea89edd24953265030d6f70e90c16dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Thu, 28 Nov 2024 20:30:58 +0800 Subject: [PATCH] =?UTF-8?q?Update:=20=E6=89=A7=E8=A1=8C=20`build:prod`=20?= =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=97=B6=E6=9E=84=E5=BB=BA=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84map?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- boards/default_src/arduino/package.json | 3 ++- boards/default_src/arduino_avr/package.json | 3 ++- boards/default_src/arduino_esp32/package.json | 3 ++- boards/default_src/arduino_esp8266/package.json | 3 ++- boards/default_src/micropython/package.json | 3 ++- boards/default_src/micropython_esp32/package.json | 3 ++- boards/default_src/micropython_esp32c2/package.json | 3 ++- boards/default_src/micropython_esp32c3/package.json | 3 ++- boards/default_src/micropython_esp32s2/package.json | 3 ++- boards/default_src/micropython_esp32s3/package.json | 3 ++- boards/default_src/micropython_k210_mixgoai/package.json | 3 ++- .../default_src/micropython_nrf51822_microbit/package.json | 3 ++- .../default_src/micropython_nrf51822_mithoncc/package.json | 3 ++- boards/default_src/micropython_robot/package.json | 3 ++- boards/default_src/python/package.json | 3 ++- boards/default_src/python_mixpy/package.json | 3 ++- boards/default_src/python_pyodide/package.json | 4 +++- boards/default_src/python_skulpt/package.json | 3 ++- boards/default_src/python_skulpt_car/package.json | 3 ++- boards/default_src/python_skulpt_mixtoy/package.json | 3 ++- common/modules/mixly-modules/web/burn-upload.js | 1 - scripts/build-examples.js | 5 +++-- 22 files changed, 44 insertions(+), 23 deletions(-) diff --git a/boards/default_src/arduino/package.json b/boards/default_src/arduino/package.json index 2003bf9f..a0b81d4e 100644 --- a/boards/default_src/arduino/package.json +++ b/boards/default_src/arduino/package.json @@ -4,8 +4,9 @@ "description": "适用于mixly的arduino模块", "scripts": { "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/arduino_avr/package.json b/boards/default_src/arduino_avr/package.json index e5c0a462..3fb6c7ef 100644 --- a/boards/default_src/arduino_avr/package.json +++ b/boards/default_src/arduino_avr/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/arduino_esp32/package.json b/boards/default_src/arduino_esp32/package.json index fa891d4a..88f39e47 100644 --- a/boards/default_src/arduino_esp32/package.json +++ b/boards/default_src/arduino_esp32/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/arduino_esp8266/package.json b/boards/default_src/arduino_esp8266/package.json index 2c584290..71775b95 100644 --- a/boards/default_src/arduino_esp8266/package.json +++ b/boards/default_src/arduino_esp8266/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/micropython/package.json b/boards/default_src/micropython/package.json index fcb790e2..c41eb2e2 100644 --- a/boards/default_src/micropython/package.json +++ b/boards/default_src/micropython/package.json @@ -4,8 +4,9 @@ "description": "适用于mixly的micropython模块", "scripts": { "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/micropython_esp32/package.json b/boards/default_src/micropython_esp32/package.json index 7229a372..990f73fa 100644 --- a/boards/default_src/micropython_esp32/package.json +++ b/boards/default_src/micropython_esp32/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/micropython_esp32c2/package.json b/boards/default_src/micropython_esp32c2/package.json index 172ef170..93ca6555 100644 --- a/boards/default_src/micropython_esp32c2/package.json +++ b/boards/default_src/micropython_esp32c2/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/micropython_esp32c3/package.json b/boards/default_src/micropython_esp32c3/package.json index 4a340dc6..8bed96f0 100644 --- a/boards/default_src/micropython_esp32c3/package.json +++ b/boards/default_src/micropython_esp32c3/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/micropython_esp32s2/package.json b/boards/default_src/micropython_esp32s2/package.json index f10d55ec..43f4a8d2 100644 --- a/boards/default_src/micropython_esp32s2/package.json +++ b/boards/default_src/micropython_esp32s2/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/micropython_esp32s3/package.json b/boards/default_src/micropython_esp32s3/package.json index bf2b4902..6aeb11b6 100644 --- a/boards/default_src/micropython_esp32s3/package.json +++ b/boards/default_src/micropython_esp32s3/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/micropython_k210_mixgoai/package.json b/boards/default_src/micropython_k210_mixgoai/package.json index 33be0bc3..8d22de5d 100644 --- a/boards/default_src/micropython_k210_mixgoai/package.json +++ b/boards/default_src/micropython_k210_mixgoai/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/micropython_nrf51822_microbit/package.json b/boards/default_src/micropython_nrf51822_microbit/package.json index e2435338..ab9200cc 100644 --- a/boards/default_src/micropython_nrf51822_microbit/package.json +++ b/boards/default_src/micropython_nrf51822_microbit/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/micropython_nrf51822_mithoncc/package.json b/boards/default_src/micropython_nrf51822_mithoncc/package.json index 9b12634c..75b8bc77 100644 --- a/boards/default_src/micropython_nrf51822_mithoncc/package.json +++ b/boards/default_src/micropython_nrf51822_mithoncc/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/micropython_robot/package.json b/boards/default_src/micropython_robot/package.json index 85e2091b..413ff2b3 100644 --- a/boards/default_src/micropython_robot/package.json +++ b/boards/default_src/micropython_robot/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/python/package.json b/boards/default_src/python/package.json index 6ca76bfa..73695bed 100644 --- a/boards/default_src/python/package.json +++ b/boards/default_src/python/package.json @@ -4,8 +4,9 @@ "description": "适用于mixly的python模块", "scripts": { "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/python_mixpy/package.json b/boards/default_src/python_mixpy/package.json index c7c56914..fa242313 100644 --- a/boards/default_src/python_mixpy/package.json +++ b/boards/default_src/python_mixpy/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "main": "./export.js", diff --git a/boards/default_src/python_pyodide/package.json b/boards/default_src/python_pyodide/package.json index dd993abf..632ba302 100644 --- a/boards/default_src/python_pyodide/package.json +++ b/boards/default_src/python_pyodide/package.json @@ -5,8 +5,10 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", + "build:examples:": "node ../../../scripts/build-examples.js -t special", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "devDependencies": { diff --git a/boards/default_src/python_skulpt/package.json b/boards/default_src/python_skulpt/package.json index d34475cb..063a77d4 100644 --- a/boards/default_src/python_skulpt/package.json +++ b/boards/default_src/python_skulpt/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "devDependencies": { diff --git a/boards/default_src/python_skulpt_car/package.json b/boards/default_src/python_skulpt_car/package.json index 899ffbd5..3fa9bc54 100644 --- a/boards/default_src/python_skulpt_car/package.json +++ b/boards/default_src/python_skulpt_car/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "devDependencies": { diff --git a/boards/default_src/python_skulpt_mixtoy/package.json b/boards/default_src/python_skulpt_mixtoy/package.json index 2883a6a8..5821c7e1 100644 --- a/boards/default_src/python_skulpt_mixtoy/package.json +++ b/boards/default_src/python_skulpt_mixtoy/package.json @@ -5,8 +5,9 @@ "scripts": { "serve": "webpack-dev-server --config=webpack.dev.js", "build:dev": "webpack --config=webpack.dev.js", - "build:prod": "webpack --config=webpack.prod.js", + "build:prod": "webpack --config=webpack.prod.js && npm run build:examples", "build:examples": "node ../../../scripts/build-examples.js -t special", + "build:examples:ob": "node ../../../scripts/build-examples.js -t special --obfuscate", "publish:board": "npm publish --registry https://registry.npmjs.org/" }, "devDependencies": { diff --git a/common/modules/mixly-modules/web/burn-upload.js b/common/modules/mixly-modules/web/burn-upload.js index 3c6d860e..5313e7b7 100644 --- a/common/modules/mixly-modules/web/burn-upload.js +++ b/common/modules/mixly-modules/web/burn-upload.js @@ -34,7 +34,6 @@ const { const { Serial, - Esptool, BU, USB, Ampy diff --git a/scripts/build-examples.js b/scripts/build-examples.js index eb20c214..5aca1428 100644 --- a/scripts/build-examples.js +++ b/scripts/build-examples.js @@ -10,7 +10,8 @@ const program = new Command(); program .addOption(new Option('-t, --type ', 'boards type', 'all').choices([ 'all', 'special' - ])); + ])) + .addOption(new Option('--obfuscate', 'obfuscate file names')); program.parse(); @@ -116,7 +117,7 @@ if (fs_plus.isDirectorySync(DEFAULT_DIR)) { continue; } let outputPath = path.resolve(examplesPath, 'map.json'); - let output = getExamples(examplesPath, true); + let output = getExamples(examplesPath, !!options.obfuscate); fs_extra.outputJsonSync(outputPath, output, { spaces: ' ' });