create-catalyst-app-internal 0.0.1-beta.0 → 0.0.1-beta.10

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "create-catalyst-app-internal",
-    "bin": "scripts/cli.mjs",
-    "version": "0.0.1-beta.0",
+    "bin": "scripts/cli.cjs",
+    "version": "0.0.1-beta.10",
     "description": "cli package to scaffold Catalyst application",
     "main": "index.js",
     "scripts": {

package/scripts/cli.cjs

@@ -35,9 +35,6 @@ const program = new Commander.Command()
             const projectDescription = await promptDescription()
             const stateManagement = cmd.stateManagement || (await promptStateManagement())
 
-            const resolvedProjectPath = path.resolve(projectName.trim())
-            const projectPath = path.basename(resolvedProjectPath)
-            const root = path.resolve(projectPath)
 
             // Define mapping of options to repository suffixes
             const repositorySuffixes = {
@@ -56,30 +53,32 @@ const program = new Commander.Command()
             const subDirectoriesToExtract = [commonCodeDirectory, selectedTemplateCode]
             const extractionDestination = `/${projectName}/`
             let tempDir
-            ;(() => {
-                try {
-                    tempDir = createTempDir()
-
-                    const packageFilePath = packNpmPackage(packageName, packageVersion, tempDir)
-
-                    extractSubdirectory(packageFilePath)
-
-                    execSync(
-                        `cd ${projectName} && npm i  && npm pkg set name=${projectName} ${
-                            projectDescription ? `description=${projectDescription}` : ""
-                        } && git init --quiet`,
-                        { stdio: "inherit" }
-                    )
-
-                    console.log(cyan(`Installing Packages`))
-
-                    deleteDirectory(tempDir)
-                } catch (error) {
+                ; (() => {
+                    try {
+                        let projectPath = path.join(process.cwd(), projectName);
+
+                        if(fs.existsSync(projectPath)){
+                            console.log(`${projectName} already exists, try again.`)
+                            process.exit(1)
+                        }
+                        tempDir = createTempDir()
+
+                        const packageFilePath = packNpmPackage(packageName, packageVersion, tempDir)
+                        
+                        extractSubdirectory(packageFilePath)
+                        createGitignore(projectName)
+
+                        execSync(
+                            `cd ${projectName} && npm i && npm pkg set name=${projectName} ${projectDescription ? `description="${projectDescription}"` : ""} && git init --quiet`,
+                            { stdio: "inherit" }
+                        )
                     deleteDirectory(tempDir)
-                    console.error(`Error: ${error.message}`)
-                    process.exit(1)
-                }
-            })()
+                    } catch (error) {
+                        deleteDirectory(tempDir)
+                        console.error(`Error: ${error.message}`)
+                        process.exit(1)
+                    }
+                })()
 
             function packNpmPackage(packageName, packageVersion, tempDir) {
                 const tarballFileName = `${packageName}-${packageVersion}.tgz`
@@ -175,10 +174,10 @@ async function promptProjectName() {
     if (!res.path || projectName === "") {
         console.log(
             "\nPlease specify the project directory:\n" +
-                `  ${cyan(program.name())} ${green("<project-directory>")}\n` +
-                "For example:\n" +
-                `  ${cyan(program.name())} ${green("my-next-app")}\n\n` +
-                `Run ${cyan(`${program.name()} --help`)} to see all options.`
+            `  ${cyan(program.name())} ${green("<project-directory>")}\n` +
+            "For example:\n" +
+            `  ${cyan(program.name())} ${green("my-next-app")}\n\n` +
+            `Run ${cyan(`${program.name()} --help`)} to see all options.`
         )
         process.exit(1)
     }
@@ -221,3 +220,23 @@ function deleteDirectory(dirPath) {
         fs.rmdirSync(dirPath)
     }
 }
+
+// Function to create a .gitignore file with the hardcoded patterns
+function createGitignore(projectName) {
+
+    const gitiIgnorePatterns = [
+        'node_modules',
+        'build',
+        'logs'
+    ];
+
+    const gitignorePath = path.join(process.cwd(), projectName, '.gitignore');
+
+    if (fs.existsSync(gitignorePath)) {
+        console.log('.gitignore already exists. Please rename or remove it before running the script.');
+        return;
+    }
+
+    fs.writeFileSync(gitignorePath, gitiIgnorePatterns.join('\n'));
+}
+

package/templates/common/config/config.json

@@ -6,12 +6,28 @@
     "BUILD_OUTPUT_PATH": "build",
     "PUBLIC_STATIC_ASSET_PATH": "/assets/",
     "PUBLIC_STATIC_ASSET_URL": "http://localhost:3006",
-    "NODE_ENV": "production",
+    "NODE_ENV": "development",
     "BUILD_ENV": "localBuild",
     "API_URL": "",
-    "CLIENT_EXPOSED_KEYS": [],
     "ANALYZE_BUNDLE": false,
-    "ENABLE_DEBUG_LOGS": true,
-    "ENABLE_FILE_LOGGING": true,
-    "ENABLE_CONSOLE_LOGGING": true
+    "CLIENT_ENV_VARIABLES": [
+        "NODE_SERVER_HOSTNAME",
+        "NODE_SERVER_PORT",
+        "WEBPACK_DEV_SERVER_HOSTNAME",
+        "WEBPACK_DEV_SERVER_PORT",
+        "BUILD_OUTPUT_PATH",
+        "PUBLIC_STATIC_ASSET_PATH",
+        "PUBLIC_STATIC_ASSET_URL",
+        "NODE_ENV",
+        "BUILD_ENV",
+        "API_URL",
+        "ANALYZE_BUNDLE",
+        "ENABLE_DEBUG_LOGS",
+        "ENABLE_FILE_LOGGING",
+        "ENABLE_CONSOLE_LOGGING",
+        "ANALYZE_BUNDLE",
+        "ENABLE_DEBUG_LOGS",
+        "ENABLE_FILE_LOGGING",
+        "ENABLE_CONSOLE_LOGGING"
+    ]
 }

package/templates/common/server/document.js

@@ -3,9 +3,8 @@ import { Head, Body } from "catalyst-core-internal"
 
 function Document(props) {
     return (
-        <html lang={props.lang}>
+        <html lang="en">
             <Head {...props}>
-                <meta charset="final-order" />
             </Head>
             <Body {...props} />
         </html>

package/templates/common/server/server.js

@@ -1 +1 @@
-export function addMiddlewares(app) {}
+export function addMiddlewares() {}

package/templates/common/src/js/containers/Home/Home.js

@@ -1,7 +1,7 @@
 import React from "react"
 import css from "./Home.scss"
 
-function Landing() {
+function Home() {
     return (
         <div className={css.app}>
             <header className={css.appHeader}>
@@ -20,4 +20,4 @@ function Landing() {
     )
 }
 
-export default Landing
+export default Home

package/templates/common/src/js/routes/utils.js

@@ -14,7 +14,6 @@ export const preparedRoutes = ({ store, routerInitialState }) => {
             ),
             children: getRoutes()?.map((route, index) => {
                 const Component = route.component
-                // const pageType = route.staticPageType ? route.staticPageType : null
                 return {
                     ...route,
                     element: <Component key={index} />,

package/templates/none-js/client/index.js

@@ -12,11 +12,9 @@ window.addEventListener("load", () => {
         const router = clientRouter({ routerInitialState: routerInitialData })
 
         const Application = (
-            <Provider serverState={__INITIAL_STATE__}>
-                <React.StrictMode>
-                    <RouterProvider router={router} />
-                </React.StrictMode>
-            </Provider>
+            <React.StrictMode>
+                <RouterProvider router={router} />
+            </React.StrictMode>
         )
 
         const container = document.getElementById("app")

package/templates/none-js/package.json

@@ -12,12 +12,11 @@
         "@server": "server",
         "@config": "config",
         "@css": "src/static/css",
-        "@routes": "src/js/routes/",
-        "@store": "src/js/store/index.js"
+        "@routes": "src/js/routes/"
     },
     "dependencies": {
         "@loadable/component": "^5.16.3",
-        "@tata1mg/router": "^0.0.1-alpha.13",
-        "catalyst-core-internal": "0.0.1-beta.0"
+        "@tata1mg/router": "^0.0.1-beta.0",
+        "catalyst-core-internal": "^0.0.1-beta.4"
     }
 }

package/templates/none-js/src/js/containers/App/index.js

@@ -1,13 +1,15 @@
-import React, { useState } from "react"
-import { useOutlet } from "@tata1mg/router"
-const App = () => {
-    const o = useOutlet()
-    const [outlet] = useState(o)
+import React from "react"
+import { Outlet } from "@tata1mg/router"
 
-    return <>{outlet}</>
+const App = () => {
+    return (
+        <>
+            <Outlet />
+        </>
+    )
 }
 
-App.serverSideFunction = ({}) => {
+App.serverSideFunction = () => {
     return new Promise((resolve) => resolve())
 }
 

package/templates/redux-js/package.json

@@ -17,8 +17,8 @@
     },
     "dependencies": {
         "@loadable/component": "^5.16.3",
-        "@tata1mg/router": "^0.0.1-alpha.13",
-        "catalyst-core-internal": "0.0.1-beta.0",
+        "@tata1mg/router": "^0.0.1-beta.0",
+        "catalyst-core-internal": "^0.0.1-beta.4",
         "@reduxjs/toolkit": "1.9.3",
         "react-redux": "^8.1.3"
     }

package/templates/redux-js/src/js/containers/App/index.js

@@ -1,10 +1,12 @@
-import React, { useState } from "react"
-import { useOutlet } from "@tata1mg/router"
-const App = () => {
-    const o = useOutlet()
-    const [outlet] = useState(o)
+import React from "react"
+import { Outlet } from "@tata1mg/router"
 
-    return <>{outlet}</>
+const App = () => {
+    return (
+        <>
+            <Outlet />
+        </>
+    )
 }
 
 App.serverSideFunction = () => {

package/templates/redux-js/src/js/containers/App/reducer.js

@@ -4,7 +4,7 @@ export const defaultState = {
     testActionDispatched: false,
 }
 
-const shellReducer = (state = defaultState, action) => {
+export const shellReducer = (state = defaultState, action) => {
     switch (action.type) {
         case ShellActions.REDUX_TEST: {
             return {
@@ -18,4 +18,3 @@ const shellReducer = (state = defaultState, action) => {
     }
 }
 
-export default shellReducer

package/templates/redux-js/src/js/store/index.js

@@ -6,11 +6,11 @@ import fetchInstance from "@api"
 /**
  * Function that initializes the store with the initialstate and adds middlewares that can be used during action dispatch
  * @param    {object} initialState    Default state
- * @param    {object} request   Request object that we recieve on server, this is only recieved when store is initialised on the server.
+ * @param    {object} request   Request object that we recieve on server, this is only recieved when store is initialized on the server.
  * @return   {object} The store itself
  */
 
-const configureStore = (initialState, request) => {
+const configureStore = (initialState) => {
     const api = fetchInstance
     const store = createStore({
         reducer: combineReducers({ shellReducer }),

package/templates/rtk-js/package.json

@@ -17,8 +17,8 @@
     },
     "dependencies": {
         "@loadable/component": "^5.16.3",
-        "@tata1mg/router": "^0.0.1-alpha.13",
-        "catalyst-core-internal": "0.0.1-beta.0",
+        "@tata1mg/router": "^0.0.1-beta.0",
+        "catalyst-core-internal": "^0.0.1-beta.4",
         "@reduxjs/toolkit": "1.9.3",
         "react-redux": "^8.1.3"
     }

package/templates/rtk-js/src/js/containers/App/index.js

@@ -1,10 +1,12 @@
-import React, { useState } from "react"
-import { useOutlet } from "@tata1mg/router"
-const App = () => {
-    const o = useOutlet()
-    const [outlet] = useState(o)
+import React from "react"
+import { Outlet } from "@tata1mg/router"
 
-    return <>{outlet}</>
+const App = () => {
+    return (
+        <>
+            <Outlet />
+        </>
+    )
 }
 
 App.serverSideFunction = () => {

package/templates/rtk-js/src/js/containers/App/reducer.js

@@ -8,7 +8,7 @@ export const appSlice = createSlice({
     name: "shellReducer",
     initialState: initialState,
     reducers: {
-        reduxTest: (state, action) => {
+        reduxTest: (state) => {
             state.testActionDispatched = true
         },
     },

package/templates/rtk-js/src/js/store/index.js

@@ -6,11 +6,11 @@ import fetchInstance from "@api"
 /**
  * Function that initializes the store with the initialstate and adds middlewares that can be used during action dispatch
  * @param    {object} initialState    Default state
- * @param    {object} request   Request object that we recieve on server, this is only recieved when store is initialised on the server.
+ * @param    {object} request   Request object that we recieve on server, this is only recieved when store is initialized on the server.
  * @return   {object} The store itself
  */
 
-const configureStore = (initialState, request) => {
+const configureStore = (initialState) => {
     const api = fetchInstance
     const store = createStore({
         reducer: combineReducers({ shellReducer }),

package/templates/common/.eslintrc

@@ -1,53 +0,0 @@
-{
-    "parser": "@babel/eslint-parser",
-    "rules": {
-        "prettier/prettier": "error",
-        "no-console": "warn",
-        "react/prop-types": 1,
-        "react/display-name": [0, { "ignoreTranspilerName": true }],
-        "react-hooks/exhaustive-deps": "warn", // Checks effect dependencies
-        "no-prototype-builtins": "off",
-        "jam3/no-sanitizer-with-danger": 2,
-        "react/jsx-no-target-blank": [0, {
-            "enforceDynamicLinks": "never"
-        }]
-    },
-    "env": {
-        "browser": true,
-        "es6": true,
-        "jest": true,
-        "node": true
-    },
-    "globals": {
-        "expect": true,
-        "__non_webpack_require__": true,
-        "logger": "readonly",
-        "AppCallbacks": "readonly"
-    },
-    "extends": ["eslint:recommended", "plugin:react/recommended"],
-    "parserOptions": {
-        "sourceType": "module",
-        "ecmaFeatures": {
-            "experimentalObjectRestSpread": true,
-            "jsx": true
-        },
-        "babelOptions": {
-            "configFile": "./babel.config.js"
-        },
-        "ecmaVersion": 6
-    },
-    "plugins": ["babel", "react", "react-hooks", "prettier", "jam3"],
-    "settings": {
-        "react": {
-            "createClass": "createReactClass",
-            "pragma": "React",
-            "version": "detect"
-        },
-        "propWrapperFunctions": [
-            "forbidExtraProps",
-            { "property": "freeze", "object": "Object" },
-            { "property": "myFavoriteWrapper" }
-        ],
-        "linkComponents": ["Hyperlink", { "name": "Link", "linkAttribute": "to" }]
-    }
-}

package/templates/common/.prettierrc.json

@@ -1,7 +0,0 @@
-{
-    "trailingComma": "es5",
-    "tabWidth": 4,
-    "semi": false,
-    "arrowParens": "always",
-    "printWidth": 110
-}