@machinat/create-app - npm Package Compare versions

Comparing version 0.4.1-alpha.16 to 0.4.1-alpha.17

lib/cli.js

@@ -48,3 +48,3 @@ #!/usr/bin/env node
   projectPath
-});
+}).then(code => process.exit(code));
 //# sourceMappingURL=cli.js.map

lib/createApp.d.ts

@@ -5,3 +5,3 @@ declare type CreateAppOptions = {
 };
-declare const createMachinatApp: ({ platforms, projectPath, }: CreateAppOptions) => Promise<void>;
+declare const createMachinatApp: ({ platforms, projectPath, }: CreateAppOptions) => Promise<number>;
 export default createMachinatApp;

lib/createApp.js

@@ -16,2 +16,4 @@ "use strict";
 
+var _chalk = _interopRequireDefault(require("chalk"));
+
 var _thenifiedly = _interopRequireDefault(require("thenifiedly"));
@@ -38,2 +40,3 @@
 }) => {
+  console.log(`Create a ${_chalk.default.yellow('Machinat')} app in ${_chalk.default.green(projectPath)}...\n`);
   const projectName = (0, _path.basename)(projectPath); // validate platforms
@@ -43,4 +46,4 @@
     if (!supportedPlatforms.includes(platform)) {
-      console.log(`"${platform}" is not a supported platform, only  'messenger', 'telegram', 'line', and 'webview' are available for now`);
-      process.exit(1);
+      console.log(`${_chalk.default.redBright('Error:')} "${platform}" is not a supported platform, only  'messenger', 'telegram', 'line', and 'webview' are supported for now`);
+      return 1;
     }
@@ -55,4 +58,4 @@ }
   if ((0, _fs.existsSync)(projectPath)) {
-    console.log(`project directory ${projectPath} already exists`);
-    process.exit(1);
+    console.log(`${_chalk.default.redBright('Error:')} project directory ${_chalk.default.green(projectPath)} already exists`);
+    return 1;
   }
