@raisenow/tamaro-cli 1.1.6 → 1.1.8

package/src/lib/aws.ts

@@ -3,10 +3,6 @@ import {execaCommandSync} from 'execa'
 import prompts from 'prompts'
 import stripIndent from 'strip-indent'
 import {halt} from 'lib/command'
-import {
-  AWS_S3_EMAIL_CONFIG_PROD_BUCKET,
-  AWS_S3_EMAIL_CONFIG_STAGE_BUCKET,
-} from 'lib/constants'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -17,22 +13,13 @@ export type AwsOptions = {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export const withAwsAuthenticate = <Result = any>(
-  fn: () => Result,
-  options: AwsOptions,
-): Result => {
-  awsAuthenticate(options)
-
-  return fn()
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 export const awsAuthenticate = (options: AwsOptions) => {
   if (options.ci) {
-    // Don't try to authenticate the user.
-    // This is done when CLI is running within an automated system like pipeline,
-    // In this case "AWS_ACCESS_KEY_ID" and "AWS_SECRET_ACCESS_KEY" are used instead of "AWS_PROFILE".
+    /**
+     * Don't try to authenticate the user.
+     * This is done when CLI is running within an automated system like pipeline,
+     * In this case "AWS_ACCESS_KEY_ID" and "AWS_SECRET_ACCESS_KEY" are used instead of "AWS_PROFILE".
+     */
     return
   }
 
@@ -70,20 +57,24 @@ export const getAvailableProfiles = (): string[] => {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// Returns caller identity data (output is ignored here).
-// Fails in case of expired SSO session.
+/**
+ * Returns caller identity data (output is ignored here).
+ * Fails in case of expired SSO session.
+ */
 const checkIdentity = (options: AwsOptions) => {
-  const flags = prepareFlags([], options).join(' ')
+  const flags = prepareFlags(options)
 
   execaCommandSync(`aws sts get-caller-identity ${flags}`)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// Opens SSO authentication page in the browser.
-// Fails if user canceled authentication process.
+/**
+ * Opens SSO authentication page in the browser.
+ * Fails if user canceled authentication process.
+ */
 const login = (options: AwsOptions) => {
-  const flags = prepareFlags([], options).join(' ')
+  const flags = prepareFlags(options)
 
   try {
     execaCommandSync(`aws sso login ${flags}`, {stdio: 'inherit'})
@@ -96,17 +87,30 @@ const login = (options: AwsOptions) => {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export const prepareFlags = (
-  flags: string[],
-  options: AwsOptions,
-): string[] => {
+export const prepareFlags = (options: AwsOptions) => {
+  const flags: string[] = []
   const {profile} = options
 
   if (profile) {
     flags.push(`--profile ${profile}`)
   }
 
-  return flags
+  return flags.join(' ')
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const assertProfileValid = (profile: string) => {
+  const profiles = getAvailableProfiles()
+
+  if (!profiles.includes(profile)) {
+    halt(
+      stripIndent(`
+        AWS profile "${profile}" is not found.
+        Available profiles are: ${profiles.map((v) => `"${v}"`).join(', ')}.
+      `),
+    )
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -126,34 +130,9 @@ export const promptProfile = async (): Promise<string | undefined> => {
       },
     ],
     {
-      onCancel: () => process.exit(1),
+      onCancel: () => halt(),
     },
   )
 
   return profile
 }
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const promptBucket = async (): Promise<string> => {
-  const buckets = [
-    {title: 'stage', value: AWS_S3_EMAIL_CONFIG_STAGE_BUCKET},
-    {title: 'prod', value: AWS_S3_EMAIL_CONFIG_PROD_BUCKET},
-  ]
-
-  const {bucket} = await prompts(
-    [
-      {
-        type: 'select',
-        name: 'bucket',
-        message: 'Select environment',
-        choices: buckets,
-      },
-    ],
-    {
-      onCancel: () => process.exit(1),
-    },
-  )
-
-  return bucket
-}

package/src/lib/command.ts

@@ -3,9 +3,9 @@ import {logError} from 'lib/logging'
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export const halt = (message?: string, exitCode = 1) => {
+export const halt = (message?: string) => {
   logError(message)
-  process.exit(exitCode)
+  process.exit(1)
 }
 
 ///////////////////////////////////////////////////////////////////////////////

package/src/lib/constants.ts

@@ -1,9 +1,8 @@
 export const DEFAULT_TAG = 'latest'
 export const DEFAULT_PORT = 1234
-export const DEFAULT_AWS_PROFILE = 'payments-prod-cs-deployer'
-export const AWS_S3_EMAIL_CONFIG_PROD_BUCKET = 'rnw-email-service'
-export const AWS_S3_EMAIL_CONFIG_STAGE_BUCKET = 'rnw-stage-email-service'
-export const AWS_S3_BUCKET = 'tamaro.raisenow.com'
+export const AWS_S3_BUCKET_TAMARO = 'tamaro.raisenow.com'
+export const AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_STAGE = 'rnw-stage-email-service'
+export const AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD = 'rnw-email-service'
 export const CORE_CONFIG_NAME = 'tamaro-core'
 export const AWS_CLOUDFRONT_DISTRIBUTION_ID = 'EHJ1OM458YQ0I'
 export const HTTPS_CRT_FILE = 'localhost.crt'

package/src/lib/env.ts

@@ -1,7 +1,6 @@
 import {createRequire} from 'module'
 import {basename} from 'path'
 import {config as dotenvConfig} from 'dotenv'
-import {expand as dotenvExpand} from 'dotenv-expand'
 import {globSync} from 'glob'
 import stripIndent from 'strip-indent'
 import type {IfUtilsFn} from 'webpack-config-utils'
@@ -28,7 +27,7 @@ export const getEnvVars = (
   const filePath = files.find((file) => basename(file) === '.env')
 
   if (filePath) {
-    dotenvExpand(dotenvConfig({path: filePath}))
+    dotenvConfig({path: filePath})
   }
 
   process.env.NODE_ENV ??= ifMin('production', 'development')
@@ -63,8 +62,8 @@ export const getEnvVars = (
       let version = process.env.CORE_VERSION
       version = version ? `@${version}` : ''
 
-      // process.env.CORE_URL ??= `https://cdn.jsdelivr.net/npm/@raisenow/tamaro-core${version}/dist/index.js`
-      process.env.CORE_URL ??= `https://fastly.jsdelivr.net/npm/@raisenow/tamaro-core${version}/dist/index.js`
+      process.env.CORE_URL ??= `https://cdn.jsdelivr.net/npm/@raisenow/tamaro-core${version}/dist/index.js`
+      // process.env.CORE_URL ??= `https://fastly.jsdelivr.net/npm/@raisenow/tamaro-core${version}/dist/index.js`
     }
   }
 
@@ -144,8 +143,7 @@ export const assertEnvValid = (env?: string) => {
 
   if (envs.length !== 0) {
     if (!env) {
-      // There are some ".env.<env>" files, but no "--env" flag is specified,
-      // so we must require it
+      // There are some ".env.<env>" files, but no "--env" flag is specified, so we must require it
       halt('Flag "--env" is required.')
     }
 
@@ -172,6 +170,6 @@ export const applyEnv = (env?: string) => {
   const filePath = files.find((file) => basename(file) === `.env.${env}`)
 
   if (filePath) {
-    dotenvExpand(dotenvConfig({path: filePath}))
+    dotenvConfig({path: filePath})
   }
 }

package/src/webpack.config.ts

@@ -60,17 +60,22 @@ const getWebpackConfig = (env: any): Configuration => {
   logTitle('Environment variables:')
   logDataTable(envVars.raw)
 
-  const getCssLoaders = (cssOptions: any = {}): RuleSetUseItem[] => {
+  const getCssLoaders = ({
+    styleLoader = true,
+    ...cssOptions
+  }: {styleLoader?: boolean} & Record<string, any>): RuleSetUseItem[] => {
     return removeEmpty([
-      ifMin({loader: MiniCssExtractPlugin.loader}),
-      ifNotMin({
-        loader: require.resolve('style-loader'),
-        options: {
-          attributes: {
-            'data-widget': process.env.ELEMENT_ATTRIBUTE_DATA_WIDGET,
-          },
-        },
-      }),
+      styleLoader ? ifMin({loader: MiniCssExtractPlugin.loader}) : undefined,
+      styleLoader
+        ? ifNotMin({
+            loader: require.resolve('style-loader'),
+            options: {
+              attributes: {
+                'data-widget': process.env.ELEMENT_ATTRIBUTE_DATA_WIDGET,
+              },
+            },
+          })
+        : undefined,
       {
         loader: require.resolve('css-loader'),
         options: {
@@ -158,8 +163,10 @@ const getWebpackConfig = (env: any): Configuration => {
 
         {
           oneOf: [
-            // App Javascript and Typescript (Babel)
-            // and some dependencies distributed in a non-es5 formats
+            /**
+             * App Javascript and Typescript (Babel)
+             * and some dependencies distributed in a non-es5 formats
+             */
             {
               test: /\.(js|ts)x?$/,
               include: ifCore(
@@ -219,20 +226,23 @@ const getWebpackConfig = (env: any): Configuration => {
               test: /\.(js|mjs)$/,
             },
 
-            // Styles (not modules)
+            // Styles (extracted)
             {
               test: /\.s?css$/,
-              exclude: /\.module\.s?css$/,
+              resourceQuery: {not: [/inline/]},
               use: getCssLoaders({
-                modules: false,
+                styleLoader: true,
               }),
             },
 
-            // Styles (modules)
+            // Styles (as string)
             {
-              test: /\.module\.s?css$/,
+              test: /\.s?css$/,
+              resourceQuery: /inline/,
               use: getCssLoaders({
-                modules: {localIdentName: '[local]__[hash:base64]'},
+                styleLoader: false,
+                exportType: 'string',
+                sourceMap: false,
               }),
             },
 
@@ -268,8 +278,10 @@ const getWebpackConfig = (env: any): Configuration => {
               },
             },
 
-            // All other files - fallback
-            // This must be the latest rule!
+            /**
+             * All other files - fallback
+             * This must be the latest rule!
+             */
             {
               exclude: [/^$/, /\.(js|jsx|ts|tsx|mjs)$/, /\.html$/, /\.json$/],
               type: 'asset/resource',