Skip to content

Commit

Permalink
Merge branch 'master' into tsdoc
Browse files Browse the repository at this point in the history
  • Loading branch information
obiot authored Jun 24, 2024
2 parents d1ca0e2 + 3dff2ea commit 0dad62d
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 7 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Test
on: [push]
jobs:
test:
strategy:
matrix:
node: [20, 22]
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
name: Node ${{ matrix.node }} on ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- run: npm ci
- run: npm run build
- run: npm test
5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"dbaeumer.vscode-eslint"
]
}
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"files.eol": "\n"
"files.eol": "\n",
"editor.codeActionsOnSave": {
"source.fixAll": "explicit"
}
}
4 changes: 2 additions & 2 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ export default [
{
name: "eslint/global-rules",
languageOptions: {
"ecmaVersion" : 2020,
"ecmaVersion" : 2022,
"sourceType": "module",
globals: {
...globals.browser
}
},
files: ["src/**/*.js"],
files: ["src/**/*.js", "scripts/**"],
plugins: {
jsdoc,
'@stylistic': stylistic
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@
"scripts": {
"build": "npm run lint && rollup -c --silent",
"build:cd": "npm run lint && rollup -c --failAfterWarnings",
"dist": " npm run clean && npm run build && mkdirp dist && cp -fR build/*.* dist/ && npm run types",
"dist": " npm run clean && npm run build && mkdirp dist && node scripts/dist.js && npm run types && npm run doc",
"lint": "eslint",
"pretest": "mkdirp tests/browser/public/lib && cp -f build/melonjs.module.js tests/browser/public/lib",
"pretest": "mkdirp tests/browser/public/lib && node scripts/pretest.js",
"test": "npm run test-node && mocha ./tests/browser/spec/*.js --reporter spec --bail --timeout 10000",
"test-node": "node build/melonjs.module.js",
"doc": "typedoc src/index.js",
Expand All @@ -101,5 +101,6 @@
"prepublishOnly": "npm run dist && npm run test",
"clean": "del-cli --force build/*.* dist/**",
"types": "tsc"
}
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion rollup.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import bundleSize from "rollup-plugin-bundle-size";
import commonjs from "@rollup/plugin-commonjs";
import resolve from "@rollup/plugin-node-resolve";
import json from '@rollup/plugin-json';
import pkg from "./package.json" assert { type: 'json' };
import pkg from "./package.json" with { type: 'json' };

// credit/license information
const license = [
Expand Down
3 changes: 3 additions & 0 deletions scripts/dist.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { cp } from "node:fs/promises";

await cp("build", "dist", {recursive:true});
3 changes: 3 additions & 0 deletions scripts/pretest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { cp } from "node:fs/promises";

await cp("./build/melonjs.module.js", "./tests/browser/public/lib/melonjs.module.js");

0 comments on commit 0dad62d

Please sign in to comment.