Updated to yarn

caprover · Aug 7, 2021 · 60f9a44 · 60f9a44
1 parent a340c6a
commit 60f9a44
Show file tree

Hide file tree

Showing 24 changed files with 14,968 additions and 49,427 deletions.
diff --git a/.github/workflows/build_project.yml b/.github/workflows/build_project.yml
@@ -16,4 +16,4 @@ jobs:
             - uses: actions/setup-node@v1
               with:
                   node-version: 14
-            - run: npm ci && npm run build
+            - run: yarn install --frozen-lockfile && yarn run build
diff --git a/.github/workflows/format_project.yml b/.github/workflows/format_project.yml
@@ -16,4 +16,4 @@ jobs:
             - uses: actions/setup-node@v1
               with:
                   node-version: 14
-            - run: npm ci && npm run formatter
+            - run: yarn install --frozen-lockfile && yarn run formatter
diff --git a/.github/workflows/lint_project.yml b/.github/workflows/lint_project.yml
@@ -16,4 +16,4 @@ jobs:
             - uses: actions/setup-node@v1
               with:
                   node-version: 14
-            - run: npm ci && npm run tslint
+            - run: yarn install --frozen-lockfile && yarn run tslint
diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ This project was bootstrapped with [Create React App](https://github.com/faceboo
 Run CapRover backend service in debug mode. Change `.env.development` to match your backend. Then run `npm start`
 
 > **Note**: To create a simple backend API in debug mode, you can use [Play with Docker](https://labs.play-with-docker.com/). Just simply run the following commands and you'll be set:
+>
 > ```
 > apk update && apk add nodejs npm
 > git clone https://github.com/caprover/caprover.git
@@ -15,6 +16,7 @@ Run CapRover backend service in debug mode. Change `.env.development` to match y
 > npm run clean
 > echo "done"
 > ```
+>
 > Then click on Open Port button and get the URL for port `3000`, it should be something like this (make sure to remove trailing slash): `http://ip172-18-0-76-abcdef123456-3000.direct.labs.play-with-docker.com`
 
 We strive to keep CapRover code base consistent. This will ensure a high level of consistency and lower maintenance load.
@@ -23,15 +25,15 @@ We strive to keep CapRover code base consistent. This will ensure a high level o
 
 In the project directory, you can run:
 
-#### `npm start`
+#### `yarn start`
 
 Runs the app in the development mode.<br>
 Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
 
 The page will reload if you make edits.<br>
 You will also see any lint errors in the console.
 
-### `npm run build`
+### `yarn run build`
 
 Builds the app for production to the `build` folder.<br>
 It correctly bundles React in production mode and optimizes the build for the best performance.
@@ -58,7 +60,7 @@ To ensure your elements work with both dark and light modes, following points ne
 
 #### Dev Mode & Hot Reload
 
-It can happen that modifying the `app.less` during `npm run dev` leads to `FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory less`. To overcome this, we need to set `max-old-space-size`.
+It can happen that modifying the `app.less` during `yarn run dev` leads to `FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory less`. To overcome this, we need to set `max-old-space-size`.
 
 ```bash
 export NODE_OPTIONS="--max-old-space-size=8192"

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/api/ApiManager.ts b/src/api/ApiManager.ts
@@ -175,9 +175,8 @@ export default class ApiManager {
                         detached ? '?detached=1' : ''
                     }`,
                     {
-                        captainDefinitionContent: JSON.stringify(
-                            captainDefinition
-                        ),
+                        captainDefinitionContent:
+                            JSON.stringify(captainDefinition),
                         gitHash,
                     }
                 )
@@ -210,7 +209,8 @@ export default class ApiManager {
                 http.fetch(http.POST, '/user/apps/appDefinitions/update', {
                     appName: appName,
                     instanceCount: instanceCount,
-                    captainDefinitionRelativeFilePath: captainDefinitionRelativeFilePath,
+                    captainDefinitionRelativeFilePath:
+                        captainDefinitionRelativeFilePath,
                     notExposeAsWebApp: notExposeAsWebApp,
                     forceSsl: forceSsl,
                     websocketSupport: websocketSupport,

diff --git a/src/containers/PageRoot.tsx b/src/containers/PageRoot.tsx
@@ -124,7 +124,8 @@ class PageRoot extends ApiComponent<
                     // ignore error
                 })
             this.setState({
-                collapsed: StorageHelper.getSiderCollapsedStateFromLocalStorage(),
+                collapsed:
+                    StorageHelper.getSiderCollapsedStateFromLocalStorage(),
             })
         }
     }

