fix: npm script to run on Windows and Ubuntu without errors (#231)

YoungjaeKim · h4l-yup · web-flow · commit f78a0af2eb4d · 2024-04-01T17:22:38.000+09:00
* fix various npm script to work on Windows and Ubuntu

* fix build error

* apply Prettier format

* update yarn from 1.22.19 to 4.1.1

* update GitHub Action for newer Yarn v4

* update GitHub Action for newer Yarn v4

* update GitHub Action for newer Yarn v4

* update GitHub Action for newer Yarn v4

* update GitHub Action for newer Yarn v4 - add yarn cache clean

* update GitHub Action for newer Yarn v4 - remove cache check

* add dependencies for api:test pass

* fix intervalCount to have positive value always

* add yarn v2 update in steps

* add tabWidth 2 and useTabs to false.

* fix: yarn.lock

* fix: yarn.lock

* fix: yarn.lock

---------

Co-authored-by: Carson &lt;yupyup.kim@linecorp.com&gt;
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -37,6 +37,15 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@main
 
+      - name: Install Yarn to latest stable version
+        run: |
+          npx corepack enable
+          yarn set version stable
+          yarn cache clean
+
+      - name: Install Dependencies
+        run: yarn install
+
       - name: Build and run
         run: |
           cd packages/ufb-shared
diff --git a/.github/workflows/test-on-pr.yml b/.github/workflows/test-on-pr.yml
@@ -12,13 +12,19 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
 
-      - name: Setup Node.js environment
+      - name: Setup Node.js v18
         uses: actions/setup-node@v2
         with:
           node-version: '18'
 
+      - name: Install Yarn to latest stable version
+        run: |
+          npx corepack enable
+          yarn set version stable
+          yarn cache clean
+
       - name: Install Dependencies
-        run: yarn install --immutable --immutable-cache --check-cache
+        run: yarn install
 
       - name: setup environment variables (with opensearch)
         run: |
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 
 # dependencies
 node_modules
+'node_modules
 .pnp
 .pnp.js
 
@@ -50,4 +51,4 @@ test-results
 user.json
 
 # JetBrains
-.idea
+.idea
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -7,6 +7,7 @@
     "clean": "git clean -xdf dist .turbo node_modules",
     "dev": "nest start --watch",
     "format": "prettier --check \"./src/**/*.{js,cjs,mjs,ts,tsx,md,json}\"",
+    "format:fix": "prettier --write --list-different \"./src/**/*.{js,cjs,mjs,ts,tsx,md,json}\"",
     "lint": "eslint \"src/**/*.ts\"",
     "migration:generate": "npm run typeorm -- migration:generate src/configs/modules/typeorm-config/migrations/$npm_config_name",
     "migration:revert": "npm run typeorm -- migration:revert",
@@ -44,6 +45,7 @@
     "@nestjs/terminus": "^10.1.1",
     "@nestjs/typeorm": "^10.0.0",
     "@opensearch-project/opensearch": "^2.4.0",
+    "@swc/helpers": "^0.5.8",
     "@ufb/shared": "^0.1.0",
     "@willsoto/nestjs-prometheus": "^6.0.0",
     "aws-sdk": "^2.1509.0",
@@ -54,6 +56,7 @@
     "exceljs": "^4.4.0",
     "fast-csv": "^5.0.1",
     "joi": "^17.11.0",
+    "luxon": "^3.4.4",
     "magic-bytes.js": "^1.8.0",
     "mysql2": "^3.6.2",
     "nestjs-cls": "^3.6.0",
diff --git a/apps/api/src/domains/admin/channel/field/field.service.ts b/apps/api/src/domains/admin/channel/field/field.service.ts
@@ -54,11 +54,11 @@ export class FieldService {
                 search_analyzer: 'ngram_analyzer',
               }
             : field.format === FieldFormatEnum.date
-            ? {
-                type: FIELD_TYPES_TO_MAPPING_TYPES[field.format],
-                format: `yyyy-MM-dd HH:mm:ss||yyyy-MM-dd HH:mm:ssZ||yyyy-MM-dd HH:mm:ssZZZZZ||yyyy-MM-dd||epoch_millis||strict_date_optional_time`,
-              }
-            : { type: FIELD_TYPES_TO_MAPPING_TYPES[field.format] },
+              ? {
+                  type: FIELD_TYPES_TO_MAPPING_TYPES[field.format],
+                  format: `yyyy-MM-dd HH:mm:ss||yyyy-MM-dd HH:mm:ssZ||yyyy-MM-dd HH:mm:ssZZZZZ||yyyy-MM-dd||epoch_millis||strict_date_optional_time`,
+                }
+              : { type: FIELD_TYPES_TO_MAPPING_TYPES[field.format] },
         }),
       {},
     );
