nsgm-cli 1.0.24 → 1.0.26

package/generation/client/layout/index.tsx

@@ -1,223 +1,223 @@
-import React, { useEffect, useState } from 'react'
-import { Layout, Menu, Breadcrumb, Image } from 'antd'
-import { Container } from '../styled/layout'
-import { useRouter } from 'next/router'
-import _ from 'lodash'
-import menuConfig from '../utils/menu'
-
-const { SubMenu } = Menu
-const { Header, Content, Sider } = Layout
-
-const getLocationKey = () => {
-  const result = {
-    topMenu: '1',
-    slideMenu: '0'
-  }
-
-  if (typeof window !== 'undefined') {
-    const locationHref = window.location.href
-
-    let locationHrefArr = locationHref.split('?')
-    if (locationHrefArr.length > 0) {
-      locationHrefArr = locationHrefArr[0].split('//')
-
-      if (locationHrefArr.length > 1) {
-        let locationStr = locationHrefArr[1]
-        const locationIndex = locationStr.indexOf('/')
-        locationStr = locationStr.substring(locationIndex)
-
-        console.log('locationStr', locationStr)
-
-        _.each(menuConfig, (item:any, index:any) => {
-          const { key, url, subMenus } = item
-
-          if (subMenus) {
-            _.each(subMenus, (subItem:any, subIndex:any) => {
-              const { key: subKey, url: subUrl } = subItem
-
-              if (locationStr === subUrl.split('?')[0]) {
-                const subKeyArr = subKey.split('_')
-                const subKeyArrLen = subKeyArr.length
-
-                if (subKeyArrLen > 0) result.topMenu = subKeyArr[0]
-                if (subKeyArrLen > 1) result.slideMenu = subKeyArr[1]
-
-                return false
-              }
-            })
-          } else {
-            if (locationStr === url.split('?')[0]) {
-              result.topMenu = key
-              return false
-            }
-          }
-        })
-      }
-    }
-  }
-  console.log('result', result)
-  return result
-}
-
-const routerPush = (router: any, url: string) => { 
-  console.log('routerPush', url)
-
-  if (router && url) { 
-    router.push(url)
-  }
-}
-
-const LayoutComponent = ({ children }) => {
-  const router = useRouter()
-  const [topMenuKey, setTopMenuKey] = useState('1')
-  const [sliderMenuKey, setSliderMenuKey] = useState('1')
-
-  console.log('topMenuKey: ' + topMenuKey, ', sliderMenuKey: ' + sliderMenuKey)
-
-  useEffect(() => {
-    const { topMenu, slideMenu } = getLocationKey()
-    setTopMenuKey(topMenu)
-    setSliderMenuKey(slideMenu)
-  }, [])
-
-  return (
-    <Layout>
-      <Container>
-        <Header className="header">
-          <div className="logo">
-            <Image width={100} src="../images/zhizuotu_1.png" preview={false} />
-          </div>
-          <Menu theme="dark" mode="horizontal" defaultSelectedKeys={['1']} selectedKeys={[topMenuKey]}>
-            {_.map(menuConfig, (item:any, index:any) => {
-              const { key, text, url, subMenus } = item
-              if (key) {
-                return (
-                  <Menu.Item
-                    key={key}
-                    onClick={() => {
-                      routerPush(router, url)
-                      setTopMenuKey(key)
-
-                      if (subMenus) {
-                        setSliderMenuKey('1')
-                      } else {
-                        setSliderMenuKey('0')
-                      }
-                    }}
-                  >
-                    {text}
-                  </Menu.Item>
-                )
-              }
-            })}
-          </Menu>
-        </Header>
-        <Layout>
-          <Sider width={200} className="site-layout-background">
-            <Menu
-              mode="inline"
-              defaultSelectedKeys={['slider_1_0']}
-              defaultOpenKeys={['slider_1']}
-              selectedKeys={['slider_' + topMenuKey + '_' + sliderMenuKey]}
-              openKeys={['slider_' + topMenuKey]}
-              style={{ height: '100%', borderRight: 0 }}
-            >
-              {_.map(menuConfig, (item:any, index:any) => {
-                const { key, text, url, icon, subMenus } = item
-
-                if (subMenus) {
-                  return (
-                    <SubMenu
-                      key={'slider_' + key}
-                      icon={icon}
-                      title={text}
-                      onTitleClick={() => {
-                        setTopMenuKey(key)
-                        setSliderMenuKey('1')
-                      }}
-                    >
-                      {_.map(subMenus, (subItem:any, subIndex:any) => {
-                        const { key: subKey, text: subText, url: subUrl } = subItem
-                        return (
-                          <Menu.Item
-                            key={'slider_' + subKey}
-                            onClick={() => {
-                              routerPush(router, subUrl)
-
-                              const subKeyArr = subKey.split('_')
-                              const subKeyArrLen = subKeyArr.length
-
-                              console.log(subKeyArr, subKeyArrLen)
-
-                              if (subKeyArrLen >= 1) setTopMenuKey(subKeyArr[0])
-
-                              if (subKeyArrLen >= 2) setSliderMenuKey(subKeyArr[1])
-                            }}
-                          >
-                            {subText}
-                          </Menu.Item>
-                        )
-                      })}
-                    </SubMenu>
-                  )
-                } else {
-                  if (key) {
-                    return (
-                      <Menu.Item
-                        key={'slider_' + key + '_0'}
-                        icon={icon}
-                        onClick={() => {
-                          routerPush(router, url)
-                          setTopMenuKey(key)
-                          setSliderMenuKey('0')
-                        }}
-                      >
-                        {text}
-                      </Menu.Item>
-                    )
-                  }
-                }
-              })}
-            </Menu>
-          </Sider>
-          <Layout style={{ padding: '0 24px 24px' }}>
-            <Breadcrumb style={{ margin: '16px 0' }}>
-              {_.map(menuConfig, (item:any, index:any) => {
-                const { key, text, subMenus } = item
-
-                if (key && key === topMenuKey) {
-                  if (subMenus) {
-                    const subContent = []
-                    _.each(subMenus, (subItem:any, subIndex:any) => {
-                      const { key: subKey, text: subText } = subItem
-                      if (subKey === key + '_' + sliderMenuKey) {
-                        subContent.push(<Breadcrumb.Item key={'breadcrumb' + subIndex}>{text}</Breadcrumb.Item>)
-                        subContent.push(<Breadcrumb.Item key={'breadcrumb' + subIndex}>{subText}</Breadcrumb.Item>)
-                        return false
-                      }
-                    })
-                    return subContent
-                  } else {
-                    return <Breadcrumb.Item key={'breadcrumb' + index}>{text}</Breadcrumb.Item>
-                  }
-                }
-              })}
-            </Breadcrumb>
-            <Content
-              className="site-layout-background"
-              style={{
-                padding: 24,
-                margin: 0,
-                minHeight: 280
-              }}
-            >
-              {children}
-            </Content>
-          </Layout>
-        </Layout>
-      </Container>
-    </Layout>
-  )
-}
-
-export default LayoutComponent
+import React, { useEffect, useState } from 'react'
+import { Layout, Menu, Breadcrumb, Image } from 'antd'
+import { Container } from '../styled/layout'
+import { useRouter } from 'next/router'
+import _ from 'lodash'
+import menuConfig from '../utils/menu'
+
+const { SubMenu } = Menu
+const { Header, Content, Sider } = Layout
+
+const getLocationKey = () => {
+  const result = {
+    topMenu: '1',
+    slideMenu: '0'
+  }
+
+  if (typeof window !== 'undefined') {
+    const locationHref = window.location.href
+
+    let locationHrefArr = locationHref.split('?')
+    if (locationHrefArr.length > 0) {
+      locationHrefArr = locationHrefArr[0].split('//')
+
+      if (locationHrefArr.length > 1) {
+        let locationStr = locationHrefArr[1]
+        const locationIndex = locationStr.indexOf('/')
+        locationStr = locationStr.substring(locationIndex)
+
+        console.log('locationStr', locationStr)
+
+        _.each(menuConfig, (item:any, index:any) => {
+          const { key, url, subMenus } = item
+
+          if (subMenus) {
+            _.each(subMenus, (subItem:any, subIndex:any) => {
+              const { key: subKey, url: subUrl } = subItem
+
+              if (locationStr === subUrl.split('?')[0]) {
+                const subKeyArr = subKey.split('_')
+                const subKeyArrLen = subKeyArr.length
+
+                if (subKeyArrLen > 0) result.topMenu = subKeyArr[0]
+                if (subKeyArrLen > 1) result.slideMenu = subKeyArr[1]
+
+                return false
+              }
+            })
+          } else {
+            if (locationStr === url.split('?')[0]) {
+              result.topMenu = key
+              return false
+            }
+          }
+        })
+      }
+    }
+  }
+  console.log('result', result)
+  return result
+}
+
+const routerPush = (router: any, url: string) => { 
+  console.log('routerPush', url)
+
+  if (router && url) { 
+    router.push(url)
+  }
+}
+
+const LayoutComponent = ({ children }) => {
+  const router = useRouter()
+  const [topMenuKey, setTopMenuKey] = useState('1')
+  const [sliderMenuKey, setSliderMenuKey] = useState('1')
+
+  console.log('topMenuKey: ' + topMenuKey, ', sliderMenuKey: ' + sliderMenuKey)
+
+  useEffect(() => {
+    const { topMenu, slideMenu } = getLocationKey()
+    setTopMenuKey(topMenu)
+    setSliderMenuKey(slideMenu)
+  }, [])
+
+  return (
+    <Layout>
+      <Container>
+        <Header className="header">
+          <div className="logo">
+            <Image width={100} src="../images/zhizuotu_1.png" preview={false} />
+          </div>
+          <Menu theme="dark" mode="horizontal" defaultSelectedKeys={['1']} selectedKeys={[topMenuKey]}>
+            {_.map(menuConfig, (item:any, index:any) => {
+              const { key, text, url, subMenus } = item
+              if (key) {
+                return (
+                  <Menu.Item
+                    key={key}
+                    onClick={() => {
+                      routerPush(router, url)
+                      setTopMenuKey(key)
+
+                      if (subMenus) {
+                        setSliderMenuKey('1')
+                      } else {
+                        setSliderMenuKey('0')
+                      }
+                    }}
+                  >
+                    {text}
+                  </Menu.Item>
+                )
+              }
+            })}
+          </Menu>
+        </Header>
+        <Layout>
+          <Sider width={200} className="site-layout-background">
+            <Menu
+              mode="inline"
+              defaultSelectedKeys={['slider_1_0']}
+              defaultOpenKeys={['slider_1']}
+              selectedKeys={['slider_' + topMenuKey + '_' + sliderMenuKey]}
+              openKeys={['slider_' + topMenuKey]}
+              style={{ height: '100%', borderRight: 0 }}
+            >
+              {_.map(menuConfig, (item:any, index:any) => {
+                const { key, text, url, icon, subMenus } = item
+
+                if (subMenus) {
+                  return (
+                    <SubMenu
+                      key={'slider_' + key}
+                      icon={icon}
+                      title={text}
+                      onTitleClick={() => {
+                        setTopMenuKey(key)
+                        setSliderMenuKey('1')
+                      }}
+                    >
+                      {_.map(subMenus, (subItem:any, subIndex:any) => {
+                        const { key: subKey, text: subText, url: subUrl } = subItem
+                        return (
+                          <Menu.Item
+                            key={'slider_' + subKey}
+                            onClick={() => {
+                              routerPush(router, subUrl)
+
+                              const subKeyArr = subKey.split('_')
+                              const subKeyArrLen = subKeyArr.length
+
+                              console.log(subKeyArr, subKeyArrLen)
+
+                              if (subKeyArrLen >= 1) setTopMenuKey(subKeyArr[0])
+
+                              if (subKeyArrLen >= 2) setSliderMenuKey(subKeyArr[1])
+                            }}
+                          >
+                            {subText}
+                          </Menu.Item>
+                        )
+                      })}
+                    </SubMenu>
+                  )
+                } else {
+                  if (key) {
+                    return (
+                      <Menu.Item
+                        key={'slider_' + key + '_0'}
+                        icon={icon}
+                        onClick={() => {
+                          routerPush(router, url)
+                          setTopMenuKey(key)
+                          setSliderMenuKey('0')
+                        }}
+                      >
+                        {text}
+                      </Menu.Item>
+                    )
+                  }
+                }
+              })}
+            </Menu>
+          </Sider>
+          <Layout style={{ padding: '0 24px 24px' }}>
+            <Breadcrumb style={{ margin: '16px 0' }}>
+              {_.map(menuConfig, (item:any, index:any) => {
+                const { key, text, subMenus } = item
+
+                if (key && key === topMenuKey) {
+                  if (subMenus) {
+                    const subContent = []
+                    _.each(subMenus, (subItem:any, subIndex:any) => {
+                      const { key: subKey, text: subText } = subItem
+                      if (subKey === key + '_' + sliderMenuKey) {
+                        subContent.push(<Breadcrumb.Item key={'breadcrumb' + subIndex}>{text}</Breadcrumb.Item>)
+                        subContent.push(<Breadcrumb.Item key={'breadcrumb' + subIndex}>{subText}</Breadcrumb.Item>)
+                        return false
+                      }
+                    })
+                    return subContent
+                  } else {
+                    return <Breadcrumb.Item key={'breadcrumb' + index}>{text}</Breadcrumb.Item>
+                  }
+                }
+              })}
+            </Breadcrumb>
+            <Content
+              className="site-layout-background"
+              style={{
+                padding: 24,
+                margin: 0,
+                minHeight: 280
+              }}
+            >
+              {children}
+            </Content>
+          </Layout>
+        </Layout>
+      </Container>
+    </Layout>
+  )
+}
+
+export default LayoutComponent