@@ -65,7 +68,7 @@
   await Promise.all(templateFiles.map(async file => {
-    const relativeFilePath = (0, _path.relative)(`${__dirname}/template`, file).replace(/\.t\.[t|j]s$/, '');
-    const targetPath = (0, _path.join)(projectPath, relativeFilePath);
+    const targetPath = (0, _path.join)(projectPath, (0, _path.relative)((0, _path.join)(__dirname, 'template'), file).replace(/\.t\.[t|j]s$/, ''));
     const {
       default: buildContent,
-      mode
+      mode,
+      name
     } = await Promise.resolve(`${file}`).then(s => _interopRequireWildcard(require(s)));
@@ -84,3 +87,3 @@ const content = buildContent(context);
       const ext = (0, _path.extname)(targetPath);
-      await _thenifiedly.default.call(_fs.writeFile, targetPath, ext === '.ts' ? formatCode(content, 'typescript') : ext === '.js' ? formatCode(content, 'babel') : ext === '.json' ? formatCode(content, 'json-stringify') : content, {
+      await _thenifiedly.default.call(_fs.writeFile, name ? (0, _path.join)((0, _path.dirname)(targetPath), name) : targetPath, ext === '.ts' ? formatCode(content, 'typescript') : ext === '.js' ? formatCode(content, 'babel') : ext === '.json' ? formatCode(content, 'json-stringify') : ext === '.md' ? formatCode(content, 'markdown') : content, {
         mode
@@ -90,13 +93,50 @@ });
   }));
-  const npmInstall = (0, _child_process.spawn)('npm', ['install'], {
-    cwd: projectPath
+  console.log(`Install ${_chalk.default.yellow('Machinat')} framwork and other dependencies...\n`);
+  const npmInstallProcess = (0, _child_process.spawn)('npm', ['install'], {
+    cwd: projectPath,
+    stdio: 'inherit'
   });
-  npmInstall.stdout.pipe(process.stdout);
-  npmInstall.stderr.pipe(process.stderr);
-  await _thenifiedly.default.tillEvent('close', npmInstall);
-  const gitInit = (0, _child_process.spawn)('git init && git add . && git commit -m "Init project with Create Machinat App"', {
+  const installCode = await _thenifiedly.default.tillEvent('close', npmInstallProcess);
+
+  if (installCode !== 0) {
+    return installCode;
+  }
+
+  console.log('\n');
+  console.log(`Initiate ${_chalk.default.cyan('git')}...\n`);
+  const gitInitProcess = (0, _child_process.spawn)('git init && git add . && git commit -m "Init project with Create Machinat App"', {
     cwd: projectPath,
-    shell: true
+    shell: true,
+    stdio: 'inherit'
   });
-  await _thenifiedly.default.tillEvent('close', gitInit);
+  const gitInitCode = await _thenifiedly.default.tillEvent('close', gitInitProcess);
+
+  if (gitInitCode !== 0) {
+    return gitInitCode;
+  }
+
+  console.log(`
+${_chalk.default.greenBright('Success!')} Created ${_chalk.default.bold(projectName)} at ${_chalk.default.green(projectPath)}
+Inside that directory, you can run several commands:
+
+  ${_chalk.default.cyan('npm run dev')}
+    Start the server in development mode.
+
+  ${_chalk.default.cyan('npm start')}
+    Starts the server in production mode.
+
+  ${_chalk.default.cyan('npm run build')}
+    Build the server and webview codes for deployment.
+
+  ${_chalk.default.cyan('npm run migrate')}
+    Execute the migration jobs. Add '-- --down' to revert.
+
+You have to fill chat platforms settings in ${_chalk.default.green('.env')} file first.
+Check the \`${_chalk.default.bold('Environments Setup')}\` guide in ${_chalk.default.green('README.md')}.
+After that, you can begin by typing:
+
+  ${_chalk.default.cyan('cd')} ${projectName}
+  ${_chalk.default.cyan('npm run dev')}
+`);
+  return 0;
 };
@@ -103,0 +143,0 @@

lib/template/package.json.t.js

@@ -10,3 +10,3 @@ "use strict";
 
-var _templateHelper = require("../templateHelper");
+var _utils = require("../utils");
 
@@ -23,3 +23,2 @@ var _types = require("../types");
     name: projectName,
-    verion: '0.0.1',
     private: true,
@@ -31,3 +30,3 @@ scripts: {
       'migrate:production': 'node ./lib/cli/migrate.js',
-      build: `npm run build:source${(0, _templateHelper.when)(platforms.includes('webview'))` && npm run build:webview`}`,
+      build: `npm run build:source${(0, _utils.when)(platforms.includes('webview'))` && npm run build:webview`}`,
       'build:source': 'tsc',
@@ -75,3 +74,3 @@ 'build:webview': 'next build ./src/webview',
 
-  return (0, _templateHelper.polishFileContent)(JSON.stringify((0, _sortPackageJson.default)(packageConfigs), null, 2));
+  return (0, _utils.polishFileContent)(JSON.stringify((0, _sortPackageJson.default)(packageConfigs), null, 2));
 };
@@ -78,0 +77,0 @@

lib/template/src/app.ts.t.js

@@ -8,3 +8,3 @@ "use strict";
 
-var _templateHelper = require("../../templateHelper");
+var _utils = require("../../utils");
 
@@ -15,14 +15,14 @@ var _types = require("../../types");
   platforms
-}) => (0, _templateHelper.polishFileContent)(`
+}) => (0, _utils.polishFileContent)(`
 import Machinat from '@machinat/core';
-import Http from '@machinat/http';${(0, _templateHelper.when)(platforms.includes('messenger'))`
-import Messenger from '@machinat/messenger';${(0, _templateHelper.when)(platforms.includes('webview'))`
-import MessengerAuthorizer from '@machinat/messenger/webview';`}`}${(0, _templateHelper.when)(platforms.includes('line'))`
-import Line from '@machinat/line';${(0, _templateHelper.when)(platforms.includes('webview'))`
-import LineAuthorizer from '@machinat/line/webview';`}`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-import Telegram from '@machinat/telegram';${(0, _templateHelper.when)(platforms.includes('webview'))`
-import TelegramAuthorizer from '@machinat/telegram/webview';`}`}${(0, _templateHelper.when)(platforms.includes('webview'))`
+import Http from '@machinat/http';${(0, _utils.when)(platforms.includes('messenger'))`
+import Messenger from '@machinat/messenger';${(0, _utils.when)(platforms.includes('webview'))`
+import MessengerAuthorizer from '@machinat/messenger/webview';`}`}${(0, _utils.when)(platforms.includes('line'))`
+import Line from '@machinat/line';${(0, _utils.when)(platforms.includes('webview'))`
+import LineAuthorizer from '@machinat/line/webview';`}`}${(0, _utils.when)(platforms.includes('telegram'))`
+import Telegram from '@machinat/telegram';${(0, _utils.when)(platforms.includes('webview'))`
+import TelegramAuthorizer from '@machinat/telegram/webview';`}`}${(0, _utils.when)(platforms.includes('webview'))`
 import Webview from '@machinat/webview';`}
 import RedisState from '@machinat/redis-state';
-import { FileState } from '@machinat/local-state';${(0, _templateHelper.when)(platforms.includes('webview'))`
+import { FileState } from '@machinat/local-state';${(0, _utils.when)(platforms.includes('webview'))`
 import { ServerDomain, LineLiffId } from './interface';
@@ -34,15 +34,15 @@ import nextConfigs from './webview/next.config.js'`}
   NODE_ENV,
-  PORT,${(0, _templateHelper.when)(platforms.includes('webview'))`
+  PORT,${(0, _utils.when)(platforms.includes('webview'))`
   DOMAIN,
   // webview
-  WEBVIEW_AUTH_SECRET,`}${(0, _templateHelper.when)(platforms.includes('messenger'))`
+  WEBVIEW_AUTH_SECRET,`}${(0, _utils.when)(platforms.includes('messenger'))`
   // messenger
-  MESSENGER_PAGE_ID,${(0, _templateHelper.when)(platforms.includes('webview'))`
+  MESSENGER_PAGE_ID,${(0, _utils.when)(platforms.includes('webview'))`
   MESSENGER_APP_ID,`}
   MESSENGER_ACCESS_TOKEN,
   MESSENGER_APP_SECRET,
-  MESSENGER_VERIFY_TOKEN,`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
+  MESSENGER_VERIFY_TOKEN,`}${(0, _utils.when)(platforms.includes('telegram'))`
   // telegram
   TELEGRAM_BOT_TOKEN,
-  TELEGRAM_SECRET_PATH,`}${(0, _templateHelper.when)(platforms.includes('line'))`
+  TELEGRAM_SECRET_PATH,`}${(0, _utils.when)(platforms.includes('line'))`
   // line
@@ -79,3 +79,3 @@ LINE_PROVIDER_ID,
 
-  platforms: [${(0, _templateHelper.when)(platforms.includes('messenger'))`
+  platforms: [${(0, _utils.when)(platforms.includes('messenger'))`
 
@@ -88,3 +88,3 @@ Messenger.initModule({
       verifyToken: MESSENGER_VERIFY_TOKEN,
-    }),`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
+    }),`}${(0, _utils.when)(platforms.includes('telegram'))`
 
@@ -95,3 +95,3 @@ Telegram.initModule({
       secretPath: TELEGRAM_SECRET_PATH,
-    }),`}${(0, _templateHelper.when)(platforms.includes('line'))`
+    }),`}${(0, _utils.when)(platforms.includes('line'))`
 
@@ -105,7 +105,7 @@ Line.initModule({
       liffChannelIds: [LINE_LIFF_ID.split('-')[0]],
-    }),`}${(0, _templateHelper.when)(platforms.includes('webview'))`
+    }),`}${(0, _utils.when)(platforms.includes('webview'))`
 
-    Webview.initModule<${(0, _templateHelper.when)(platforms.includes('messenger'))`
-      | MessengerAuthorizer`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-      | TelegramAuthorizer`}${(0, _templateHelper.when)(platforms.includes('line'))`
+    Webview.initModule<${(0, _utils.when)(platforms.includes('messenger'))`
+      | MessengerAuthorizer`}${(0, _utils.when)(platforms.includes('telegram'))`
+      | TelegramAuthorizer`}${(0, _utils.when)(platforms.includes('line'))`
       | LineAuthorizer`}
@@ -116,3 +116,3 @@ >({
       authSecret: WEBVIEW_AUTH_SECRET,
-      ${(0, _templateHelper.when)(platforms.includes('messenger'))`
+      ${(0, _utils.when)(platforms.includes('messenger'))`
       sameSite: 'none',`}
@@ -124,4 +124,4 @@ nextServerOptions: {
           ...nextConfigs,
-          publicRuntimeConfig: {${(0, _templateHelper.when)(platforms.includes('messenger'))`
-            messengerAppId: MESSENGER_APP_ID,`}${(0, _templateHelper.when)(platforms.includes('line'))`
+          publicRuntimeConfig: {${(0, _utils.when)(platforms.includes('messenger'))`
+            messengerAppId: MESSENGER_APP_ID,`}${(0, _utils.when)(platforms.includes('line'))`
             lineProviderId: LINE_PROVIDER_ID,
@@ -135,9 +135,9 @@ lineBotChannelId: LINE_BOT_CHANNEL_ID,
   ],
-${(0, _templateHelper.when)(platforms.includes('webview'))`
-  services: [${(0, _templateHelper.when)(platforms.includes('messenger'))`
-    { provide: Webview.AuthorizerList, withProvider: MessengerAuthorizer },`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-    { provide: Webview.AuthorizerList, withProvider: TelegramAuthorizer },`}${(0, _templateHelper.when)(platforms.includes('line'))`
+${(0, _utils.when)(platforms.includes('webview'))`
+  services: [${(0, _utils.when)(platforms.includes('messenger'))`
+    { provide: Webview.AuthorizerList, withProvider: MessengerAuthorizer },`}${(0, _utils.when)(platforms.includes('telegram'))`
+    { provide: Webview.AuthorizerList, withProvider: TelegramAuthorizer },`}${(0, _utils.when)(platforms.includes('line'))`
     { provide: Webview.AuthorizerList, withProvider: LineAuthorizer },`}
     
-    { provide: ServerDomain, withValue: DOMAIN },${(0, _templateHelper.when)(platforms.includes('line'))`
+    { provide: ServerDomain, withValue: DOMAIN },${(0, _utils.when)(platforms.includes('line'))`
     { provide: LineLiffId, withValue: LINE_LIFF_ID },`}
@@ -144,0 +144,0 @@ ],`}

lib/template/src/cli/dev.ts.t.js

@@ -8,3 +8,3 @@ "use strict";
 
-var _templateHelper = require("../../../templateHelper");
+var _utils = require("../../../utils");
 
@@ -14,3 +14,3 @@ const mode = 0o775;
 
-var _default = () => (0, _templateHelper.polishFileContent)(`
+var _default = () => (0, _utils.polishFileContent)(`
 #!/usr/bin/env node
@@ -30,3 +30,3 @@ import { config as configEnv } from 'dotenv';
   });
-  
+
   process.on('SIGINT', () => {
@@ -37,9 +37,11 @@ tunnel.close();
 
-  console.log(\`HTTP tunnel from \${tunnel.url} to localhost:\${PORT} is opened\`);
+  console.log(
+    \`[dev:tunnel] Tunnel from \${tunnel.url} to http://localhost:\${PORT} is opened\`
+  );
   tunnel.on('close', () => {
     console.log(
-      \`HTTP tunnel from \${tunnel.url} to localhost:\${PORT} is closed\`
+      \`[dev:tunnel] Tunnel from \${tunnel.url} to http://localhost:\${PORT} is closed\`
     );
   });
-  
+
   nodemon({
@@ -53,3 +55,9 @@ exec: 'ts-node -r dotenv/config',
   });
-};
+  nodemon.on('start',  () => {
+    console.log(\`[dev:server] Dev server is running on \${PORT} port\`);
+  });
+  nodemon.on('restart', (changes: string[]) => {
+    console.log(\`[dev:server] Restarting server. File changed: \${changes.join(', ')}\`);
+  });
+}
 
@@ -56,0 +64,0 @@ dev();

lib/template/src/cli/migrate.ts.t.js

@@ -10,3 +10,3 @@ "use strict";
 
-var _templateHelper = require("../../../templateHelper");
+var _utils = require("../../../utils");
 
@@ -18,9 +18,9 @@ const mode = 0o775;
   platforms
-}) => (0, _templateHelper.polishFileContent)(`
+}) => (0, _utils.polishFileContent)(`
 #!/usr/bin/env node
 import { config as configEnv } from 'dotenv';
 import { resolve as resolvePath } from 'path';
-import Machinat from '@machinat/core';${(0, _templateHelper.when)(platforms.includes('messenger'))`
-import Messenger from '@machinat/messenger';`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-import Telegram from '@machinat/telegram';`}${(0, _templateHelper.when)(platforms.includes('line'))`
+import Machinat from '@machinat/core';${(0, _utils.when)(platforms.includes('messenger'))`
+import Messenger from '@machinat/messenger';`}${(0, _utils.when)(platforms.includes('telegram'))`
+import Telegram from '@machinat/telegram';`}${(0, _utils.when)(platforms.includes('line'))`
 import Line from '@machinat/line';`}
@@ -31,6 +31,6 @@ import { Umzug, JSONStorage } from 'umzug';
 configEnv();
-const {${(0, _templateHelper.when)(platforms.includes('messenger'))`
+const {${(0, _utils.when)(platforms.includes('messenger'))`
   MESSENGER_PAGE_ID,
-  MESSENGER_ACCESS_TOKEN,`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-  TELEGRAM_BOT_TOKEN,`}${(0, _templateHelper.when)(platforms.includes('line'))`
+  MESSENGER_ACCESS_TOKEN,`}${(0, _utils.when)(platforms.includes('telegram'))`
+  TELEGRAM_BOT_TOKEN,`}${(0, _utils.when)(platforms.includes('line'))`
   LINE_PROVIDER_ID,
@@ -43,3 +43,3 @@ LINE_BOT_CHANNEL_ID,
   platforms: [
-${(0, _templateHelper.when)(platforms.includes('messenger'))`
+${(0, _utils.when)(platforms.includes('messenger'))`
     Messenger.initModule({
@@ -50,3 +50,3 @@ pageId: Number(MESSENGER_PAGE_ID),
     }),`}
-${(0, _templateHelper.when)(platforms.includes('telegram'))`
+${(0, _utils.when)(platforms.includes('telegram'))`
     Telegram.initModule({
@@ -56,3 +56,3 @@ botToken: TELEGRAM_BOT_TOKEN,
     }),`}
-${(0, _templateHelper.when)(platforms.includes('line'))`
+${(0, _utils.when)(platforms.includes('line'))`
     Line.initModule({
@@ -59,0 +59,0 @@ providerId: LINE_PROVIDER_ID,

lib/template/src/components/WithWebviewLink.tsx.t.js

@@ -8,3 +8,3 @@ "use strict";
 
-var _templateHelper = require("../../../templateHelper");
+var _utils = require("../../../utils");
 
@@ -15,7 +15,7 @@ var _types = require("../../../types");
   platforms
-}) => (0, _templateHelper.polishFileContent)((0, _templateHelper.when)(platforms.includes('webview'))`
+}) => (0, _utils.polishFileContent)((0, _utils.when)(platforms.includes('webview'))`
 import Machinat, { MachinatNode, FunctionalComponent } from '@machinat/core';
-import { makeContainer } from '@machinat/core/service';${(0, _templateHelper.when)(platforms.includes('messenger'))`
-import * as Messenger from '@machinat/messenger/components';`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-import * as Telegram from '@machinat/telegram/components';`}${(0, _templateHelper.when)(platforms.includes('line'))`
+import { makeContainer } from '@machinat/core/service';${(0, _utils.when)(platforms.includes('messenger'))`
+import * as Messenger from '@machinat/messenger/components';`}${(0, _utils.when)(platforms.includes('telegram'))`
+import * as Telegram from '@machinat/telegram/components';`}${(0, _utils.when)(platforms.includes('line'))`
 import * as Line from '@machinat/line/components';`}
@@ -30,11 +30,11 @@ import { ServerDomain, LineLiffId } from '../interface';
   deps: [
-    ServerDomain,${(0, _templateHelper.when)(platforms.includes('line'))`
+    ServerDomain,${(0, _utils.when)(platforms.includes('line'))`
     LineLiffId,`}
   ],
 })(function WithWebviewLink(
-  domain,${(0, _templateHelper.when)(platforms.includes('line'))`
+  domain,${(0, _utils.when)(platforms.includes('line'))`
   lineLiffId`}
 ): FunctionalComponent<WithWebviewLinkProps> {
   return ({ children }, { platform }) => {
-${(0, _templateHelper.when)(platforms.includes('messenger'))`
+${(0, _utils.when)(platforms.includes('messenger'))`
     if (platform === 'messenger') {
@@ -55,3 +55,3 @@ return (
     }`}
-${(0, _templateHelper.when)(platforms.includes('telegram'))`
+${(0, _utils.when)(platforms.includes('telegram'))`
     if (platform === 'telegram') {
@@ -74,3 +74,3 @@ return (
     }`}
-${(0, _templateHelper.when)(platforms.includes('line'))`
+${(0, _utils.when)(platforms.includes('line'))`
     if (platform === 'line') {
@@ -77,0 +77,0 @@ const liffLink = \`https://liff.line.me/\${lineLiffId}\`;

lib/template/src/index.ts.t.js

@@ -8,5 +8,5 @@ "use strict";
 
-var _templateHelper = require("../../templateHelper");
+var _utils = require("../../utils");
 
-var _default = () => (0, _templateHelper.polishFileContent)(`
+var _default = () => (0, _utils.polishFileContent)(`
 import { fromApp } from '@machinat/stream';
@@ -13,0 +13,0 @@ import main from './main';

lib/template/src/interface.ts.t.js

@@ -8,3 +8,3 @@ "use strict";
 
-var _templateHelper = require("../../templateHelper");
+var _utils = require("../../utils");
 
@@ -15,6 +15,6 @@ var _types = require("../../types");
   platforms
-}) => (0, _templateHelper.polishFileContent)((0, _templateHelper.when)(platforms.includes('webview'))`
+}) => (0, _utils.polishFileContent)((0, _utils.when)(platforms.includes('webview'))`
 import { makeInterface } from '@machinat/core/service';
 
-export const ServerDomain = makeInterface<string>({ name: 'ServerDomain' });${(0, _templateHelper.when)(platforms.includes('line'))`
+export const ServerDomain = makeInterface<string>({ name: 'ServerDomain' });${(0, _utils.when)(platforms.includes('line'))`
 
@@ -21,0 +21,0 @@ export const LineLiffId = makeInterface<string>({ name: 'LineLiffId' });`}

lib/template/src/main.tsx.t.js

@@ -8,3 +8,3 @@ "use strict";
 
-var _templateHelper = require("../../templateHelper");
+var _utils = require("../../utils");
 
@@ -15,11 +15,11 @@ var _types = require("../../types");
   platforms
-}) => (0, _templateHelper.polishFileContent)(`
-import Machinat from '@machinat/core';${(0, _templateHelper.when)(platforms.includes('webview'))`
+}) => (0, _utils.polishFileContent)(`
+import Machinat from '@machinat/core';${(0, _utils.when)(platforms.includes('webview'))`
 import { makeContainer } from '@machinat/core/service';`}
 import { Stream } from '@machinat/stream';
-import { filter } from '@machinat/stream/operators';${(0, _templateHelper.when)(platforms.includes('webview'))`
+import { filter } from '@machinat/stream/operators';${(0, _utils.when)(platforms.includes('webview'))`
 import WithWebviewLink from './components/WithWebviewLink';`}
 import type {
   AppEventContext,
-  ChatEventContext,${(0, _templateHelper.when)(platforms.includes('webview'))`
+  ChatEventContext,${(0, _utils.when)(platforms.includes('webview'))`
   WebAppEventContext,`}
@@ -39,3 +39,3 @@ } from './types';
     });
-${(0, _templateHelper.when)(platforms.includes('webview'))`
+${(0, _utils.when)(platforms.includes('webview'))`
   event$
@@ -42,0 +42,0 @@ .pipe(filter(({ event }) => event.platform === 'webview'))

lib/template/src/migrations/0-init-app.ts.t.js

@@ -8,3 +8,3 @@ "use strict";
 
-var _templateHelper = require("../../../templateHelper");
+var _utils = require("../../../utils");
 
@@ -15,14 +15,14 @@ var _types = require("../../../types");
   platforms
-}) => (0, _templateHelper.polishFileContent)(`
-import { makeContainer } from '@machinat/core/service';${(0, _templateHelper.when)(platforms.includes('messenger'))`
-import Messenger from '@machinat/messenger';`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-import Telegram from '@machinat/telegram';`}${(0, _templateHelper.when)(platforms.includes('line'))`
+}) => (0, _utils.polishFileContent)(`
+import { makeContainer } from '@machinat/core/service';${(0, _utils.when)(platforms.includes('messenger'))`
+import Messenger from '@machinat/messenger';`}${(0, _utils.when)(platforms.includes('telegram'))`
+import Telegram from '@machinat/telegram';`}${(0, _utils.when)(platforms.includes('line'))`
 import Line from '@machinat/line';`}
 
 const {
-  DOMAIN,${(0, _templateHelper.when)(platforms.includes('telegram'))`
+  DOMAIN,${(0, _utils.when)(platforms.includes('telegram'))`
   MESSENGER_PAGE_ID,
   MESSENGER_APP_ID,
   MESSENGER_APP_SECRET,
-  MESSENGER_VERIFY_TOKEN,`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
+  MESSENGER_VERIFY_TOKEN,`}${(0, _utils.when)(platforms.includes('telegram'))`
   TELEGRAM_SECRET_PATH,`}
@@ -34,12 +34,12 @@ } = process.env;
 export const up = makeContainer({
-  deps: [${(0, _templateHelper.when)(platforms.includes('messenger'))`
-    Messenger.Bot,`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-    Telegram.Bot,`}${(0, _templateHelper.when)(platforms.includes('line'))`
+  deps: [${(0, _utils.when)(platforms.includes('messenger'))`
+    Messenger.Bot,`}${(0, _utils.when)(platforms.includes('telegram'))`
+    Telegram.Bot,`}${(0, _utils.when)(platforms.includes('line'))`
     Line.Bot,`}
   ] as const,
-})(async (${(0, _templateHelper.when)(platforms.includes('messenger'))`
-  messengerBot,`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-  telegramBot,`}${(0, _templateHelper.when)(platforms.includes('line'))`
+})(async (${(0, _utils.when)(platforms.includes('messenger'))`
+  messengerBot,`}${(0, _utils.when)(platforms.includes('telegram'))`
+  telegramBot,`}${(0, _utils.when)(platforms.includes('line'))`
   lineBot`}
-) => {${(0, _templateHelper.when)(platforms.includes('messenger'))`
+) => {${(0, _utils.when)(platforms.includes('messenger'))`
   // setup page profile in Messenger
@@ -49,3 +49,3 @@ await messengerBot.makeApiCall('POST', 'me/messenger_profile', {
       { locale: 'default', text: 'Hello World!' },
-    ],${(0, _templateHelper.when)(platforms.includes('webview'))`
+    ],${(0, _utils.when)(platforms.includes('webview'))`
     whitelisted_domains: [ENTRY_URL],`}
@@ -71,3 +71,3 @@ });
       subscribed_fields: ['messages', 'messaging_postbacks'],
-  });`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
+  });`}${(0, _utils.when)(platforms.includes('telegram'))`
 
@@ -77,3 +77,3 @@ // setup webhook of the Telegram bot
     url: \`\${ENTRY_URL}/webhook/telegram/\${TELEGRAM_SECRET_PATH}\`,
-  });`}${(0, _templateHelper.when)(platforms.includes('line'))`
+  });`}${(0, _utils.when)(platforms.includes('line'))`
 
@@ -87,11 +87,11 @@ // setup webhook of the LINE channel
 export const down = makeContainer({
-  deps: [${(0, _templateHelper.when)(platforms.includes('messenger'))`
-    Messenger.Bot,`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
+  deps: [${(0, _utils.when)(platforms.includes('messenger'))`
+    Messenger.Bot,`}${(0, _utils.when)(platforms.includes('telegram'))`
     Telegram.Bot,`}
   ] as const,
-})(async (${(0, _templateHelper.when)(platforms.includes('messenger'))`
-  messengerBot,`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
+})(async (${(0, _utils.when)(platforms.includes('messenger'))`
+  messengerBot,`}${(0, _utils.when)(platforms.includes('telegram'))`
   telegramBot,`}
 ) => {
-${(0, _templateHelper.when)(platforms.includes('messenger'))`
+${(0, _utils.when)(platforms.includes('messenger'))`
   // clear page profile in Messenger
@@ -106,4 +106,10 @@ await messengerBot.makeApiCall('DELETE', 'me/messenger_profile', {
   });
+
+  // remove the page to from webhook
+  await messengerBot.makeApiCall(
+    'DELETE',
+    \`\${MESSENGER_PAGE_ID}/subscribed_apps\`,
+    { access_token: \`\${MESSENGER_APP_ID}|\${MESSENGER_APP_SECRET}\` }
+  );
   
-  
   // delete Messenger webhook subscription
@@ -117,11 +123,4 @@ await messengerBot.makeApiCall(
     }
-  );
-
-  // remove the page to from webhook
-  await messengerBot.makeApiCall(
-    'DELETE',
-    \`\${MESSENGER_PAGE_ID}/subscribed_apps\`,
-    { access_token: \`\${MESSENGER_APP_ID}|\${MESSENGER_APP_SECRET}\` }
   );`}
-${(0, _templateHelper.when)(platforms.includes('telegram'))`
+${(0, _utils.when)(platforms.includes('telegram'))`
 
@@ -128,0 +127,0 @@ // delete webhook of the Telegram bot

lib/template/src/types.ts.t.js

@@ -10,23 +10,23 @@ "use strict";
 
-var _templateHelper = require("../../templateHelper");
+var _utils = require("../../utils");
 
 var _default = ({
   platforms
-}) => (0, _templateHelper.polishFileContent)(`${(0, _templateHelper.when)(platforms.includes('messenger'))`
-import type { MessengerEventContext } from '@machinat/messenger';${(0, _templateHelper.when)(platforms.includes('webview'))`
-import type { MessengerServerAuthorizer } from '@machinat/messenger/webview';`}`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-import type { TelegramEventContext } from '@machinat/telegram';${(0, _templateHelper.when)(platforms.includes('webview'))`
-import type { TelegramServerAuthorizer } from '@machinat/telegram/webview';`}`}${(0, _templateHelper.when)(platforms.includes('line'))`
-import type { LineEventContext } from '@machinat/line';${(0, _templateHelper.when)(platforms.includes('webview'))`
-import type { LineServerAuthorizer } from '@machinat/line/webview';`}`}${(0, _templateHelper.when)(platforms.includes('webview'))`
+}) => (0, _utils.polishFileContent)(`${(0, _utils.when)(platforms.includes('messenger'))`
+import type { MessengerEventContext } from '@machinat/messenger';${(0, _utils.when)(platforms.includes('webview'))`
+import type { MessengerServerAuthorizer } from '@machinat/messenger/webview';`}`}${(0, _utils.when)(platforms.includes('telegram'))`
+import type { TelegramEventContext } from '@machinat/telegram';${(0, _utils.when)(platforms.includes('webview'))`
+import type { TelegramServerAuthorizer } from '@machinat/telegram/webview';`}`}${(0, _utils.when)(platforms.includes('line'))`
+import type { LineEventContext } from '@machinat/line';${(0, _utils.when)(platforms.includes('webview'))`
+import type { LineServerAuthorizer } from '@machinat/line/webview';`}`}${(0, _utils.when)(platforms.includes('webview'))`
 import type { WebviewEventContext } from '@machinat/webview';`}
 
-export type ChatEventContext =${(0, _templateHelper.when)(platforms.includes('messenger'))`
-  | MessengerEventContext`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-  | TelegramEventContext`}${(0, _templateHelper.when)(platforms.includes('line'))`
+export type ChatEventContext =${(0, _utils.when)(platforms.includes('messenger'))`
+  | MessengerEventContext`}${(0, _utils.when)(platforms.includes('telegram'))`
+  | TelegramEventContext`}${(0, _utils.when)(platforms.includes('line'))`
   | LineEventContext`};
-${(0, _templateHelper.when)(platforms.includes('webview'))`
-export type WebAppEventContext = WebviewEventContext<${(0, _templateHelper.when)(platforms.includes('messenger'))`
-    | MessengerServerAuthorizer`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-    | TelegramServerAuthorizer`}${(0, _templateHelper.when)(platforms.includes('line'))`
+${(0, _utils.when)(platforms.includes('webview'))`
+export type WebAppEventContext = WebviewEventContext<${(0, _utils.when)(platforms.includes('messenger'))`
+    | MessengerServerAuthorizer`}${(0, _utils.when)(platforms.includes('telegram'))`
+    | TelegramServerAuthorizer`}${(0, _utils.when)(platforms.includes('line'))`
     | LineServerAuthorizer`}
@@ -36,3 +36,3 @@ >;`}
 export type AppEventContext =
-  | ChatEventContext${(0, _templateHelper.when)(platforms.includes('webview'))`
+  | ChatEventContext${(0, _utils.when)(platforms.includes('webview'))`
   | WebAppEventContext`};
@@ -39,0 +39,0 @@ `);

lib/template/src/webview/next-env.d.ts.t.js

@@ -8,3 +8,3 @@ "use strict";
 
-var _templateHelper = require("../../../templateHelper");
+var _utils = require("../../../utils");
 
@@ -15,3 +15,3 @@ var _types = require("../../../types");
   platforms
-}) => (0, _templateHelper.polishFileContent)((0, _templateHelper.when)(platforms.includes('webview'))`
+}) => (0, _utils.polishFileContent)((0, _utils.when)(platforms.includes('webview'))`
 /// <reference types="next" />
@@ -18,0 +18,0 @@ /// <reference types="next/types/global" />

lib/template/src/webview/next.config.js.t.js

@@ -8,3 +8,3 @@ "use strict";
 
-var _templateHelper = require("../../../templateHelper");
+var _utils = require("../../../utils");
 
@@ -15,3 +15,3 @@ var _types = require("../../../types");
   platforms
-}) => (0, _templateHelper.polishFileContent)((0, _templateHelper.when)(platforms.includes('webview'))`
+}) => (0, _utils.polishFileContent)((0, _utils.when)(platforms.includes('webview'))`
 module.exports = {
@@ -18,0 +18,0 @@ distDir: '../../dist',

lib/template/src/webview/pages/index.tsx.t.js

@@ -8,3 +8,3 @@ "use strict";
 
-var _templateHelper = require("../../../../templateHelper");
+var _utils = require("../../../../utils");
 
@@ -15,9 +15,9 @@ var _types = require("../../../../types");
   platforms
-}) => (0, _templateHelper.polishFileContent)((0, _templateHelper.when)(platforms.includes('webview'))`
+}) => (0, _utils.polishFileContent)((0, _utils.when)(platforms.includes('webview'))`
 import React from 'react';
 import Head from 'next/head';
 import getConfig from 'next/config';
-import WebviewClient from '@machinat/webview/client';${(0, _templateHelper.when)(platforms.includes('messenger'))`
-import { MessengerClientAuthorizer } from '@machinat/messenger/webview';`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-import { TelegramClientAuthorizer } from '@machinat/telegram/webview';`}${(0, _templateHelper.when)(platforms.includes('line'))`
+import WebviewClient from '@machinat/webview/client';${(0, _utils.when)(platforms.includes('messenger'))`
+import { MessengerClientAuthorizer } from '@machinat/messenger/webview';`}${(0, _utils.when)(platforms.includes('telegram'))`
+import { TelegramClientAuthorizer } from '@machinat/telegram/webview';`}${(0, _utils.when)(platforms.includes('line'))`
 import { LineClientAuthorizer } from '@machinat/line/webview';`}
@@ -31,7 +31,7 @@
     : {
-        authorizers: [${(0, _templateHelper.when)(platforms.includes('messenger'))`
+        authorizers: [${(0, _utils.when)(platforms.includes('messenger'))`
           new MessengerClientAuthorizer({
             appId: publicRuntimeConfig.messengerAppId,
-          }),`}${(0, _templateHelper.when)(platforms.includes('telegram'))`
-          new TelegramClientAuthorizer(),`}${(0, _templateHelper.when)(platforms.includes('line'))`
+          }),`}${(0, _utils.when)(platforms.includes('telegram'))`
+          new TelegramClientAuthorizer(),`}${(0, _utils.when)(platforms.includes('line'))`
           new LineClientAuthorizer({
@@ -38,0 +38,0 @@ liffId: publicRuntimeConfig.lineLiffId,

lib/template/src/webview/tsconfig.json.t.js

@@ -8,3 +8,3 @@ "use strict";
 
-var _templateHelper = require("../../../templateHelper");
+var _utils = require("../../../utils");
 
@@ -15,3 +15,3 @@ var _types = require("../../../types");
   platforms
-}) => (0, _templateHelper.polishFileContent)((0, _templateHelper.when)(platforms.includes('webview'))`
+}) => (0, _utils.polishFileContent)((0, _utils.when)(platforms.includes('webview'))`
 {
@@ -18,0 +18,0 @@ "compilerOptions": {

lib/template/tsconfig.json.t.js

@@ -8,5 +8,5 @@ "use strict";
 
-var _templateHelper = require("../templateHelper");
+var _utils = require("../utils");
 
-var _default = () => (0, _templateHelper.polishFileContent)(`
+var _default = () => (0, _utils.polishFileContent)(`
 {
@@ -13,0 +13,0 @@ "include": ["./src/**/*"],

package.json

 {
   "name": "@machinat/create-app",
-  "version": "0.4.1-alpha.16",
+  "version": "0.4.1-alpha.17",
   "author": "Patrick Liu <[e-mail]>  (https://github.com/lrills)",
@@ -26,2 +26,3 @@ "repository": {
   "dependencies": {
+    "chalk": "^4.1.1",
     "glob": "^7.1.6",
@@ -35,3 +36,3 @@ "meow": "^9.0.0",
   },
-  "gitHead": "e5add42a0f92c0e5fd1a1e831c84873b2164e1cc"
+  "gitHead": "218edf5b2bf495579129651b15e129c7331ccd09"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No README

Quality

Package does not have a README. This may indicate a failed publish or a low quality package.

Found 1 instance in 1 package

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Improved metrics

Number of medium quality alerts

1

decreased by-50%

Number of lines in readme file

12

increased byInfinity%

Number of low supply chain risk alerts

2

decreased by-33.33%

Worsened metrics

Total package byte prevSize

115836

decreased by-12.72%

Dependency count

8

increased by14.29%

Number of package files

77

decreased by-17.2%

Lines of code

1332

decreased by-12.94%

Dependency changes

• + Addedchalk@^4.1.1

• + Addedansi-styles@4.3.0(transitive)

• + Addedchalk@4.1.2(transitive)

• + Addedcolor-convert@2.0.1(transitive)

• + Addedcolor-name@1.1.4(transitive)

• + Addedhas-flag@4.0.0(transitive)

• + Addedsupports-color@7.2.0(transitive)