diff --git a/apps/api/src/domains/admin/statistics/utils/util-functions.ts b/apps/api/src/domains/admin/statistics/utils/util-functions.ts
@@ -32,9 +32,11 @@ export function getIntervalDatesInFormat(
     };
   } else {
     const intervalCount = Math.floor(
-      DateTime.fromJSDate(new Date(inputDate))
-        .until(DateTime.fromJSDate(new Date(endDate)))
-        .length(interval) + 1,
+      Math.abs(
+        DateTime.fromJSDate(new Date(inputDate))
+          .diff(DateTime.fromJSDate(new Date(endDate)), interval)
+          .as(`${interval}s`),
+      ) + 1,
     );
     const startOfInterval =
       DateTime.fromJSDate(new Date(endDate))
diff --git a/apps/e2e/package.json b/apps/e2e/package.json
@@ -10,4 +10,4 @@
     "axios": "^1.6.7",
     "mysql2": "^3.6.5"
   }
-}
+}
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -7,8 +7,9 @@
     "clean": "git clean -xdf .next .turbo node_modules",
     "dev": "next dev",
     "format": "prettier --check \"./src/**/*.{js,cjs,mjs,ts,tsx,md,json}\"",
+    "format:fix": "prettier --write --list-different \"./src/**/*.{js,cjs,mjs,ts,tsx,md,json}\"",
     "generate-api-type": "openapi-typescript http://0.0.0.0:4000/admin-docs-json --output src/types/api.type.ts",
-    "lint": "SKIP_ENV_VALIDATION=1 next lint",
+    "lint": "set SKIP_ENV_VALIDATION=1 && next lint",
     "start": "next start",
     "test": "jest --passWithNoTests",
     "test:ci": "jest --ci --passWithNoTests",
diff --git a/apps/web/src/components/cards/DashboardCard/DashboardCard.tsx b/apps/web/src/components/cards/DashboardCard/DashboardCard.tsx
@@ -61,8 +61,8 @@ const DashboardCard: React.FC<IProps> = (props) => {
                 percentage === 0
                   ? 'text-secondary'
                   : percentage > 0
-                  ? 'text-blue-primary'
-                  : 'text-red-primary'
+                    ? 'text-blue-primary'
+                    : 'text-red-primary'
               }
             >
               {parseFloat(Math.abs(percentage).toFixed(1))}%
