diff --git a/config.json b/config.json index 1f9011d..1a99495 100644 --- a/config.json +++ b/config.json @@ -3,7 +3,7 @@ "arduino": { "path": { "folder": "./arduino-cli", - "cli": "./arduino-cli/arduino-cli.exe", + "cli": "./arduino-cli/arduino-cli", "libraries": [ "./arduino-libs/arduino-cli/libraries" ], diff --git a/config.json.nw b/config.json.nw index f61842b..6578551 100644 --- a/config.json.nw +++ b/config.json.nw @@ -3,7 +3,7 @@ "arduino": { "path": { "folder": "./arduino-cli", - "cli": "./arduino-cli/arduino-cli.exe", + "cli": "./arduino-cli/arduino-cli", "libraries": [ "./arduino-libs/arduino-cli/libraries" ], diff --git a/package.json b/package.json index 9680496..c5cbadb 100644 --- a/package.json +++ b/package.json @@ -1,55 +1,55 @@ { - "name": "mixly3-server", - "type": "module", - "version": "1.0.0", - "description": "", - "main": "./src/index.js", - "scripts": { - "cert:generate": "node ./scripts/cert-generate.js", - "arduino:install": "node ./scripts/arduino-install.js", - "build:dev": "webpack --config=webpack.dev.cjs", - "build:prod": "webpack --config=webpack.prod.cjs", - "start-server": "nodemon --exec node dist/bundle.cjs", - "watch": "webpack --watch --config=webpack.dev.cjs", - "start": "npm-run-all --parallel watch start-server" - }, - "repository": { - "type": "git", - "url": "https://gitee.com/bnu_mixly/mixly3-server.git" - }, - "author": "Mixly Team", - "license": "MIT", - "dependencies": { - "await-to-js": "^3.0.0", - "better-sse": "^0.14.1", - "commander": "^12.1.0", - "decompress": "^4.2.1", - "decompress-unzip": "^4.0.1", - "express": "^4.21.1", - "fs-extra": "^11.2.0", - "fs-plus": "^3.1.1", - "iconv-lite": "^0.6.3", - "lodash": "^4.17.21", - "mitt": "^3.0.1", - "mustache": "^4.2.0", - "node-fetch": "^3.3.2", - "node-forge": "^1.3.1", - "serialport": "^12.0.0", - "shelljs": "^0.9.2", - "shortid": "^2.2.17", - "simple-git": "^3.27.0", - "socket.io": "^4.8.1", - "tar": "^7.4.3", - "usb": "^2.14.0" - }, - "devDependencies": { - "eslint": "^8.57.1", - "eslint-webpack-plugin": "^4.0.1", - "nodemon": "^3.1.10", - "npm-run-all": "^4.1.5", - "webpack": "^5.89.0", - "webpack-cli": "^5.1.4", - "webpack-merge": "^6.0.1", - "webpack-node-externals": "^3.0.0" - } -} + "name": "mixly3-server", + "type": "module", + "version": "1.0.0", + "description": "", + "main": "./src/index.js", + "scripts": { + "cert:generate": "node ./scripts/cert-generate.js", + "arduino:install": "node ./scripts/arduino-install.js", + "build:dev": "webpack --config=webpack.dev.cjs", + "build:prod": "webpack --config=webpack.prod.cjs", + "start-server": "nodemon --exec node dist/bundle.cjs", + "watch": "webpack --watch --config=webpack.dev.cjs", + "start": "npm-run-all --parallel watch start-server" + }, + "repository": { + "type": "git", + "url": "https://gitee.com/bnu_mixly/mixly3-server.git" + }, + "author": "Mixly Team", + "license": "MIT", + "dependencies": { + "await-to-js": "^3.0.0", + "better-sse": "^0.14.1", + "commander": "^12.1.0", + "decompress": "^4.2.1", + "decompress-unzip": "^4.0.1", + "express": "^4.21.1", + "fs-extra": "^11.2.0", + "fs-plus": "^3.1.1", + "iconv-lite": "^0.6.3", + "lodash": "^4.17.21", + "mitt": "^3.0.1", + "mustache": "^4.2.0", + "node-fetch": "^3.3.2", + "node-forge": "^1.3.1", + "serialport": "^12.0.0", + "shelljs": "^0.9.2", + "shortid": "^2.2.17", + "simple-git": "^3.27.0", + "socket.io": "^4.8.1", + "tar": "^7.4.3", + "usb": "^2.14.0" + }, + "devDependencies": { + "eslint": "^8.57.1", + "eslint-webpack-plugin": "^4.0.1", + "nodemon": "^3.1.10", + "npm-run-all": "^4.1.5", + "webpack": "^5.89.0", + "webpack-cli": "^5.1.4", + "webpack-merge": "^6.0.1", + "webpack-node-externals": "^3.0.0" + } +} \ No newline at end of file diff --git a/package.json.nw b/package.json.nw index 94cda05..71c180f 100644 --- a/package.json.nw +++ b/package.json.nw @@ -1,77 +1,80 @@ { - "name": "mixly3-server", - "version": "1.0.0", - "description": "", - "node-main": "./bundle.cjs", - "main": "http://127.0.0.1:7000/mixly", - "node-remote": "http://127.0.0.1:7000/mixly", - "user-agent": "Mozilla/5.0 (%osinfo) AppleWebKit/%webkit_ver (KHTML, like Gecko, Chrome, Safari) NWjs/%nwver", - "chromium-args": "--user-data-dir=./nw_cache/ --disk-cache-size=0 --media-cache-size=0", - "webkit": { - "page-cache":false + "name": "mixly3-server", + "version": "1.0.0", + "description": "", + "node-main": "./bundle.cjs", + "main": "http://127.0.0.1:7000/mixly", + "node-remote": "http://127.0.0.1:7000/mixly", + "user-agent": "Mozilla/5.0 (%osinfo) AppleWebKit/%webkit_ver (KHTML, like Gecko, Chrome, Safari) NWjs/%nwver", + "chromium-args": "--user-data-dir=./nw_cache/ --disk-cache-size=0 --media-cache-size=0", + "webkit": { + "page-cache": false }, - "scripts": { - "start": "nw ./ --remote-debugging-port=9222", - "build:prod": "webpack --config=webpack.nw.cjs", - "build:nw:win:x64": "npm run build:prod && build --tasks win-x64 --mirror https://npmmirror.com/mirrors/nwjs/ .", - "build:nw:win:x86": "npm run build:prod && build --tasks win-x86 --mirror https://npmmirror.com/mirrors/nwjs/ .", - "build:nw:linux:x64": "npm run build:prod && build --tasks linux-x64 --mirror https://npmmirror.com/mirrors/nwjs/ .", - "build:nw:mac:x64": "npm run build:prod && build --tasks mac-x64 --mirror https://npmmirror.com/mirrors/nwjs/ ." - }, - "window": { - "icon": "mixly/common/media/mixly.png", - "position": "center" - }, - "keywords": [ - "NW.js", - "server" - ], - "repository": { - "type": "git", - "url": "https://gitee.com/bnu_mixly/mixly3-server.git" - }, - "author": "Mixly Team", - "license": "MIT", - "dependencies": { - "await-to-js": "^3.0.0", - "better-sse": "^0.14.1", - "commander": "^12.1.0", - "decompress": "^4.2.1", - "decompress-unzip": "^4.0.1", - "express": "^4.21.1", - "fs": "^0.0.1-security", - "fs-extra": "^11.2.0", - "fs-plus": "^3.1.1", - "http": "^0.0.1-security", - "iconv-lite": "^0.6.3", - "lodash": "^4.17.21", - "mitt": "^3.0.1", - "mustache": "^4.2.0", - "node-fetch": "^3.3.2", - "node-forge": "^1.3.1", - "path": "^0.12.7", - "serialport": "^12.0.0", - "shelljs": "^0.9.2", - "shortid": "^2.2.17", - "simple-git": "^3.27.0", - "socket.io": "^4.8.1", - "tar": "^7.4.3", - "url": "^0.11.0", - "usb": "^2.14.0" - }, - "build": { - "nwVersion": "0.72.0" - }, - "devDependencies": { - "eslint": "^8.57.1", - "eslint-webpack-plugin": "^4.0.1", - "nodemon": "^3.1.10", - "npm-run-all": "^4.1.5", - "nw": "0.72.0-sdk", - "nwjs-builder-phoenix": "^1.15.0", - "webpack": "^5.89.0", - "webpack-cli": "^5.1.4", - "webpack-merge": "^6.0.1", - "webpack-node-externals": "^3.0.0" - } -} + "scripts": { + "start": "nw ./ --remote-debugging-port=9222", + "rebuild:x64": "nw-gyp rebuild --target=0.72.0 --arch=x64 --directory=node_modules/@serialport/bindings-cpp && nw-gyp rebuild --target=0.72.0 --arch=x64 --directory=node_modules/usb", + "rebuild:x86": "nw-gyp rebuild --target=0.72.0 --arch=ia32 --directory=node_modules/@serialport/bindings-cpp && nw-gyp rebuild --target=0.72.0 --arch=ia32 --directory=node_modules/usb", + "build:prod": "webpack --config=webpack.nw.cjs", + "build:nw:win:x64": "npm run build:prod && build --tasks win-x64 --mirror https://npmmirror.com/mirrors/nwjs/ .", + "build:nw:win:x86": "npm run build:prod && build --tasks win-x86 --mirror https://npmmirror.com/mirrors/nwjs/ .", + "build:nw:linux:x64": "npm run build:prod && build --tasks linux-x64 --mirror https://npmmirror.com/mirrors/nwjs/ .", + "build:nw:mac:x64": "npm run build:prod && build --tasks mac-x64 --mirror https://npmmirror.com/mirrors/nwjs/ ." + }, + "window": { + "icon": "mixly/common/media/mixly.png", + "position": "center" + }, + "keywords": [ + "NW.js", + "server" + ], + "repository": { + "type": "git", + "url": "https://gitee.com/bnu_mixly/mixly3-server.git" + }, + "author": "Mixly Team", + "license": "MIT", + "dependencies": { + "await-to-js": "^3.0.0", + "better-sse": "^0.14.1", + "commander": "^12.1.0", + "decompress": "^4.2.1", + "decompress-unzip": "^4.0.1", + "express": "^4.21.1", + "fs": "^0.0.1-security", + "fs-extra": "^11.2.0", + "fs-plus": "^3.1.1", + "http": "^0.0.1-security", + "iconv-lite": "^0.6.3", + "lodash": "^4.17.21", + "mitt": "^3.0.1", + "mustache": "^4.2.0", + "node-fetch": "^3.3.2", + "node-forge": "^1.3.1", + "path": "^0.12.7", + "serialport": "^12.0.0", + "shelljs": "^0.9.2", + "shortid": "^2.2.17", + "simple-git": "^3.27.0", + "socket.io": "^4.8.1", + "tar": "^7.4.3", + "url": "^0.11.0", + "usb": "^2.14.0" + }, + "build": { + "nwVersion": "0.72.0" + }, + "devDependencies": { + "eslint": "^8.57.1", + "eslint-webpack-plugin": "^4.0.1", + "nodemon": "^3.1.10", + "npm-run-all": "^4.1.5", + "nw": "0.72.0-sdk", + "nw-gyp": "^3.6.8", + "nwjs-builder-phoenix": "^1.15.0", + "webpack": "^5.89.0", + "webpack-cli": "^5.1.4", + "webpack-merge": "^6.0.1", + "webpack-node-externals": "^3.0.0" + } +} \ No newline at end of file