sort

.dockerignore

@@ -111,3 +111,5 @@ dist
 Dockerfile
 .gitlab-ci.yml
 /config.yaml
+.idea
+/data*

.eslintrc.js

+module.exports = {
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    project: 'tsconfig.json',
+    sourceType: 'module',
+  },
+  plugins: ['@typescript-eslint/eslint-plugin'],
+  extends: [
+    'plugin:@typescript-eslint/recommended',
+    'plugin:prettier/recommended',
+  ],
+  root: true,
+  env: {
+    node: true,
+    jest: true,
+  },
+  ignorePatterns: ['.eslintrc.js'],
+  rules: {
+    '@typescript-eslint/interface-name-prefix': 'off',
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+  },
+};

.gitignore

@@ -104,6 +104,8 @@ dist
 .tern-port
 
 /build
+/dist
 /output
 /config.yaml
-/data
+.idea
+/data*

.gitlab-ci.yml

 stages:
   - build
+  - combine
   - deploy
 
 variables:
   GIT_DEPTH: "1"
   CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  CONTAINER_TEST_ARM_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-arm
+  CONTAINER_TEST_X86_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86
   CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
 
 before_script:
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
-build:
+pack:
   stage: build
+  tags:
+    - linux
+  script:
+    - npm ci
+    - npm run build
+    - npm run pack
+  artifacts:
+    paths:
+      - output
+
+build-x86:
+  stage: build
+  tags: 
+    - docker
+  script:
+    - docker build --pull -t $CONTAINER_TEST_X86_IMAGE .
+    - docker push $CONTAINER_TEST_X86_IMAGE
+
+build-arm:
+  stage: build
+  tags: 
+    - docker-arm
+  script:
+    - docker build --pull -t $CONTAINER_TEST_ARM_IMAGE .
+    - docker push $CONTAINER_TEST_ARM_IMAGE
+
+combine:
+  stage: combine
   tags:
     - docker
   script:
-    - docker build --pull -t $CONTAINER_TEST_IMAGE .
-    - docker push $CONTAINER_TEST_IMAGE
+    - docker pull $CONTAINER_TEST_X86_IMAGE
+    - docker pull $CONTAINER_TEST_ARM_IMAGE
+    - docker manifest create $CONTAINER_TEST_IMAGE --amend $CONTAINER_TEST_X86_IMAGE --amend $CONTAINER_TEST_ARM_IMAGE
+    - docker manifest push $CONTAINER_TEST_IMAGE
 
 deploy_latest:
   stage: deploy

.npmignore

+/install-npm.sh
+.git*
+/output
+/dest
+/config.yaml
+.idea
+.dockerignore
+Dockerfile
+/src
+.eslintrc.js
+.prettierrc
+webpack.config.js
+tsconfig.json
+/data*

.prettierrc

+{
+  "singleQuote": true,
+  "trailingComma": "all"
+}
\ No newline at end of file

Dockerfile

-FROM node:buster-slim
-RUN apt update && apt -y install python3 build-essential && rm -rf /var/lib/apt/lists/*
+FROM node:bullseye-slim
+LABEL Author="Nanahira <nanahira@momobako.com>"
+
+RUN apt update && apt -y install python3 build-essential && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 WORKDIR /usr/src/app
 COPY ./package*.json ./
 RUN npm ci

install-npm.sh

+#!/bin/bash
+npm install --save \
+	lodash
+
+npm install --save-dev \
+	@types/node \
+	@types/lodash \
+	typescript \
+	'@typescript-eslint/eslint-plugin@^4.28.2' \
+	'@typescript-eslint/parser@^4.28.2 '\
+	'eslint@^7.30.0' \
+	'eslint-config-prettier@^8.3.0' \
+	'eslint-plugin-prettier@^3.4.0' \
+	prettier

package.json

@@ -2,10 +2,11 @@
   "name": "league-tabulate",
   "version": "1.0.0",
   "description": "Tabulator",
-  "main": "build/run.js",
+  "main": "dist/run.js",
   "scripts": {
     "build": "./node_modules/.bin/tsc",
-    "start": "node build/run.js"
+    "start": "node dist/run.js",
+    "pack": "mkdir output ; pkg --out-path output ."
   },
   "repository": {
     "type": "git",
@@ -13,13 +14,29 @@
   },
   "author": "Nanahira",
   "license": "ISC",
+  "bin": "dist/run.js",
+  "pkg": {
+    "scripts": [
+      "dist/**/*.js"
+    ],
+    "assets": []
+  },
   "dependencies": {
-    "@types/node": "^14.6.0",
-    "@types/underscore": "^1.10.22",
     "jinja-js": "^0.1.8",
+    "lodash": "^4.17.21",
     "moment": "^2.27.0",
-    "typescript": "^4.0.2",
-    "underscore": "^1.10.2",
     "yaml": "^1.10.0"
+  },
+  "devDependencies": {
+    "@types/lodash": "^4.14.172",
+    "@types/node": "^16.6.2",
+    "@typescript-eslint/eslint-plugin": "^4.29.2",
+    "@typescript-eslint/parser": "^4.29.2",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^3.4.0",
+    "pkg": "^5.3.1",
+    "prettier": "^2.3.2",
+    "typescript": "^4.3.5"
   }
 }

run.ts

@@ -2,7 +2,7 @@ import fs from "fs";
 import moment from "moment";
 import jinja from "jinja-js";
 import yaml from "yaml";
-import _ from "underscore";
+import _ from "lodash";
 
 interface Member {
 	name: string;

tsconfig.json

 {
 	"compilerOptions": {
-		"outDir": "build",
+		"outDir": "dist",
 		"module": "commonjs",
 		"target": "esnext",
 		"esModuleInterop": true,
+		"emitDecoratorMetadata": true,
+		"experimentalDecorators": true,
+		"declaration": true,
 		"sourceMap": true
 	},
 	"compileOnSave": true,
 	"allowJs": true,
 	"include": [
-		"*.ts"
+		"*.ts",
+		"src/**/*.ts",
+		"test/**/*.ts"
 	]
 }