@raisenow/tamaro-cli 1.0.12 → 1.0.15

package/src/commands/serve.ts

@@ -1,7 +1,7 @@
 import {getPortPromise} from 'portfinder'
 import {getIfCoreFns, getPaths} from 'lib/resolve'
 import {logCommand, logTitle} from 'lib/logging'
-import {fail, runCommandSync} from 'lib/command'
+import {halt, runCommandSync} from 'lib/command'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -34,7 +34,7 @@ const assertOptionsValid = (options: ServeOptions) => {
   const {port} = options
 
   if (isNaN(Number(port))) {
-    fail('Flag "--port" should be a number.')
+    halt('Flag "--port" should be a number.')
   }
 }
 

package/src/lib/InterpolateHtmlPlugin.ts

@@ -24,7 +24,9 @@ export class InterpolateHtmlPlugin {
       const hooks = HtmlWebpackPlugin.getHooks(compilation)
 
       hooks.alterAssetTagGroups.tap(PLUGIN_NAME, (assets) => {
-        this.replacements['ENTRY'] = assets.headTags[0].attributes['src']
+        const publicUrl = this.replacements['PUBLIC_URL'] ?? ''
+        const entry = assets.headTags[0].attributes['src']
+        this.replacements['ENTRY'] = `${publicUrl}${entry}`
 
         return assets
       })

package/src/lib/aws.ts

@@ -1,6 +1,6 @@
 import {execaCommandSync} from 'execa'
 import stripIndent from 'strip-indent'
-import {fail} from 'lib/command'
+import {halt} from 'lib/command'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -74,7 +74,7 @@ export const assertProfileValid = (profile: string) => {
       https://raisenow.atlassian.net/wiki/x/lIrWvg
     `)
 
-    fail(message)
+    halt(message)
   }
 }
 
@@ -107,7 +107,7 @@ const login = (options: AwsOptions) => {
     execaCommandSync(`aws sso login ${flags}`, {stdio: 'inherit'})
     console.log('')
   } catch (error) {
-    fail('Login failed.')
+    halt('Login failed.')
   }
 }
 

package/src/lib/command.ts

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

package/src/lib/env.ts

@@ -1,8 +1,12 @@
 import {createRequire} from 'module'
+import {basename} from 'path'
+import glob from 'glob'
 import type {IfUtilsFn} from 'webpack-config-utils'
 import {expand as dotenvExpand} from 'dotenv-expand'
 import {config as dotenvConfig} from 'dotenv'
-import {getWidgetUuid, resolveApp} from 'lib/resolve'
+import stripIndent from 'strip-indent'
+import {getIfCoreFns, getPaths, getWidgetUuid, resolveApp} from 'lib/resolve'
+import {halt} from 'lib/command'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -17,11 +21,13 @@ const require = createRequire(import.meta.url)
 ///////////////////////////////////////////////////////////////////////////////
 
 export const getEnvVars = (
-  filePath: string,
+  files: string[],
   ifMin: IfUtilsFn,
   ifCore: IfUtilsFn,
   ifLocalCore: IfUtilsFn,
 ) => {
+  const filePath = files.find((file) => basename(file) === '.env')
+
   dotenvExpand(dotenvConfig({path: filePath}))
 
   process.env.NODE_ENV ??= ifMin('production', 'development')
@@ -32,6 +38,8 @@ export const getEnvVars = (
     'rnw-tamaro',
   )
   process.env.WEBPACK_UNIQUE_NAME ??= ifCore('RnwTamaroCore', 'RnwTamaro')
+  process.env.BUILD_DATE = new Date().toISOString()
+  process.env.PUBLIC_URL ??= ''
 
   // HMR doesn't work in ie11, it breaks everything.
   // If you want to run dev-server and test in ie11, set HMR_ENABLED to 'false'
@@ -68,6 +76,8 @@ export const getEnvVars = (
     'EXPOSE_VAR',
     'ELEMENT_ATTRIBUTE_DATA_WIDGET',
     'WEBPACK_UNIQUE_NAME',
+    'BUILD_DATE',
+    'PUBLIC_URL',
 
     // core
     'PRODUCT_NAME',
@@ -100,3 +110,38 @@ export const getEnvVars = (
 
   return {raw, stringified}
 }
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const assertEnvValid = (env: string) => {
+  const {ifCore} = getIfCoreFns()
+  const paths = getPaths(ifCore)
+  const files = glob.sync(paths.appEnv)
+  const envs = files
+    .map((file) => basename(file).replace(/^\.env\.?/, ''))
+    .filter((v) => !!v)
+
+  if (envs.length === 0) {
+    if (env) {
+      console.log('Flag “--env” is ignored.')
+    }
+  }
+
+  if (envs.length !== 0) {
+    if (!env) {
+      halt('Flag “--env” is required.')
+    }
+
+    if (!envs.includes(env)) {
+      halt(
+        stripIndent(`
+          Flag “--env” has wrong value.
+          Available values are: ${envs.map((v) => `“${v}”`).join(', ')}.
+        `),
+      )
+    }
+
+    const filePath = files.find((file) => basename(file) === `.env.${env}`)
+    dotenvExpand(dotenvConfig({path: filePath}))
+  }
+}

package/src/lib/resolve.ts

@@ -72,7 +72,7 @@ export const getPaths = (ifCore: IfUtilsFn) => {
       appNodeModules: resolveApp('node_modules'),
       appTsConfig: resolveApp('tsconfig.json'),
       appHtml: resolveApp('src/*.html'),
-      appEnv: resolveApp('.env'),
+      appEnv: resolveApp('.env*'),
       appTailwindConfig: resolveApp('tailwind.config.js'),
     },
     {
@@ -82,7 +82,7 @@ export const getPaths = (ifCore: IfUtilsFn) => {
       appNodeModules: resolveApp('../../node_modules'),
       appTsConfig: resolveApp('tsconfig.json'),
       appHtml: resolveApp('*.html'),
-      appEnv: resolveApp('.env'),
+      appEnv: resolveApp('.env*'),
       appTailwindConfig: undefined,
     },
   )

package/src/webpack.config.ts

@@ -44,7 +44,8 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
   const {ifCore} = getIfCoreFns()
   const paths = getPaths(ifCore)
   const appHtmlFiles = glob.sync(paths.appHtml)
-  const envVars = getEnvVars(paths.appEnv, ifMin, ifCore, ifLocalCore)
+  const appEnvFiles = glob.sync(paths.appEnv)
+  const envVars = getEnvVars(appEnvFiles, ifMin, ifCore, ifLocalCore)
   const {ifHmr} = getIfUtils({hmr: process.env.HMR_ENABLED === 'true'}, ['hmr'])
   const useTailwind =
     ifCore() && paths.appTailwindConfig && existsSync(paths.appTailwindConfig)
@@ -231,53 +232,9 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
               }),
             },
 
-            // SVG (in HTML and styles)
-            {
-              test: /\.svg$/,
-              issuer: [/\.html$/, /\.s?css$/],
-              type: 'asset',
-              parser: {
-                dataUrlCondition: {
-                  maxSize: imageInlineSizeLimit,
-                },
-              },
-            },
-
-            // SVG (in components)
-            {
-              test: /\.svg$/,
-              issuer: [/\.(ts|tsx|js|jsx|md|mdx)$/],
-              use: [
-                {
-                  loader: require.resolve('@svgr/webpack'),
-                  options: {
-                    svgoConfig: {
-                      plugins: [
-                        {
-                          removeHiddenElems: false,
-                          moveGroupAttrsToElems: false,
-                          collapseGroups: false,
-                        },
-                      ],
-                    },
-                    prettier: false,
-                    titleProp: true,
-                    ref: true,
-                  },
-                },
-                {
-                  loader: require.resolve('url-loader'),
-                  options: {
-                    name: 'assets/[name]-[contenthash:16].[ext]',
-                    limit: imageInlineSizeLimit,
-                  },
-                },
-              ],
-            },
-
             // Images and fonts
             {
-              test: /\.(png|jpe?g|webp|gif|ico|ttf|eot|woff2?)$/,
+              test: /\.(png|jpe?g|svg|webp|gif|ico|ttf|eot|woff2?)$/,
               type: 'asset',
               parser: {
                 dataUrlCondition: {
@@ -291,7 +248,10 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
               test: /\.ya?ml$/,
               use: [
                 {loader: require.resolve('json-loader')},
-                {loader: require.resolve('yaml-loader')},
+                {
+                  loader: require.resolve('yaml-loader'),
+                  options: {asJSON: true},
+                },
               ],
             },