Skip to content

Commit

Permalink
Merge remote-tracking branch 'misskey-dev/develop' into io
Browse files Browse the repository at this point in the history
  • Loading branch information
u1-liquid committed Jan 22, 2024
2 parents d8d2188 + af2d81a commit d956eab
Show file tree
Hide file tree
Showing 10 changed files with 141 additions and 93 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,6 @@ jobs:
- run: pnpm i --frozen-lockfile
- run: pnpm --filter misskey-js run build
if: ${{ matrix.workspace == 'backend' }}
- run: pnpm --filter misskey-reversi run build
- run: pnpm --filter misskey-reversi run build:tsc
if: ${{ matrix.workspace == 'backend' }}
- run: pnpm --filter ${{ matrix.workspace }} run typecheck
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"sharp": "0.33.2"
},
"dependencies": {
"execa": "8.0.1",
"cssnano": "6.0.3",
"execa": "8.0.1",
"js-yaml": "4.1.0",
"postcss": "8.4.33",
"terser": "5.27.0",
Expand All @@ -64,8 +64,8 @@
"cross-env": "7.0.3",
"cypress": "13.6.3",
"eslint": "8.56.0",
"start-server-and-test": "2.0.3",
"ncp": "2.0.0"
"ncp": "2.0.0",
"start-server-and-test": "2.0.3"
},
"optionalDependencies": {
"@tensorflow/tfjs-core": "4.4.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
"slacc": "0.0.10",
"strict-event-emitter-types": "2.0.0",
"stringz": "2.1.0",
"systeminformation": "5.21.23",
"systeminformation": "5.21.24",
"tinycolor2": "1.6.0",
"tmp": "0.2.1",
"tsc-alias": "1.8.8",
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"@syuilo/aiscript": "0.17.0",
"@tabler/icons-webfont": "2.46.0",
"@twemoji/parser": "15.0.0",
"@vitejs/plugin-vue": "5.0.2",
"@vue/compiler-sfc": "3.4.3",
"@vitejs/plugin-vue": "5.0.3",
"@vue/compiler-sfc": "3.4.15",
"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.0.6",
"astring": "1.8.6",
"broadcast-channel": "7.0.0",
Expand Down Expand Up @@ -66,7 +66,7 @@
"shiki": "0.14.7",
"strict-event-emitter-types": "2.0.0",
"textarea-caret": "3.1.0",
"three": "0.160.0",
"three": "0.160.1",
"throttle-debounce": "5.0.0",
"tinycolor2": "1.6.0",
"tsc-alias": "1.8.8",
Expand Down Expand Up @@ -125,7 +125,7 @@
"happy-dom": "10.0.3",
"intersection-observer": "0.12.2",
"micromatch": "4.0.5",
"msw": "2.1.2",
"msw": "2.1.3",
"msw-storybook-addon": "1.10.0",
"nodemon": "3.0.3",
"prettier": "3.2.4",
Expand Down
31 changes: 31 additions & 0 deletions packages/misskey-bubble-game/build.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { build } from "esbuild";
import { globSync } from "glob";

const entryPoints = globSync("./src/**/**.{ts,tsx}");

/** @type {import('esbuild').BuildOptions} */
const options = {
entryPoints,
minify: true,
outdir: "./built/esm",
target: "es2022",
platform: "browser",
format: "esm",
};

if (process.env.WATCH === "true") {
options.watch = {
onRebuild(error, result) {
if (error) {
console.error("watch build failed:", error);
} else {
console.log("watch build succeeded:", result);
}
},
};
}

build(options).catch((err) => {
process.stderr.write(err.stderr);
process.exit(1);
});
17 changes: 10 additions & 7 deletions packages/misskey-bubble-game/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,21 @@
}
},
"scripts": {
"build": "npm run ts",
"ts": "npm run ts-esm && npm run ts-dts",
"ts-esm": "tsc --outDir built/esm",
"ts-dts": "tsc --outDir built/dts --declaration true --emitDeclarationOnly true --declarationMap true",
"watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run build\"",
"build": "node ./build.js",
"build:tsc": "npm run tsc",
"tsc": "npm run ts-esm && npm run ts-dts",
"tsc-esm": "tsc --outDir built/esm",
"tsc-dts": "tsc --outDir built/dts --declaration true --emitDeclarationOnly true --declarationMap true",
"watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run build:tsc\"",
"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
"typecheck": "tsc --noEmit",
"lint": "pnpm typecheck && pnpm eslint"
},
"devDependencies": {
"@misskey-dev/eslint-plugin": "1.0.0",
"@types/matter-js": "0.19.6",
"@types/node": "20.11.5",
"@types/seedrandom": "3.0.8",
"@typescript-eslint/eslint-plugin": "6.18.1",
"@typescript-eslint/parser": "6.18.1",
"eslint": "8.56.0",
Expand All @@ -35,9 +38,9 @@
"built"
],
"dependencies": {
"@types/matter-js": "0.19.6",
"@types/seedrandom": "3.0.8",
"esbuild": "0.19.11",
"eventemitter3": "5.0.1",
"glob": "^10.3.10",
"matter-js": "0.19.0",
"seedrandom": "3.0.5"
}
Expand Down
1 change: 1 addition & 0 deletions packages/misskey-reversi/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
root: true,
parserOptions: {
tsconfigRootDir: __dirname,
project: ['./tsconfig.json'],
Expand Down
31 changes: 31 additions & 0 deletions packages/misskey-reversi/build.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { build } from "esbuild";
import { globSync } from "glob";

const entryPoints = globSync("./src/**/**.{ts,tsx}");

/** @type {import('esbuild').BuildOptions} */
const options = {
entryPoints,
minify: true,
outdir: "./built/esm",
target: "es2022",
platform: "browser",
format: "esm",
};

if (process.env.WATCH === "true") {
options.watch = {
onRebuild(error, result) {
if (error) {
console.error("watch build failed:", error);
} else {
console.log("watch build succeeded:", result);
}
},
};
}

build(options).catch((err) => {
process.stderr.write(err.stderr);
process.exit(1);
});
15 changes: 10 additions & 5 deletions packages/misskey-reversi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
}
},
"scripts": {
"build": "npm run ts",
"ts": "npm run ts-esm && npm run ts-dts",
"ts-esm": "tsc --outDir built/esm",
"ts-dts": "tsc --outDir built/dts --declaration true --emitDeclarationOnly true --declarationMap true",
"watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run build\"",
"build": "node ./build.js",
"build:tsc": "npm run ts",
"tsc": "npm run ts-esm && npm run ts-dts",
"tsc-esm": "tsc --outDir built/esm",
"tsc-dts": "tsc --outDir built/dts --declaration true --emitDeclarationOnly true --declarationMap true",
"watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run build:tsc\"",
"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
"typecheck": "tsc --noEmit",
"lint": "pnpm typecheck && pnpm eslint"
Expand All @@ -31,6 +32,10 @@
"nodemon": "3.0.3",
"typescript": "5.3.3"
},
"dependencies": {
"esbuild": "0.19.11",
"glob": "^10.3.10"
},
"files": [
"built"
]
Expand Down
Loading

0 comments on commit d956eab

Please sign in to comment.