package/generation/client/redux/reducers.ts

@@ -1,5 +1,5 @@
-// import { templateManageReducer } from './template/manage/reducers'
-
-export default {
-  // templateManage: templateManageReducer,
-}
+// import { templateManageReducer } from './template/manage/reducers'
+
+export default {
+  // templateManage: templateManageReducer,
+}

package/generation/client/redux/store.ts

@@ -1,44 +1,44 @@
-import { useMemo } from 'react'
-import { createStore, applyMiddleware, combineReducers } from 'redux'
-import { composeWithDevTools } from 'redux-devtools-extension'
-import thunkMiddleware from 'redux-thunk'
-import reducers from './reducers'
-import _ from 'lodash'
-
-let store:any
-
-const reducersKeysLen = _.keys(reducers).length
-const combineReducer = combineReducers((reducersKeysLen === 0) ? {} : { ...reducers })
-
-export type RootState = ReturnType<typeof combineReducer>
-
-function initStore(initialState:any) {
-  return createStore(
-    combineReducer,
-    initialState,
-    composeWithDevTools(applyMiddleware(thunkMiddleware))
-  )
-}
-
-export const initializeStore = (preloadedState:any) => {
-  let _store = store ?? initStore(preloadedState)
-
-  if (preloadedState && store) {
-    _store = initStore({
-      ...store.getState(),
-      ...preloadedState
-    })
-    store = undefined
-  }
-
-  if (typeof window === 'undefined') return _store
-
-  if (!store) store = _store
-
-  return _store
-}
-
-export function useStore(initialState:any) {
-  const memoStore = useMemo(() => initializeStore(initialState), [initialState])
-  return memoStore
-}
+import { useMemo } from 'react'
+import { createStore, applyMiddleware, combineReducers } from 'redux'
+import { composeWithDevTools } from 'redux-devtools-extension'
+import thunkMiddleware from 'redux-thunk'
+import reducers from './reducers'
+import _ from 'lodash'
+
+let store:any
+
+const reducersKeysLen = _.keys(reducers).length
+const combineReducer = combineReducers((reducersKeysLen === 0) ? {} : { ...reducers })
+
+export type RootState = ReturnType<typeof combineReducer>
+
+function initStore(initialState:any) {
+  return createStore(
+    combineReducer,
+    initialState,
+    composeWithDevTools(applyMiddleware(thunkMiddleware))
+  )
+}
+
+export const initializeStore = (preloadedState:any) => {
+  let _store = store ?? initStore(preloadedState)
+
+  if (preloadedState && store) {
+    _store = initStore({
+      ...store.getState(),
+      ...preloadedState
+    })
+    store = undefined
+  }
+
+  if (typeof window === 'undefined') return _store
+
+  if (!store) store = _store
+
+  return _store
+}
+
+export function useStore(initialState:any) {
+  const memoStore = useMemo(() => initializeStore(initialState), [initialState])
+  return memoStore
+}