diff --git a/src/containers/apps/appDetails/AppConfigs.tsx b/src/containers/apps/appDetails/AppConfigs.tsx
@@ -499,9 +499,8 @@ export default class AppConfigs extends Component<
                                     const newApiData = Utils.copyObject(
                                         this.props.apiData
                                     )
-                                    newApiData.appDefinition.instanceCount = Number(
-                                        e.target.value
-                                    )
+                                    newApiData.appDefinition.instanceCount =
+                                        Number(e.target.value)
                                     this.props.updateApiData(newApiData)
                                 }}
                             />

diff --git a/src/containers/apps/appDetails/AppDetails.tsx b/src/containers/apps/appDetails/AppDetails.tsx
@@ -192,8 +192,8 @@ class AppDetails extends ApiComponent<
                                 <Checkbox
                                     defaultChecked={!!self.volumesToDelete[v]}
                                     onChange={(e: any) => {
-                                        self.volumesToDelete[v] = !self
-                                            .volumesToDelete[v]
+                                        self.volumesToDelete[v] =
+                                            !self.volumesToDelete[v]
                                     }}
                                 >
                                     {v}
@@ -209,7 +209,8 @@ class AppDetails extends ApiComponent<
                         type="text"
                         placeholder={appDef.appName}
                         onChange={(e) => {
-                            self.confirmedAppNameToDelete = e.target.value.trim()
+                            self.confirmedAppNameToDelete =
+                                e.target.value.trim()
                         }}
                     />
                 </div>
@@ -233,7 +234,8 @@ class AppDetails extends ApiComponent<
                 self.apiManager
                     .deleteApp(appDef.appName!, volumes)
                     .then(function (data) {
-                        const volumesFailedToDelete = data.volumesFailedToDelete as string[]
+                        const volumesFailedToDelete =
+                            data.volumesFailedToDelete as string[]
                         if (
                             volumesFailedToDelete &&
                             volumesFailedToDelete.length

diff --git a/src/containers/apps/appDetails/HttpSettings.tsx b/src/containers/apps/appDetails/HttpSettings.tsx
@@ -190,13 +190,14 @@ export default class HttpSettings extends Component<
 
     onEditDefaultNginxConfigClicked() {
         const newApiData = Utils.copyObject(this.props.apiData!)
-        newApiData.appDefinition.customNginxConfig = this.props.apiData!.defaultNginxConfig
+        newApiData.appDefinition.customNginxConfig =
+            this.props.apiData!.defaultNginxConfig
         this.props.updateApiData(newApiData)
     }
 
     createCustomNginx() {
-        const customNginxConfig = this.props.apiData!.appDefinition
-            .customNginxConfig!
+        const customNginxConfig =
+            this.props.apiData!.appDefinition.customNginxConfig!
         if (!customNginxConfig) {
             return (
                 <div>
@@ -355,9 +356,8 @@ export default class HttpSettings extends Component<
                                     const newApiData = Utils.copyObject(
                                         this.props.apiData
                                     )
-                                    newApiData.appDefinition.containerHttpPort = Number(
-                                        e.target.value
-                                    )
+                                    newApiData.appDefinition.containerHttpPort =
+                                        Number(e.target.value)
                                     this.props.updateApiData(newApiData)
                                 }}
                             />
@@ -377,8 +377,8 @@ export default class HttpSettings extends Component<
                             const newApiData = Utils.copyObject(
                                 this.props.apiData!
                             )
-                            newApiData.appDefinition.forceSsl = !!e.target
-                                .checked
+                            newApiData.appDefinition.forceSsl =
+                                !!e.target.checked
                             this.props.updateApiData(newApiData)
                         }}
                     >
@@ -400,8 +400,8 @@ export default class HttpSettings extends Component<
                             const newApiData = Utils.copyObject(
                                 this.props.apiData!
                             )
-                            newApiData.appDefinition.websocketSupport = !!e
-                                .target.checked
+                            newApiData.appDefinition.websocketSupport =
+                                !!e.target.checked
                             this.props.updateApiData(newApiData)
                         }}
                     >
