Merge branch 'develop'

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 /dist/
 .DS_Store
+/password.js

.vscode/launch.json

@@ -21,6 +21,14 @@
             "name": "main.jsx",
             "program": "${workspaceFolder}/src/host/main.jsx",
             "stopOnEntry": false
+        },
+        {
+            "name": "Launch via npm",
+            "type": "node",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": ["archive"]
         }
     ]
 }

README.md

@@ -1,9 +1,11 @@
 # Every Second
-`Every Second` is an Adobe Premiere Pro Extension that automates the repetitive tasks you have to do when creating an `every seconds` meme.
+`Every Second` is an Adobe Premiere Pro extension that automates the repetitive tasks you have to do when creating an `every seconds` meme.
 
 ![](https://user-images.githubusercontent.com/24535616/121020335-3ec81f80-c7db-11eb-9391-b9e054c109f5.jpg)
 
-![](https://user-images.githubusercontent.com/24535616/121020607-7c2cad00-c7db-11eb-8f25-9d5a08dff613.jpg)
+![](https://user-images.githubusercontent.com/24535616/121137181-610c7c80-c871-11eb-88b7-0a157df41115.jpg)
+
+![](https://user-images.githubusercontent.com/24535616/121137272-72558900-c871-11eb-91d5-1e7c29a3e815.jpg)
 
 ## Features
 - Set spacing between clips

assets/templates/manifest.template.xml.js

@@ -7,23 +7,11 @@ module.exports = (props) =>
                    ExtensionBundleName="${props.extensionBundleName}"
                    Version="${props.cepVersion}">
   <ExtensionList>
-    <Extension Id="${props.extensionBundleId}" Version="${props.extensionBundleVersion}">
-      <!-- <Host Name="PHXS" Port="8088"/>
-      <Host Name="PHSP" Port="8088"/> -->
-    </Extension>
+    <Extension Id="${props.extensionBundleId}" Version="${props.extensionBundleVersion}" />
   </ExtensionList>
   <ExecutionEnvironment>
     <HostList>
-        <Host Name="PHXS" Version="[0.0,99.9]" />
-        <Host Name="PHSP" Version="[0.0,99.9]" />
-        <Host Name="IDSN" Version="[0.0,99.9]" />
-        <Host Name="AICY" Version="[0.0,99.9]" />
-        <Host Name="ILST" Version="[0.0,99.9]" />
         <Host Name="PPRO" Version="[0.0,99.9]" />
-        <Host Name="AEFT" Version="[0.0,99.9]" />
-        <Host Name="PRLD" Version="[0.0,99.9]" />
-        <Host Name="FLPR" Version="[0.0,99.9]" />
-        <Host Name="DRWV" Version="[0.0,99.9]" />
     </HostList>
     <LocaleList>
       <Locale Code="All" />

build-scripts/archive.js

@@ -16,15 +16,15 @@ const zxpFile = path.join(distFolder, pluginConfig.extensionBundleId + '.zxp')
 archive()
 
 function archive() {
-    utils.log_progress('ARCHIVE', 'blue')
+    utils.log_progress('ARCHIVE', 'blue');
 
     prepareCert()
-    .then(signPackage)
-    .then(res => {
-        utils.log_progress(`package is signed: ${zxpFile}`, 'green')
-        utils.log_progress('DONE', 'blue')
-    })
-    .catch(err => {utils.log_error(err)})
+        .then(signPackage)
+        .then((res) => {
+            utils.log_progress(`package is signed: ${zxpFile}`, 'green')
+            utils.log_progress('DONE', 'blue')
+        })
+        .catch((err) => utils.log_error(err));
 }
 
 /**
@@ -36,18 +36,18 @@ function prepareCert() {
     const options_custom_cert = certificate_options.customCert
     const options_self_sign = certificate_options.selfSign
     const isCustom = options_custom_cert && options_custom_cert.path.trim() !== ''
-    var path='', password=''
+    var path = '', password = '';
 
-    if(isCustom) {
+    if (isCustom) {
         path = options_custom_cert.path
         password = options_custom_cert.password
-    } else if(options_self_sign){
+    } else if (options_self_sign) {
         path = options_self_sign.output
         password = options_self_sign.password
     }
 
-    const isValid = path!==undefined && path.trim()!==''
-    const data = {path, password}
+    const isValid = path !== undefined && path.trim() !== '';
+    const data = { path, password }
 
     // on non windows, we need to change the permissions
     if(!isWindows) {
@@ -59,25 +59,21 @@ function prepareCert() {
 
     return new Promise((resolve, reject) => {
         if(!isValid) {
-            reject('no valid cert info')
-
-            return
+            reject('no valid cert info');
+            return;
         }
 
         if(isCustom) {
-            utils.log_progress('found a custom certificate')
-            resolve(data)
+            utils.log_progress('found a custom certificate');
+            resolve(data);
         } else {
-            utils.log_progress('generating a self signed certificate')
-            zxpSignCmd.selfSignedCert(options_self_sign, function (error, result) {
-                if(error) reject(error)
-                else resolve(data)
-            })
-
+            utils.log_progress('generating a self signed certificate');
+            zxpSignCmd
+                .selfSignedCert(options_self_sign)
+                .then((res) => resolve(data))
+                .catch((err) => reject(err));
         }
-
-    })
-
+    });
 }
 
 /**
@@ -95,13 +91,5 @@ function signPackage(cert) {
         password: cert.password
     }
 
-    return new Promise((resolve, reject) => {
-        zxpSignCmd.sign(options, function (error, result) {
-            if(error) reject(error)
-            else resolve(result)
-
-        })
-
-    })
-
+    return zxpSignCmd.sign(options);
 }

build-scripts/build.js

@@ -54,8 +54,8 @@ function build() {
         utils.copyRecursiveSync(fromSrc('host'), fromPlugin('host'))
         // copy the session's node modules folder
         utils.log_progress('copying session node-modules...')
-        utils.mkdir(fromSrc('session-src/node_modules'));
-        utils.copyRecursiveSync(fromSrc('session-src/node_modules'), fromPlugin('node_modules'))
+        utils.mkdir(fromSrc('session/node_modules'));
+        utils.copyRecursiveSync(fromSrc('session/node_modules'), fromPlugin('node_modules'))
         // copying libs folder
         utils.log_progress('copying libs folder...')
         utils.copyRecursiveSync(fromSrc('libs'), fromPlugin('libs'))

build-scripts/webpack.client.config.js

@@ -6,9 +6,9 @@ const pluginConfig = require('../pluginrc.js');
 // const distFolder = pluginConfig.destinationFolder
 const distFolder = path.join(pluginConfig.destinationFolder, pluginConfig.extensionBundleId);
 const srcFolder = pluginConfig.sourceFolder;
-const CLIENT_DIST_PATH = path.resolve(distFolder, 'client-dist');
-const HTML_TEMPLATE_PATH = path.join(srcFolder, 'client-src/index.server.template.html');
-const ENTRY_POINT_CLIENT_PATH = path.join(srcFolder, 'client-src/src/index.tsx');
+const CLIENT_DIST_PATH = path.resolve(distFolder, 'client');
+const HTML_TEMPLATE_PATH = path.join(srcFolder, 'client/index.server.template.html');
+const ENTRY_POINT_CLIENT_PATH = path.join(srcFolder, 'client/src/index.tsx');
 
 module.exports = ({
     entry: ENTRY_POINT_CLIENT_PATH,

build-scripts/webpack.session.config.js

@@ -4,8 +4,8 @@ const nodeExternals = require('webpack-node-externals');
 const pluginConfig = require('../pluginrc.js')
 const distFolder = path.join(pluginConfig.destinationFolder, pluginConfig.extensionBundleId)
 const srcFolder = pluginConfig.sourceFolder
-const SESSION_DIST_PATH = path.join(distFolder, 'session-dist')
-const SESSION_SRC_PATH = path.join(srcFolder, 'session-src')
+const SESSION_DIST_PATH = path.join(distFolder, 'session')
+const SESSION_SRC_PATH = path.join(srcFolder, 'session')
 const ENTRY_POINT_SESSION_PATH = path.join(SESSION_SRC_PATH, 'src/index.ts')
 
 module.exports = (env) => ({

package.json

@@ -2,7 +2,7 @@
   "name": "everysecond",
   "version": "1.0.0",
   "description": "Adobe Premiere Pro every second extension",
-  "main": "./client-src/src/index.js",
+  "main": "./client/src/index.js",
   "scripts": {
     "build": "node ./scripts/build.js",
     "start": "npm run client:dev-server",
@@ -11,10 +11,10 @@
     "build:prod": "node ./build-scripts/build.js production",
     "deploy:dev": "node ./build-scripts/deploy.js development",
     "deploy:prod": "node ./build-scripts/deploy.js production",
-    "archive": "node ./build-scripts/archive.js",
+    "archive": "node --inspect ./build-scripts/archive.js",
     "release:dev": "npm run build:dev && npm run deploy:dev",
     "release:prod": "npm run build:prod && npm run deploy:prod && npm run archive",
-    "postinstall": "mkdirp src/session-src/node_modules",
+    "postinstall": "mkdirp src/session/node_modules",
     "b": "babel ./client/js --out-dir ./client/out",
     "test": "echo \"Error: no test specified\" && exit 1"
   },

pluginrc.js

@@ -1,13 +1,14 @@
 const path = require('path')
+const pass = require('./password.js');
 const root = __dirname
 const srcFolder = path.join(root, "src")
 const destFolder = path.join(root, "dist")
 const certPath = path.join(destFolder, "cert.p12")
 module.exports = {
     extensionBundleId: 'com.unggyu.everysecond',
     extensionBundleName: 'everysecond',
-    extensionBundleVersion: '1.0.1',
-    cepVersion: '10.0',
+    extensionBundleVersion: '1.0.0',
+    cepVersion: '9.0',
     panelName: 'EverySecond',
     width: '400',
     height: '600',
@@ -17,14 +18,14 @@ module.exports = {
     certificate : {
         customCert: {
             path: '',
-            password: 'password'
+            password: pass.password
         },
         selfSign: {
             country: 'KR',
             province: 'province',
             org: 'org',
             name: 'unggyu',
-            password: 'password',
+            password: pass.password,
             locality: 'locality',
             orgUnit: 'orgUnit',
             email: '[email protected]',

src/client-src/index.server.template.html → src/client/index.server.template.html

@@ -5,6 +5,6 @@
 		<title>Every Second</title>
 	</head>
 	<body>
-		<div id="root"/>
+		<div id="root" />
 	</body>
 </html>

src/client-src/src/Controller.ts → src/client/src/Controller.ts

@@ -1,4 +1,4 @@
-import { Session, IStartEditParameter, IScriptResultPayload, IAlertParameter } from '../../session-src/src/index';
+import { Session, IStartEditParameter, IScriptResultPayload, IAlertParameter } from '../../session/src/index';
 
 declare global {
     interface Window {

src/client-src/src/index.tsx → src/client/src/index.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
 import Controller from './Controller';
-import { ScriptLoader, Session } from '../../session-src/src';
+import { ScriptLoader, Session } from '../../session/src';
 import '../assets/css/style.css';
 import '../assets/fonts/typeface-roboto/index.css';
 import '../assets/fonts/material-icons/index.css';

src/index.html

@@ -3,13 +3,12 @@
 	<head>
 		<meta charset="utf-8">
 		<title>Every Second</title>
-		<link href="client-dist/main.css" rel="stylesheet"></head>
+		<link href="client/main.css" rel="stylesheet"></head>
 	</head>
 	<body>
 		<div id="root"/>
 		<script type="text/javascript" src="libs/CSInterface.js"></script>
-		<script type="text/javascript" src="libs/Vulcan.js"></script>
-		<script type="text/javascript" src="session-dist/bundle.js"></script>
-		<script type="text/javascript" src="client-dist/bundle.js"></script>
+		<script type="text/javascript" src="session/bundle.js"></script>
+		<script type="text/javascript" src="client/bundle.js"></script>
 	</body>
 </html>

src/index.template.html

@@ -2,11 +2,10 @@
 <html>
 	<head>
 		<meta charset="utf-8">
-		<title>Export Example App</title>
+		<title>Every Second</title>
 	</head>
 	<body>
 		<div id="root"/>
-		<script type="text/javascript" src="js/libs/CSInterface.js"></script>
-		<script type="text/javascript" src="js/libs/Vulcan.js"></script>
+		<script type="text/javascript" src="libs/CSInterface.js"></script>
 	</body>
 </html>