package/generation/client/styled/common.ts

@@ -1,28 +1,28 @@
-import styled, { createGlobalStyle } from 'styled-components'
-
-export const GlobalStyle = createGlobalStyle`
-  html,body,#__next {
-    height: 100%;
-    border: 1px solid white;
-  }
-
-  body {
-    background-color: ${(props: any) => (props.whiteColor ? 'white' : 'black')};
-    font-family: Helvetica;
-    margin: 0;
-  }
-`
-
-export const Container = styled.div`
-  margin: 20px;
-`
-
-export const Loading = styled.div`
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  margin-top: 100px;
-`
-
+import styled, { createGlobalStyle } from 'styled-components'
+
+export const GlobalStyle = createGlobalStyle`
+  html,body,#__next {
+    height: 100%;
+    border: 1px solid white;
+  }
+
+  body {
+    background-color: ${(props: any) => (props.whiteColor ? 'white' : 'black')};
+    font-family: Helvetica;
+    margin: 0;
+  }
+`
+
+export const Container = styled.div`
+  margin: 20px;
+`
+
+export const Loading = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-top: 100px;
+`
+

package/generation/client/utils/common.ts

@@ -1,45 +1,45 @@
-import getConfig from 'next/config'
-import _ from 'lodash'
-
-export const getLocalApiPrefix = () => {
-  const nextConfig = getConfig()
-  const { publicRuntimeConfig } = nextConfig
-  let { protocol, host, port } = publicRuntimeConfig
-
-  if (typeof window !== 'undefined') { 
-    const location = window.location
-    // console.log('location', location)
-    protocol = location.protocol
-    if (protocol.indexOf(':') !== -1) { 
-      protocol = protocol.split(':')[0]
-    }
-    host = location.hostname
-    port = location.port
-  }
-
-  const localApiPrefix = protocol + '://' + host + ':' + port
-  // console.log('localApiPrefix', localApiPrefix)
-  return localApiPrefix
-}
-
-export const handleXSS = (content: string) => {
-  content = content || ''
-  return content.replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\"/g, '&quot;').replace(/\'/g, '&#x27;')
-}
-
-export const checkModalObj = (modalObj: {}, ignoreKeys: any = []) => {
-  let result: any = null
-  _.each(modalObj, (value: any, key: string) => {
-    // console.log('checkModalObj', ignoreKeys, key, ignoreKeys.join('.').indexOf(key))
-    if (ignoreKeys.length === 0 || (ignoreKeys.length !== 0 && ignoreKeys.join('.').indexOf(key) === -1)) {
-      if (_.trim(value) === '') {
-        result = {
-          key,
-          reason: '不能为空'
-        }
-        return false
-      }
-    }
-  })
-  return result
-}
+import getConfig from 'next/config'
+import _ from 'lodash'
+
+export const getLocalApiPrefix = () => {
+  const nextConfig = getConfig()
+  const { publicRuntimeConfig } = nextConfig
+  let { protocol, host, port } = publicRuntimeConfig
+
+  if (typeof window !== 'undefined') { 
+    const location = window.location
+    // console.log('location', location)
+    protocol = location.protocol
+    if (protocol.indexOf(':') !== -1) { 
+      protocol = protocol.split(':')[0]
+    }
+    host = location.hostname
+    port = location.port
+  }
+
+  const localApiPrefix = protocol + '://' + host + ':' + port
+  // console.log('localApiPrefix', localApiPrefix)
+  return localApiPrefix
+}
+
+export const handleXSS = (content: string) => {
+  content = content || ''
+  return content.replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\"/g, '&quot;').replace(/\'/g, '&#x27;')
+}
+
+export const checkModalObj = (modalObj: {}, ignoreKeys: any = []) => {
+  let result: any = null
+  _.each(modalObj, (value: any, key: string) => {
+    // console.log('checkModalObj', ignoreKeys, key, ignoreKeys.join('.').indexOf(key))
+    if (ignoreKeys.length === 0 || (ignoreKeys.length !== 0 && ignoreKeys.join('.').indexOf(key) === -1)) {
+      if (_.trim(value) === '') {
+        result = {
+          key,
+          reason: '不能为空'
+        }
+        return false
+      }
+    }
+  })
+  return result
+}

package/generation/client/utils/fetch.ts

@@ -1,25 +1,25 @@
-import axios from 'axios'
-import { getLocalApiPrefix } from './common'
-
-export const getLocalGraphql = (query: string, variables: any = {}) => {
-  return new Promise((resolve, reject) => {
-    axios
-      .post(getLocalApiPrefix() + '/graphql', {
-        query,
-        variables
-      })
-      .then((res) => {
-        // console.log('axios_res', res)
-        if (res) {
-          const { data } = res
-          resolve(data)
-        } else {
-          reject()
-        }
-      })
-      .catch((_e) => {
-        // console.error('axios_e', _e)
-        reject(_e)
-      })
-  })
-}
+import axios from 'axios'
+import { getLocalApiPrefix } from './common'
+
+export const getLocalGraphql = (query: string, variables: any = {}) => {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(getLocalApiPrefix() + '/graphql', {
+        query,
+        variables
+      })
+      .then((res) => {
+        // console.log('axios_res', res)
+        if (res) {
+          const { data } = res
+          resolve(data)
+        } else {
+          reject()
+        }
+      })
+      .catch((_e) => {
+        // console.error('axios_e', _e)
+        reject(_e)
+      })
+  })
+}

package/generation/client/utils/menu.tsx

@@ -1,26 +1,26 @@
-import { BookOutlined, SolutionOutlined } from '@ant-design/icons'
-
-let key = 0
-
-export default [
-  {
-    key: (++key).toString(),
-    text: '介绍',
-    url: '/',
-    icon: <BookOutlined />,
-    subMenus: null
-  }
-  /*{
-    key: (++key).toString(),
-    text: '模板',
-    url: '/template/manage',
-    icon: <SolutionOutlined />,
-    subMenus: [
-      {
-        key: key + '_1',
-        text: '模板1',
-        url: '/template/manage'
-      }
-    ]
-  },*/
-]
+import { BookOutlined, SolutionOutlined } from '@ant-design/icons'
+
+let key = 0
+
+export default [
+  {
+    key: (++key).toString(),
+    text: '介绍',
+    url: '/',
+    icon: <BookOutlined />,
+    subMenus: null
+  }
+  /*{
+    key: (++key).toString(),
+    text: '模板',
+    url: '/template/manage',
+    icon: <SolutionOutlined />,
+    subMenus: [
+      {
+        key: key + '_1',
+        text: '模板1',
+        url: '/template/manage'
+      }
+    ]
+  },*/
+]

package/generation/package.json

@@ -1,20 +1,20 @@
-{
-  "name": "nsgm-cli-project",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "dev": "nsgm dev",
-    "build": "next build",
-    "start": "nsgm start",
-    "export": "nsgm export",
-    "init": "nsgm init",
-    "upgrade": "nsgm upgrade",
-    "create": "nsgm create",
-    "delete": "nsgm delete",
-    "postversion": "git push && git push --tags",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC"
-}
+{
+  "name": "nsgm-cli-project",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "dev": "nsgm dev",
+    "build": "next build",
+    "start": "nsgm start",
+    "export": "nsgm export",
+    "init": "nsgm init",
+    "upgrade": "nsgm upgrade",
+    "create": "nsgm create",
+    "delete": "nsgm delete",
+    "postversion": "git push && git push --tags",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}

package/generation/pages/_document.tsx

@@ -1,53 +1,53 @@
-import Document, {
-  Html,
-  Head,
-  Main,
-  NextScript,
-  DocumentContext
-} from 'next/document'
-import { ServerStyleSheet } from 'styled-components'
-
-const MyDocument = () => {
-  return (
-    <Html>
-      <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,minimal-ui"/>
-      <meta name="apple-mobile-web-app-capable" content="yes" />
-      <meta charSet="utf-8"/>
-      <Head/>
-      <body>
-        <Main />
-        <NextScript />
-      </body>
-    </Html>
-  )
-}
-
-MyDocument.renderDocument = Document.renderDocument
-
-MyDocument.getInitialProps = async (ctx: DocumentContext) => {
-  const sheet = new ServerStyleSheet()
-  const originalRenderPage = ctx.renderPage
-
-  try {
-    ctx.renderPage = () =>
-      originalRenderPage({
-        enhanceApp: (App) => (props) => sheet.collectStyles(<App {...props} />)
-      })
-
-    const initialProps = await Document.getInitialProps(ctx)
-
-    return {
-      ...initialProps,
-      styles: (
-        <>
-          {initialProps.styles}
-          {sheet.getStyleElement()}
-        </>
-      )
-    }
-  } finally {
-    sheet.seal()
-  }
-}
-
-export default MyDocument
+import Document, {
+  Html,
+  Head,
+  Main,
+  NextScript,
+  DocumentContext
+} from 'next/document'
+import { ServerStyleSheet } from 'styled-components'
+
+const MyDocument = () => {
+  return (
+    <Html>
+      <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,minimal-ui"/>
+      <meta name="apple-mobile-web-app-capable" content="yes" />
+      <meta charSet="utf-8"/>
+      <Head/>
+      <body>
+        <Main />
+        <NextScript />
+      </body>
+    </Html>
+  )
+}
+
+MyDocument.renderDocument = Document.renderDocument
+
+MyDocument.getInitialProps = async (ctx: DocumentContext) => {
+  const sheet = new ServerStyleSheet()
+  const originalRenderPage = ctx.renderPage
+
+  try {
+    ctx.renderPage = () =>
+      originalRenderPage({
+        enhanceApp: (App) => (props) => sheet.collectStyles(<App {...props} />)
+      })
+
+    const initialProps = await Document.getInitialProps(ctx)
+
+    return {
+      ...initialProps,
+      styles: (
+        <>
+          {initialProps.styles}
+          {sheet.getStyleElement()}
+        </>
+      )
+    }
+  } finally {
+    sheet.seal()
+  }
+}
+
+export default MyDocument

package/generation/tsconfig.json

@@ -1,29 +1,29 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": false,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true,
-    "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "jsx": "preserve"
-  },
-  "include": [
-    "next-env.d.ts",
-    "**/*.ts",
-    "**/*.tsx"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": false,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve"
+  },
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
 }

package/lib/generate.js

@@ -75,7 +75,7 @@ var copyFileSync = function (source, dest, upgradeFlag) {
 var handleReplace = function (_a) {
     var regex = _a.regex, replacement = _a.replacement, paths = _a.paths;
     if (replaceFlag) {
-        replace_1.default({
+        (0, replace_1.default)({
             regex: regex,
             replacement: replacement,
             paths: paths,
@@ -91,7 +91,7 @@ var replaceInFileAll = function (array, index, callback) {
         var arrayLen = array.length;
         if (index < arrayLen) {
             var item = array[index];
-            replace_in_file_1.replaceInFile(item, function (error, changedFiles) {
+            (0, replace_in_file_1.replaceInFile)(item, function (error, changedFiles) {
                 if (error) {
                     console.error('Error occurred:', error);
                 }

package/lib/index.js

@@ -20,7 +20,7 @@ var generate_1 = require("./generate");
 var lodash_1 = __importDefault(require("lodash"));
 var resolve = path_1.default.resolve;
 var curFolder = process.cwd();
-var processArgvs = args_1.getProcessArgvs(2);
+var processArgvs = (0, args_1.getProcessArgvs)(2);
 console.log('processArgvs', processArgvs);
 var command = processArgvs.command, dictionary = processArgvs.dictionary, controller = processArgvs.controller, action = processArgvs.action;
 var handleServer = function (server) {
@@ -46,7 +46,7 @@ var handleServer = function (server) {
 };
 var startExpress = function (options, callback) {
     // console.info('startExpress', curFolder)
-    var app = next_1.default(options);
+    var app = (0, next_1.default)(options);
     var handle = app.getRequestHandler();
     app
         .prepare()
@@ -55,21 +55,21 @@ var startExpress = function (options, callback) {
             callback();
             return;
         }
-        var server = express_1.default();
+        var server = (0, express_1.default)();
         server.use(body_parser_1.default.urlencoded({
             extended: false
         }));
         server.use(body_parser_1.default.json());
-        server.use(express_fileupload_1.default());
+        server.use((0, express_fileupload_1.default)());
         server.use('/static', express_1.default.static(path_1.default.join(__dirname, 'public')));
-        server.use('/graphql', graphql_1.default(command));
+        server.use('/graphql', (0, graphql_1.default)(command));
         handleServer(server);
         server.get('*', function (req, res) {
             // console.log('originalUrl', req.originalUrl)
-            var parsedUrl = url_1.parse(req.url, true);
+            var parsedUrl = (0, url_1.parse)(req.url, true);
             return handle(req, res, parsedUrl);
         });
-        var nextConfig = config_1.default();
+        var nextConfig = (0, config_1.default)();
         var publicRuntimeConfig = nextConfig.publicRuntimeConfig;
         var protocol = publicRuntimeConfig.protocol, host = publicRuntimeConfig.host, port = publicRuntimeConfig.port;
         server.listen(port, function () {
@@ -84,10 +84,10 @@ var startExpress = function (options, callback) {
 exports.startExpress = startExpress;
 switch (command) {
     case 'dev':
-        exports.startExpress({ dev: true }, null);
+        (0, exports.startExpress)({ dev: true }, null);
         break;
     case 'start':
-        exports.startExpress({ dev: false }, null);
+        (0, exports.startExpress)({ dev: false }, null);
         break;
     case 'build':
     case 'export':
@@ -100,12 +100,12 @@ switch (command) {
                 shellCommand += ' -o ' + dictionary;
             }
         }
-        child_process_1.exec(shellCommand, {}, function (err, stdout, stderr) {
+        (0, child_process_1.exec)(shellCommand, {}, function (err, stdout, stderr) {
             if (err) {
                 console.log(err);
                 return;
             }
-            console.log("stdout: " + stdout);
+            console.log("stdout: ".concat(stdout));
         });
         break;
     case 'init':
@@ -142,20 +142,20 @@ switch (command) {
         }
         console.log('initFlag', initFlag_1);
         if (initFlag_1) {
-            generate_1.initFiles(dictionary);
+            (0, generate_1.initFiles)(dictionary);
         }
         break;
     case 'upgrade':
-        generate_1.initFiles(dictionary, true);
+        (0, generate_1.initFiles)(dictionary, true);
         break;
     case 'create':
         console.log(command, controller, action);
         if (controller !== '') {
             if (action === '') {
-                generate_1.createFiles(controller, 'manage');
+                (0, generate_1.createFiles)(controller, 'manage');
             }
             else {
-                generate_1.createFiles(controller, action);
+                (0, generate_1.createFiles)(controller, action);
             }
         }
         break;
@@ -163,16 +163,16 @@ switch (command) {
         console.log(command, controller, action);
         if (controller !== '') {
             if (action === '' || action === 'all') {
-                generate_1.deleteFiles(controller, 'all');
+                (0, generate_1.deleteFiles)(controller, 'all');
             }
             else {
-                generate_1.deleteFiles(controller, action);
+                (0, generate_1.deleteFiles)(controller, action);
             }
         }
         break;
     case 'version':
-        exports.startExpress({ dev: true }, function () {
-            var nextConfig = config_1.default();
+        (0, exports.startExpress)({ dev: true }, function () {
+            var nextConfig = (0, config_1.default)();
             var publicRuntimeConfig = nextConfig.publicRuntimeConfig;
             var version = publicRuntimeConfig.version;
             console.log('version: ' + version);

package/lib/server/graphql.js

@@ -20,18 +20,18 @@ var fs_1 = __importDefault(require("fs"));
 var lodash_1 = __importDefault(require("lodash"));
 var path_1 = require("path");
 var date_1 = __importDefault(require("./plugins/date"));
-var defaultPath = path_1.resolve(__dirname, './modules/');
+var defaultPath = (0, path_1.resolve)(__dirname, './modules/');
 var typeDefFileName = 'schema.js';
 var resolverFileName = 'resolver.js';
 var curFolder = process.cwd();
-var outModulesPath = path_1.resolve(curFolder + '/server/modules/');
+var outModulesPath = (0, path_1.resolve)(curFolder + '/server/modules/');
 var handleOutPlugins = function () {
     var result = {};
-    var outPluginsPath = path_1.resolve(curFolder + '/server/plugins/');
+    var outPluginsPath = (0, path_1.resolve)(curFolder + '/server/plugins/');
     if (fs_1.default.existsSync(outPluginsPath)) {
         var list = fs_1.default.readdirSync(outPluginsPath);
         list.forEach(function (item) {
-            var resolverPath = path_1.resolve(outPluginsPath + '/' + item);
+            var resolverPath = (0, path_1.resolve)(outPluginsPath + '/' + item);
             var stat = fs_1.default.statSync(resolverPath);
             var isFile = stat.isFile();
             if (isFile) {
@@ -105,14 +105,14 @@ function generateTypeDefsAndResolvers() {
     return { querySchemes: querySchemes, mutationSchemes: mutationSchemes, subscriptionSchemes: subscriptionSchemes, typeSchemes: typeSchemes, resolvers: resolvers, scalarStr: scalarStr };
 }
 var _a = generateTypeDefsAndResolvers(), querySchemesV = _a.querySchemes, mutationSchemesV = _a.mutationSchemes, subscriptionSchemesV = _a.subscriptionSchemes, typeSchemesV = _a.typeSchemes, resolversV = _a.resolvers, scalarStrV = _a.scalarStr;
-var schemaStr = "\n    " + scalarStrV + "\n\n    type Query { \n        " + querySchemesV.join('\n') + " \n    }\n\n    type Mutation { \n        " + mutationSchemesV.join('\n') + " \n    }\n\n    type Subscription { \n        " + subscriptionSchemesV.join('\n') + " \n    }\n\n    " + typeSchemesV.join('\n') + "\n";
+var schemaStr = "\n    ".concat(scalarStrV, "\n\n    type Query { \n        ").concat(querySchemesV.join('\n'), " \n    }\n\n    type Mutation { \n        ").concat(mutationSchemesV.join('\n'), " \n    }\n\n    type Subscription { \n        ").concat(subscriptionSchemesV.join('\n'), " \n    }\n\n    ").concat(typeSchemesV.join('\n'), "\n");
 exports.default = (function (command) {
     if (command === 'dev') {
         console.log('schemaStr', schemaStr);
         console.log('resolvers', resolversV);
     }
-    return express_graphql_1.graphqlHTTP({
-        schema: graphql_1.buildSchema(schemaStr),
+    return (0, express_graphql_1.graphqlHTTP)({
+        schema: (0, graphql_1.buildSchema)(schemaStr),
         rootValue: resolversV,
         graphiql: true
     });

package/lib/server/plugins/date.js

@@ -9,8 +9,8 @@ var graphql_1 = require("graphql");
 var customScalarDate = new graphql_1.GraphQLScalarType({
     name: 'Date',
     description: 'Date custom scalar type',
-    parseValue: function (value) { return moment_1.default(value).valueOf(); },
-    serialize: function (value) { return moment_1.default(value).format('YYYY-MM-DD HH:mm:ss:SSS'); },
+    parseValue: function (value) { return (0, moment_1.default)(value).valueOf(); },
+    serialize: function (value) { return (0, moment_1.default)(value).format('YYYY-MM-DD HH:mm:ss:SSS'); },
     parseLiteral: function (ast) { return (ast.kind === language_1.Kind.INT ? parseInt(ast.value, 10) : null); }
 });
 exports.default = { Date: customScalarDate };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nsgm-cli",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "A CLI tool to run Next/Style-components and Graphql/Mysql fullstack project",
   "main": "index.js",
   "scripts": {
@@ -98,8 +98,8 @@
     "@types/mysql": "^2.15.17",
     "@types/next": "^9.0.0",
     "@types/node": "^14.14.22",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
+    "@types/react": "18.0.1",
+    "@types/react-dom": "^18.0.11",
     "@types/react-redux": "^7.1.16",
     "@types/shelljs": "^0.8.8",
     "@types/styled-components": "^5.1.7",