@@ -549,8 +549,8 @@ export default class HttpSettings extends Component<
                     }
                     onChange={(e: any) => {
                         const newApiData = Utils.copyObject(this.props.apiData!)
-                        newApiData.appDefinition.notExposeAsWebApp = !!e.target
-                            .checked
+                        newApiData.appDefinition.notExposeAsWebApp =
+                            !!e.target.checked
                         this.props.updateApiData(newApiData)
                     }}
                 >

diff --git a/src/containers/apps/appDetails/deploy/AppLogsView.tsx b/src/containers/apps/appDetails/deploy/AppLogsView.tsx
@@ -92,9 +92,8 @@ export default class AppLogsView extends ApiComponent<
 
                 if (shouldScrollToBottom)
                     setTimeout(function () {
-                        let textarea = document.getElementById(
-                            'applogs-text-id'
-                        )
+                        let textarea =
+                            document.getElementById('applogs-text-id')
                         if (textarea) textarea.scrollTop = textarea.scrollHeight
                     }, 100)
             })

diff --git a/src/containers/apps/appDetails/deploy/BuildLogsView.tsx b/src/containers/apps/appDetails/deploy/BuildLogsView.tsx
@@ -102,9 +102,8 @@ export default class BuildLogsView extends ApiComponent<
 
                 if (lineAdded) {
                     setTimeout(function () {
-                        let textarea = document.getElementById(
-                            'buildlog-text-id'
-                        )
+                        let textarea =
+                            document.getElementById('buildlog-text-id')
                         if (textarea) textarea.scrollTop = textarea.scrollHeight
                     }, 100)
                 }

diff --git a/src/containers/apps/appDetails/deploy/Deployment.tsx b/src/containers/apps/appDetails/deploy/Deployment.tsx
@@ -206,7 +206,8 @@ export default class Deployment extends ApiComponent<
                                     }
                                 }
                                 tokenConfig.enabled = !tokenConfig.enabled
-                                newApiData.appDefinition.appDeployTokenConfig = tokenConfig
+                                newApiData.appDefinition.appDeployTokenConfig =
+                                    tokenConfig
                                 self.props.updateApiData(newApiData)
                                 // This is a hack! Find a better way!
                                 // We need this delay, otherwise the new state will not be used by onUpdateConfigAndSave