diff --git a/apps/web/src/components/etc/TableSearchInput/table-search-input.service.ts b/apps/web/src/components/etc/TableSearchInput/table-search-input.service.ts
@@ -85,8 +85,9 @@ export const objToStr = (
           }
         case 'issue':
           if (Array.isArray(value)) {
-            const issueName = column.options?.find((v) => v.id === value[0])
-              ?.name;
+            const issueName = column.options?.find(
+              (v) => v.id === value[0],
+            )?.name;
             return `${name}:${issueName}`;
           } else if (value?.name) {
             const issueName = value?.name;
diff --git a/apps/web/src/containers/create-channel-complete/FieldSection.tsx b/apps/web/src/containers/create-channel-complete/FieldSection.tsx
@@ -66,14 +66,14 @@ const columns = [
         getValue() === 'API'
           ? 'blue'
           : getValue() === 'ADMIN'
-          ? 'green'
-          : 'black';
+            ? 'green'
+            : 'black';
       const type =
         getValue() === 'API'
           ? 'primary'
           : getValue() === 'ADMIN'
-          ? 'primary'
-          : 'secondary';
+            ? 'primary'
+            : 'secondary';
       return (
         <Badge color={color} type={type}>
           {getValue()}
diff --git a/apps/web/src/containers/create-channel/InputField.tsx b/apps/web/src/containers/create-channel/InputField.tsx
@@ -72,14 +72,14 @@ const getColumns = (
         getValue() === 'API'
           ? 'blue'
           : getValue() === 'ADMIN'
-          ? 'green'
-          : 'black';
+            ? 'green'
+            : 'black';
       const type =
         getValue() === 'API'
           ? 'primary'
           : getValue() === 'ADMIN'
-          ? 'primary'
-          : 'secondary';
+            ? 'primary'
+            : 'secondary';
       return (
         <Badge color={color} type={type}>
           {getValue()}
diff --git a/apps/web/src/containers/setting-menu/FieldSetting/FieldSetting.tsx b/apps/web/src/containers/setting-menu/FieldSetting/FieldSetting.tsx
@@ -90,14 +90,14 @@ const getColumns = (
         getValue() === 'API'
           ? 'blue'
           : getValue() === 'ADMIN'
-          ? 'green'
-          : 'black';
+            ? 'green'
+            : 'black';
       const type =
         getValue() === 'API'
           ? 'primary'
           : getValue() === 'ADMIN'
-          ? 'primary'
-          : 'secondary';
+            ? 'primary'
+            : 'secondary';
       return (
         <Badge color={color} type={type}>
           {getValue()}
diff --git a/apps/web/src/containers/setting-menu/FieldSetting/PreviewTable.tsx b/apps/web/src/containers/setting-menu/FieldSetting/PreviewTable.tsx
@@ -75,27 +75,29 @@ const PreviewTable: React.FC<IProps> = ({ fields }) => {
             field.format === 'date'
               ? faker.date.anytime()
               : field.format === 'keyword'
-              ? faker.word.noun()
-              : field.format === 'multiSelect'
-              ? faker.helpers.arrayElements(
-                  (field.options ?? []).map((v) => v.name),
-                )
-              : field.format === 'select'
-              ? faker.helpers.arrayElement(
-                  (field.options ?? []).map((v) => v.name),
-                )
-              : field.format === 'number'
-              ? faker.number.int()
-              : field.format === 'text'
-              ? faker.lorem.text()
-              : field.format === 'images'
-              ? faker.helpers.arrayElements(
-                  Array.from(
-                    { length: faker.number.int({ min: 1, max: 15 }) },
-                    () => '/assets/images/sample_image.png',
-                  ),
-                )
-              : null;
+                ? faker.word.noun()
+                : field.format === 'multiSelect'
+                  ? faker.helpers.arrayElements(
+                      (field.options ?? []).map((v) => v.name),
+                    )
+                  : field.format === 'select'
+                    ? faker.helpers.arrayElement(
+                        (field.options ?? []).map((v) => v.name),
+                      )
+                    : field.format === 'number'
+                      ? faker.number.int()
+                      : field.format === 'text'
+                        ? faker.lorem.text()
+                        : field.format === 'images'
+                          ? faker.helpers.arrayElements(
+                              Array.from(
+                                {
+                                  length: faker.number.int({ min: 1, max: 15 }),
+                                },
+                                () => '/assets/images/sample_image.png',
+                              ),
+                            )
+                          : null;
         }
       }
       fakeRows.push(fakeData);
diff --git a/apps/web/src/containers/setting-menu/WebhookSetting/WebhookUpsertDialog.tsx b/apps/web/src/containers/setting-menu/WebhookSetting/WebhookUpsertDialog.tsx
@@ -178,11 +178,10 @@ const WebhookUpsertDialog: React.FC<IProps> = (props) => {
 
   const getEventChannels = (type: WebhookEventEnum) => {
     const channels = data?.items ?? [];
-    return channels.filter(
-      (channel) =>
-        watch('events')
-          .find((e) => e.type === type)
-          ?.channelIds?.includes(channel.id),
+    return channels.filter((channel) =>
+      watch('events')
+        .find((e) => e.type === type)
+        ?.channelIds?.includes(channel.id),
     );
   };
 
diff --git a/apps/web/src/containers/tables/FeedbackTable/ColumnSettingPopover/ColumnSettingPopover.tsx b/apps/web/src/containers/tables/FeedbackTable/ColumnSettingPopover/ColumnSettingPopover.tsx
@@ -61,12 +61,12 @@ const ColumnSettingPopover: React.FC<IProps> = ({
       columnOrder.length === 0
         ? (columns.map((v) => v.id) as string[])
         : columnOrder.length === columns.length
-        ? columnOrder
-        : columnOrder.concat(
-            columns
-              .filter((v) => !columnOrder.includes(v.id as string))
-              .map((v) => v.id) as string[],
-          ),
+          ? columnOrder
+          : columnOrder.concat(
+              columns
+                .filter((v) => !columnOrder.includes(v.id as string))
+                .map((v) => v.id) as string[],
+            ),
     [columns, columnOrder],
   );
 
@@ -77,8 +77,8 @@ const ColumnSettingPopover: React.FC<IProps> = ({
         (typeof columnVisibility[key] === 'undefined'
           ? 1
           : columnVisibility[key]
-          ? 1
-          : 0)
+            ? 1
+            : 0)
       );
     }, 0);
   }, [columnKeys, columnVisibility]);
diff --git a/apps/web/src/containers/tables/FeedbackTable/DownloadButton/DownloadButton.tsx b/apps/web/src/containers/tables/FeedbackTable/DownloadButton/DownloadButton.tsx
@@ -74,12 +74,8 @@ const DownloadButton: React.FC<IDownloadButtonProps> = ({
         query: {
           ...query,
           createdAt: {
-            gte: dayjs(createdAtRange?.startDate)
-              .startOf('day')
-              .toISOString(),
-            lt: dayjs(createdAtRange?.endDate)
-              .endOf('day')
-              .toISOString(),
+            gte: dayjs(createdAtRange?.startDate).startOf('day').toISOString(),
+            lt: dayjs(createdAtRange?.endDate).endOf('day').toISOString(),
           },
         },
       }),
diff --git a/apps/web/src/containers/tables/FeedbackTable/EditableCell/EditableCell.tsx b/apps/web/src/containers/tables/FeedbackTable/EditableCell/EditableCell.tsx
@@ -51,15 +51,14 @@ const EditableCell: React.FC<IProps> = memo((props) => {
       field.format === 'select'
         ? field.options?.find((v) => v.key === value) ?? null
         : field.format === 'multiSelect'
-        ? (value ?? []).map(
-            (optionKey: string) =>
+          ? (value ?? []).map((optionKey: string) =>
               field.options?.find((v) => v.key === optionKey),
-          )
-        : field.format === 'number'
-        ? value
-          ? Number(value)
-          : null
-        : value,
+            )
+          : field.format === 'number'
+            ? value
+              ? Number(value)
+              : null
+            : value,
     );
   }, [value]);
 
@@ -71,16 +70,16 @@ const EditableCell: React.FC<IProps> = memo((props) => {
       field.format === 'text' || field.format === 'keyword'
         ? currentValue ?? ''
         : field.format === 'number'
-        ? Number(currentValue)
-        : field.format === 'date'
-        ? new Date(currentValue)
-        : field.format === 'select'
-        ? currentValue?.key ?? null
-        : field.format === 'multiSelect'
-        ? (currentValue ?? []).map(
-            (v: { id: number; key: string; name: string }) => v.key,
-          ) ?? null
-        : currentValue,
+          ? Number(currentValue)
+          : field.format === 'date'
+            ? new Date(currentValue)
+            : field.format === 'select'
+              ? currentValue?.key ?? null
+              : field.format === 'multiSelect'
+                ? (currentValue ?? []).map(
+                    (v: { id: number; key: string; name: string }) => v.key,
+                  ) ?? null
+                : currentValue,
     );
   }, [currentValue, editableState]);
 
diff --git a/apps/web/src/containers/tables/FeedbackTable/FeedbackTableBar/FeedbackTableBar.tsx b/apps/web/src/containers/tables/FeedbackTable/FeedbackTableBar/FeedbackTableBar.tsx
@@ -36,10 +36,10 @@ const getSearchItemPriority = (a: SearchItemType) =>
   a.name === 'Created'
     ? 1
     : a.name === 'Updated'
-    ? 2
-    : a.name === 'Issue'
-    ? 3
-    : 4;
+      ? 2
+      : a.name === 'Issue'
+        ? 3
+        : 4;
 interface IProps {
   onChangeChannel: (channelId: number) => void;
   columns: ColumnDef<any, any>[];
diff --git a/apps/web/src/hooks/useOAIQuery.ts b/apps/web/src/hooks/useOAIQuery.ts
@@ -48,8 +48,8 @@ export default function useOAIQuery<
 } & (TVariables extends undefined
   ? { variables?: undefined }
   : O.RequiredKeys<NonNullable<TVariables>> extends never
-  ? { variables?: TVariables }
-  : { variables: TVariables })) {
+    ? { variables?: TVariables }
+    : { variables: TVariables })) {
   return useQuery<
     TData,
     IFetchError,
diff --git a/apps/web/src/pages/auth/oauth-callback.tsx b/apps/web/src/pages/auth/oauth-callback.tsx
diff --git a/apps/web/src/types/openapi.type.ts b/apps/web/src/types/openapi.type.ts
diff --git a/package.json b/package.json
diff --git a/packages/ufb-shared/package.json b/packages/ufb-shared/package.json
diff --git a/packages/ufb-ui/package.json b/packages/ufb-ui/package.json
diff --git a/tooling/eslint/package.json b/tooling/eslint/package.json
diff --git a/tooling/prettier/index.mjs b/tooling/prettier/index.mjs
diff --git a/tooling/prettier/package.json b/tooling/prettier/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@`
`10`	`10`	`"axios": "^1.6.7",`
`11`	`11`	`"mysql2": "^3.6.5"`
`12`	`12`	`}`
`13`		`-}`
	`13`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ const DashboardCard: React.FC<IProps> = (props) => {`
`61`	`61`	`percentage === 0`
`62`	`62`	`? 'text-secondary'`
`63`	`63`	`: percentage > 0`
`64`		`- ? 'text-blue-primary'`
`65`		`- : 'text-red-primary'`
	`64`	`+ ? 'text-blue-primary'`
	`65`	`+ : 'text-red-primary'`
`66`	`66`	`}`
`67`	`67`	`>`
`68`	`68`	`{parseFloat(Math.abs(percentage).toFixed(1))}%`