Macos (#19)

manhtai · web-flow · commit 66299ce6c74d · 2023-01-16T15:42:42.000+07:00
diff --git a/.erb/scripts/DoNothing.js b/.erb/scripts/DoNothing.js
@@ -0,0 +1 @@
+exports.default = () => {};
diff --git a/.erb/scripts/Notarize.js b/.erb/scripts/Notarize.js
@@ -1,3 +1,25 @@
-exports.default = async function notarizeMacos() {
-  console.warn('Skipping notarizing step.');
+const { notarize } = require('electron-notarize');
+const { build } = require('../../package.json');
+
+exports.default = async function notarizeMacos(context) {
+  const { electronPlatformName, appOutDir } = context;
+  if (electronPlatformName !== 'darwin') {
+    return;
+  }
+
+  if (!('APPLE_ID' in process.env && 'APPLE_ID_PASS' in process.env)) {
+    console.warn(
+      'Skipping notarizing step. APPLE_ID and APPLE_ID_PASS env variables must be set'
+    );
+    return;
+  }
+
+  const appName = context.packager.appInfo.productFilename;
+
+  await notarize({
+    appBundleId: build.appId,
+    appPath: `${appOutDir}/${appName}.app`,
+    appleId: process.env.APPLE_ID,
+    appleIdPassword: process.env.APPLE_ID_PASS,
+  });
 };
diff --git a/.github/ISSUE_TEMPLATE/1-Bug_report.md b/.github/ISSUE_TEMPLATE/1-Bug_report.md
@@ -52,6 +52,6 @@ labels: 'bug'
 <!--- Include as many relevant details about the environment you experienced the bug in -->
 
 - Node version:
-- PlainPrinter version or branch:
+- Screen Printer version or branch:
 - Operating System and version:
 - Link to your project:
diff --git a/.github/ISSUE_TEMPLATE/3-Feature_request.md b/.github/ISSUE_TEMPLATE/3-Feature_request.md
@@ -1,5 +1,5 @@
 ---
 name: Feature request
-about: You want something added to PlainPrinter. 🎉
+about: You want something added to Screen Printer. 🎉
 labels: 'enhancement'
 ---
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ logs
 pids
 *.pid
 *.seed
+*.p12
 
 # Coverage directory used by tools like istanbul
 coverage
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![Publish](https://github.com/plainlab/plainprinter/actions/workflows/publish.yml/badge.svg)](https://github.com/plainlab/plainprinter/actions/workflows/publish.yml)
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/plainlab/plainprinter)](https://github.com/plainlab/plainprinter/releases/latest)
 
-# PlainPrinter
+# Screen Printer
 
 > Take multiple screenshots and convert them into a PDF file
 
diff --git a/assets/embedded.provisionprofile b/assets/embedded.provisionprofile
diff --git a/assets/entitlements.mas.inherit.plist b/assets/entitlements.mas.inherit.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+    <key>com.apple.security.inherit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/assets/entitlements.mas.plist b/assets/entitlements.mas.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/assets/icon.icns b/assets/icon.icns
diff --git a/assets/icon.ico b/assets/icon.ico
diff --git a/assets/icon.png b/assets/icon.png
diff --git a/assets/icon.svg b/assets/icon.svg
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "description": "Plain screen printer",
+  "description": "PDF screen printer",
   "keywords": [
     "pdf",
     "screen printer"
@@ -26,6 +26,7 @@
     "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts",
     "lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx",
     "package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never",
+    "package:mas": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --mac mas --x64 --config.afterSign=.erb/scripts/doNothing.js --publish never",
     "prepare": "husky install",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
     "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:renderer",
@@ -180,8 +181,8 @@
     "webpack-merge": "^5.8.0"
   },
   "build": {
-    "productName": "PlainPrinter",
-    "appId": "com.plainprinter",
+    "productName": "Screen Printer",
+    "appId": "com.manhtai.screenprinter",
     "asar": true,
     "asarUnpack": [
       "node_modules/screenshot-desktop/lib/win32",
@@ -194,19 +195,34 @@
     ],
     "afterSign": ".erb/scripts/notarize.js",
     "mac": {
-      "target": {
-        "target": "default",
-        "arch": [
-          "arm64",
-          "x64"
-        ]
-      },
+      "target": [
+        {
+          "target": "dmg",
+          "arch": [
+            "arm64",
+            "x64"
+          ]
+        },
+        {
+          "target": "mas",
+          "arch": [
+            "x64"
+          ]
+        }
+      ],
       "type": "distribution",
       "hardenedRuntime": true,
       "entitlements": "assets/entitlements.mac.plist",
       "entitlementsInherit": "assets/entitlements.mac.plist",
+      "provisioningProfile": "assets/embedded.provisionprofile",
       "gatekeeperAssess": false
     },
+    "mas": {
+      "entitlements": "assets/entitlements.mas.plist",
+      "entitlementsInherit": "assets/entitlements.mas.inherit.plist",
+      "entitlementsLoginHelper": "assets/entitlements.mas.inherit.plist",
+      "hardenedRuntime": false
+    },
     "dmg": {
       "contents": [
         {
diff --git a/release/app/package.json b/release/app/package.json
@@ -1,8 +1,8 @@
 {
   "name": "plainprinter",
-  "productName": "PlainPrinter",
-  "version": "0.2.3",
-  "description": "Plain screen printer",
+  "productName": "Screen Printer",
+  "version": "1.0.0",
+  "description": "PDF screen printer",
   "main": "./dist/main/main.js",
   "author": {
     "name": "PlainLab",
diff --git a/src/main/main.ts b/src/main/main.ts
@@ -100,6 +100,10 @@ const createWindow = async () => {
     show: false,
     width: 800,
     height: 400,
+    maximizable: false,
+    fullscreen: false,
+    fullscreenable: false,
+    resizable: false,
     icon: getAssetPath('icon.png'),
     webPreferences: {
       preload: app.isPackaged
diff --git a/src/main/menu.ts b/src/main/menu.ts
@@ -54,15 +54,15 @@ export default class MenuBuilder {
 
   buildDarwinTemplate(): MenuItemConstructorOptions[] {
     const subMenuAbout: DarwinMenuItemConstructorOptions = {
-      label: 'PlainPrinter',
+      label: 'Help',
       submenu: [
         {
-          label: 'About PlainPrinter',
+          label: 'About',
           selector: 'orderFrontStandardAboutPanel:',
         },
         { type: 'separator' },
         {
-          label: 'Hide PlainPrinter',
+          label: 'Hide',
           accelerator: 'Command+H',
           selector: 'hide:',
         },
@@ -82,22 +82,6 @@ export default class MenuBuilder {
         },
       ],
     };
-    const subMenuEdit: DarwinMenuItemConstructorOptions = {
-      label: 'Edit',
-      submenu: [
-        { label: 'Undo', accelerator: 'Command+Z', selector: 'undo:' },
-        { label: 'Redo', accelerator: 'Shift+Command+Z', selector: 'redo:' },
-        { type: 'separator' },
-        { label: 'Cut', accelerator: 'Command+X', selector: 'cut:' },
-        { label: 'Copy', accelerator: 'Command+C', selector: 'copy:' },
-        { label: 'Paste', accelerator: 'Command+V', selector: 'paste:' },
-        {
-          label: 'Select All',
-          accelerator: 'Command+A',
-          selector: 'selectAll:',
-        },
-      ],
-    };
     const subMenuViewDev: MenuItemConstructorOptions = {
       label: 'View',
       submenu: [
@@ -124,18 +108,6 @@ export default class MenuBuilder {
         },
       ],
     };
-    const subMenuViewProd: MenuItemConstructorOptions = {
-      label: 'View',
-      submenu: [
-        {
-          label: 'Toggle Full Screen',
-          accelerator: 'Ctrl+Command+F',
-          click: () => {
-            this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());
-          },
-        },
-      ],
-    };
     const subMenuWindow: DarwinMenuItemConstructorOptions = {
       label: 'Window',
       submenu: [
@@ -153,27 +125,32 @@ export default class MenuBuilder {
       label: 'Help',
       submenu: [
         {
-          label: 'PlainLab home page',
+          label: 'Privacy',
           click() {
-            shell.openExternal('https://plainlab.github.io');
+            shell.openExternal(
+              'https://screenprinter.manhtai.com/privacy.html'
+            );
           },
         },
         {
-          label: 'PlainPrinter repo',
+          label: 'Support',
           click() {
-            shell.openExternal('https://github.com/plainlab/plainprinter');
+            shell.openExternal(
+              'https://screenprinter.manhtai.com/support.html'
+            );
           },
         },
       ],
     };
 
-    const subMenuView =
+    if (
       process.env.NODE_ENV === 'development' ||
       process.env.DEBUG_PROD === 'true'
-        ? subMenuViewDev
-        : subMenuViewProd;
+    ) {
+      return [subMenuAbout, subMenuViewDev, subMenuWindow, subMenuHelp];
+    }
 
-    return [subMenuAbout, subMenuEdit, subMenuView, subMenuWindow, subMenuHelp];
+    return [subMenuAbout, subMenuWindow, subMenuHelp];
   }
 
   buildDefaultTemplate() {
@@ -240,15 +217,19 @@ export default class MenuBuilder {
         label: 'Help',
         submenu: [
           {
-            label: 'Home Page',
+            label: 'Privacy',
             click() {
-              shell.openExternal('https://plainlab.github.io');
+              shell.openExternal(
+                'https://screenprinter.manhtai.com/privacy.html'
+              );
             },
           },
           {
-            label: 'GitHub',
+            label: 'Support',
             click() {
-              shell.openExternal('https://github.com/plainlab/plainprinter');
+              shell.openExternal(
+                'https://screenprinter.manhtai.com/support.html'
+              );
             },
           },
         ],
diff --git a/src/renderer/index.ejs b/src/renderer/index.ejs
@@ -6,7 +6,7 @@
       http-equiv="Content-Security-Policy"
       content="script-src 'self' 'unsafe-inline'"
     />
-    <title>PlainPrinter &middot; Plain screen printer</title>
+    <title>Screen Printer &middot; PDF screen printer</title>
   </head>
   <body class="text-sm text-gray-700">
     <div id="root"></div>