@@ -297,9 +298,8 @@ export default class Deployment extends ApiComponent<
                     updateRepoInfo={(newRepo) => {
                         const newApiData = Utils.copyObject(this.props.apiData)
                         if (newApiData.appDefinition.appPushWebhook) {
-                            newApiData.appDefinition.appPushWebhook.repoInfo = Utils.copyObject(
-                                newRepo
-                            )
+                            newApiData.appDefinition.appPushWebhook.repoInfo =
+                                Utils.copyObject(newRepo)
                         } else {
                             newApiData.appDefinition.appPushWebhook = {
                                 repoInfo: Utils.copyObject(newRepo),
@@ -409,7 +409,8 @@ export default class Deployment extends ApiComponent<
                                     }
                                     onClick={() =>
                                         this.setState({
-                                            forceEditableCaptainDefinitionPath: true,
+                                            forceEditableCaptainDefinitionPath:
+                                                true,
                                         })
                                     }
                                 >

diff --git a/src/containers/apps/oneclick/OneClickAppDeployManager.ts b/src/containers/apps/oneclick/OneClickAppDeployManager.ts
@@ -27,7 +27,8 @@ function replaceWith(
 }
 
 export default class OneClickAppDeployManager {
-    private deploymentHelper: OneClickAppDeploymentHelper = new OneClickAppDeploymentHelper()
+    private deploymentHelper: OneClickAppDeploymentHelper =
+        new OneClickAppDeploymentHelper()
     private template: IOneClickTemplate | undefined
     constructor(
         private onDeploymentStateChanged: (
@@ -78,8 +79,7 @@ export default class OneClickAppDeployManager {
         if (!apps) {
             self.onDeploymentStateChanged({
                 steps: ['Parsing the template'],
-                error:
-                    'Cannot parse the template. Dependency tree cannot be resolved. Infinite loop!!',
+                error: 'Cannot parse the template. Dependency tree cannot be resolved. Infinite loop!!',
                 currentStep: 0,
             })
         } else if (apps.length === 0) {

diff --git a/src/containers/apps/oneclick/OneClickAppDeploymentHelper.ts b/src/containers/apps/oneclick/OneClickAppDeploymentHelper.ts
@@ -84,9 +84,10 @@ export default class OneClickAppDeploymentHelper {
                         })
                     })
 
-                    const overrideYaml = DockerComposeToServiceOverride.convertComposeToService(
-                        dockerComposeService
-                    )
+                    const overrideYaml =
+                        DockerComposeToServiceOverride.convertComposeToService(
+                            dockerComposeService
+                        )
 
                     if (!!overrideYaml) {
                         appDef.serviceUpdateOverride = overrideYaml

diff --git a/src/containers/apps/oneclick/selector/OneClickGrid.tsx b/src/containers/apps/oneclick/selector/OneClickGrid.tsx
@@ -148,10 +148,11 @@ export default class OneClickGrid extends Component<
                                     ) {
                                         score = 0.99
                                     } else {
-                                        score = StringSimilarity.compareTwoStrings(
-                                            searchTerm,
-                                            appNameForSearch
-                                        )
+                                        score =
+                                            StringSimilarity.compareTwoStrings(
+                                                searchTerm,
+                                                appNameForSearch
+                                            )
                                     }
 
                                     sortScores[app.name] = score || 0

diff --git a/src/containers/apps/oneclick/variables/OneClickAppConfigPage.tsx b/src/containers/apps/oneclick/variables/OneClickAppConfigPage.tsx
@@ -178,9 +178,8 @@ export default class OneClickAppConfigPage extends ApiComponent<
                                     const template = Utils.copyObject(
                                         self.state.apiData!
                                     )
-                                    const valuesAugmented = Utils.copyObject(
-                                        values
-                                    )
+                                    const valuesAugmented =
+                                        Utils.copyObject(values)
 
                                     template.caproverOneClickApp.variables.push(
                                         {

diff --git a/src/containers/nodes/DockerRegistryAdd.tsx b/src/containers/nodes/DockerRegistryAdd.tsx
@@ -153,7 +153,8 @@ export default class DockerRegistryAdd extends Component<
                                 const newData = Utils.copyObject(
                                     self.state.remoteRegistryToAdd
                                 )
-                                newData.registryImagePrefix = e.target.value.trim()
+                                newData.registryImagePrefix =
+                                    e.target.value.trim()
                                 self.setState({ remoteRegistryToAdd: newData })
                             }}
                         />
@@ -180,7 +181,8 @@ export default class DockerRegistryAdd extends Component<
                         onClick={() =>
                             self.setState({
                                 modalShowing: ADDING_REMOTE,
-                                remoteRegistryToAdd: self.getPlainRegistryInfo(),
+                                remoteRegistryToAdd:
+                                    self.getPlainRegistryInfo(),
                             })
                         }
                     >

diff --git a/src/redux/reducers/DefaultRegistryReducer.ts b/src/redux/reducers/DefaultRegistryReducer.ts
@@ -1,5 +1,6 @@
 import { DEFAULT_REGISTRY_CHANGED } from '../actions/DefaultRegistryActions'
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default function (state = {}, action: { payload: any; type: string }) {
     switch (action.type) {
         case DEFAULT_REGISTRY_CHANGED:

diff --git a/src/redux/reducers/GlobalReducer.ts b/src/redux/reducers/GlobalReducer.ts
@@ -1,6 +1,7 @@
 import Utils from '../../utils/Utils'
 import { ROOT_KEY_CHANGED, SIZE_CHANGED } from '../actions/GlobalActions'
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default function (state = {}, action: { payload: any; type: string }) {
     switch (action.type) {
         case ROOT_KEY_CHANGED:

diff --git a/src/utils/CrashReporter.ts b/src/utils/CrashReporter.ts
@@ -17,6 +17,7 @@ const getInstance = function () {
     return instance
 }
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default {
     getInstance: getInstance,
 }
diff --git a/src/utils/DomUtils.ts b/src/utils/DomUtils.ts
@@ -6,6 +6,7 @@ function scrollToFixedFromTop(fromTopPx: number, el: HTMLElement) {
     })
 }
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default {
     scrollToTopBar(delay?: number) {
         const el = document.getElementById('main-content-layout')

diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts
@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-anonymous-default-export
 export default {
     copyObject<T>(obj: T): T {
         return JSON.parse(JSON.stringify(obj)) as T