diff --git a/package-lock.json b/package-lock.json index 994cf62..b772432 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48967,7 +48967,7 @@ "dev": true }, "packages/noodl-editor": { - "version": "1.0.1", + "version": "1.0.0", "dependencies": { "@electron/remote": "^2.1.1", "@jaames/iro": "^5.5.2", diff --git a/packages/noodl-editor/build/macos-notarize.js b/packages/noodl-editor/build/macos-notarize.js index af13542..3d8ed06 100644 --- a/packages/noodl-editor/build/macos-notarize.js +++ b/packages/noodl-editor/build/macos-notarize.js @@ -12,7 +12,7 @@ module.exports = async function (params) { return; } - const appId = 'noodl.net.noodl'; + const appId = 'fluxscape.net.fluxscape'; const appPath = path.join(params.appOutDir, `${params.packager.appInfo.productFilename}.app`); if (!fs.existsSync(appPath)) { diff --git a/packages/noodl-editor/package.json b/packages/noodl-editor/package.json index a7bd078..8cbe20d 100644 --- a/packages/noodl-editor/package.json +++ b/packages/noodl-editor/package.json @@ -15,17 +15,30 @@ "test:ci": "webpack-cli --config=webpackconfigs/webpack.test-ci.js && electron test.js" }, "build": { - "appId": "noodl.net.noodl-editor", + "appId": "fluxscape.net.fluxscape", + "afterSign": "./build/macos-notarize.js", + "mac": { + "hardenedRuntime": true, + "entitlements": "build/entitlements.mac.plist", + "extendInfo": { + "LSMultipleInstancesProhibited": true, + "NSMicrophoneUsageDescription": "Allow Fluxscape apps that you create and run to access the microphone?", + "NSCameraUsageDescription": "Allow Fluxscape apps that you create and run to access the camera?" + } + }, "win": { "target": "nsis" }, "nsis": { - "guid": "noodl.net.noodl-editor" + "guid": "fluxscape.net.fluxscape" + }, + "linux": { + "target": "deb" }, "protocols": { - "name": "noodl", + "name": "fluxscape", "schemes": [ - "noodl" + "fluxscape" ] }, "npmRebuild": false, diff --git a/scripts/noodl-editor/build-editor.ts b/scripts/noodl-editor/build-editor.ts index 3da1a59..203a665 100644 --- a/scripts/noodl-editor/build-editor.ts +++ b/scripts/noodl-editor/build-editor.ts @@ -72,6 +72,14 @@ import { getCurrentPlatform } from '../helper'; // NOTE: Getting error "Cannot set properties of null (setting 'dev')" here, // It basically means that some package is not relative to this path. console.log("--- Run 'npm install' ..."); + + if (platform === "darwin") { + execSync(`npm install electron-notarize`, { + stdio: 'inherit', + env: process.env + }) + } + execSync(`npm install --arch=${arch} --scope noodl-editor`, { stdio: 'inherit', env: process.env