Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging master into node20 #274

Closed
wants to merge 3 commits into from
Closed

Merging master into node20 #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2ccd5e
Update Repository to Node 20 (#271)
leeyi45 Jan 26, 2024
32242aa
Revert "Update Repository to Node 20" (#272)
RichDom2185 Jan 27, 2024
4299464
Resolve line ending issues (#273)
sayomaki Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .editorconfig
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions .eslintrc.base.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,10 @@ module.exports = {
'key-spacing': 1,
'keyword-spacing': 1,
// "line-comment-position": 0,
'linebreak-style': [
1,
'windows', // Was "unix"
],
// 'linebreak-style': [
// 1,
// 'windows', // Was "unix"
// ],
// "lines-around-comment": 0,
// "lines-between-class-members": 0,
// "max-len": 0,
Expand Down
8 changes: 0 additions & 8 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,3 @@
## Src: https://docs.github.com/en/get-started/getting-started-with-git/configuring-git-to-handle-line-endings#per-repository-settings
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Declare files that will always have CRLF line endings on checkout.
*.js text eol=crlf
*.ts text eol=crlf
*.tsx text eol=crlf
*.md text eol=crlf
*.cjs text eol=crlf
*.json text eol=crlf
8 changes: 4 additions & 4 deletions .husky/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
yarn test --color
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn test --color
272 changes: 136 additions & 136 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,136 +1,136 @@
{
"private": true,
"name": "modules",
"version": "1.0.0",
"repository": "https://github.com/source-academy/modules.git",
"license": "Apache-2.0",
"scripts-info": {
"//NOTE": "Run `npm i npm-scripts-info -g` to install once globally, then run `npm-scripts-info` as needed to list these descriptions",
"create": "Interactively initialise a new bundle or tab from their templates",
"devserver": "Start the tab development server",
"devserver:lint": "Lint code related to the dev server",
"devserver:tsc": "Run tsc over dev server code",
"docs": "Build only documentation",
"lint": "Lint bundle and tab code",
"build": "Lint code, then build modules and documentation",
"build:help": "Show help for the build scripts",
"serve": "Start the HTTP server to serve all files in `build/`, with the same directory structure",
"scripts": "Run a script within the scripts directory",
"scripts:build": "Compile build scripts",
"scripts:lint": "Lint build script code",
"prepare": "Enable git hooks",
"test": "Run unit tests",
"test:watch": "Watch files for changes and rerun tests related to changed files",
"dev": "Build bundles and tabs only, then serve. Skips linting / type checking, does not build jsons and HTML docs. For rapid testing during development",
"watch": "Watch files for changes and rebuild on those changes",
"postinstall": "Install all patches to node_modules packages"
},
"type": "module",
"scripts": {
"build": "yarn scripts build",
"build:help": "yarn scripts build --help",
"create": "yarn scripts create",
"dev": "yarn scripts build modules && yarn serve",
"docs": "yarn scripts build docs",
"lint": "yarn scripts lint",
"prepare": "husky install",
"postinstall": "patch-package && yarn scripts:build",
"scripts": "node --max-old-space-size=4096 scripts/bin.js",
"serve": "http-server --cors=* -c-1 -p 8022 ./build",
"test": "yarn scripts test",
"test:all": "yarn test && yarn scripts:test",
"test:watch": "yarn scripts test --watch",
"watch": "yarn scripts watch",
"devserver": "vite",
"devserver:lint": "yarn scripts devserver lint",
"devserver:tsc": "tsc --project devserver/tsconfig.json",
"scripts:all": "node scripts/scripts_manager.js",
"scripts:build": "node scripts/scripts_manager.js build",
"scripts:lint": "node scripts/scripts_manager.js lint",
"scripts:tsc": "tsc --project scripts/src/tsconfig.json",
"scripts:test": "node scripts/scripts_manager.js test"
},
"devDependencies": {
"@types/dom-mediacapture-record": "^1.0.11",
"@types/eslint": "^8.4.10",
"@types/estree": "^1.0.0",
"@types/jest": "^27.4.1",
"@types/lodash": "^4.14.198",
"@types/node": "^20.8.9",
"@types/plotly.js-dist": "npm:@types/plotly.js",
"@types/react": "^18.2.0",
"@types/react-dom": "^18.2.0",
"@typescript-eslint/eslint-plugin": "^6.6.0",
"@typescript-eslint/parser": "^6.6.0",
"@vitejs/plugin-react": "^4.0.4",
"acorn": "^8.8.1",
"acorn-jsx": "^5.3.2",
"astring": "^1.8.4",
"chalk": "^5.0.1",
"commander": "^9.4.0",
"console-table-printer": "^2.11.1",
"cross-env": "^7.0.3",
"esbuild": "^0.18.20",
"eslint": "^8.21.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-import-resolver-typescript": "^2.7.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.8.1",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.4.0",
"eslint-plugin-simple-import-sort": "^8.0.0",
"http-server": "^0.12.3",
"husky": "5",
"jest": "^29.4.1",
"jest-environment-jsdom": "^29.4.1",
"re-resizable": "^6.9.11",
"react-hotkeys": "^2.0.0",
"react-responsive": "^9.0.2",
"sass": "^1.66.1",
"ts-jest": "^29.1.1",
"typedoc": "^0.25.1",
"typescript": "5.0",
"vite": "^4.5.2",
"yarnhook": "^0.5.1"
},
"dependencies": {
"@blueprintjs/core": "^4.20.2",
"@blueprintjs/icons": "^4.4.0",
"@blueprintjs/popover2": "^1.4.3",
"@box2d/core": "^0.10.0",
"@box2d/debug-draw": "^0.10.0",
"@jscad/modeling": "2.9.6",
"@jscad/regl-renderer": "^2.6.1",
"@jscad/stl-serializer": "^2.1.13",
"ace-builds": "^1.25.1",
"classnames": "^2.3.1",
"dayjs": "^1.10.4",
"gl-matrix": "^3.3.0",
"js-slang": "^1.0.20",
"lodash": "^4.17.21",
"patch-package": "^6.5.1",
"phaser": "^3.54.0",
"plotly.js-dist": "^2.17.1",
"postinstall-postinstall": "^2.1.0",
"react": "^18.2.0",
"react-ace": "^10.1.0",
"react-dom": "^18.2.0",
"regl": "^2.1.0",
"save-file": "^2.3.1",
"source-academy-utils": "^1.0.0",
"source-academy-wabt": "^1.0.4",
"tslib": "^2.3.1"
},
"jest": {
"projects": [
"src/jest.config.js",
"scripts/src/jest.config.js"
]
},
"resolutions": {
"@types/react": "^18.2.0",
"esbuild": "^0.18.20"
}
}
{
"private": true,
"name": "modules",
"version": "1.0.0",
"repository": "https://github.com/source-academy/modules.git",
"license": "Apache-2.0",
"scripts-info": {
"//NOTE": "Run `npm i npm-scripts-info -g` to install once globally, then run `npm-scripts-info` as needed to list these descriptions",
"create": "Interactively initialise a new bundle or tab from their templates",
"devserver": "Start the tab development server",
"devserver:lint": "Lint code related to the dev server",
"devserver:tsc": "Run tsc over dev server code",
"docs": "Build only documentation",
"lint": "Lint bundle and tab code",
"build": "Lint code, then build modules and documentation",
"build:help": "Show help for the build scripts",
"serve": "Start the HTTP server to serve all files in `build/`, with the same directory structure",
"scripts": "Run a script within the scripts directory",
"scripts:build": "Compile build scripts",
"scripts:lint": "Lint build script code",
"prepare": "Enable git hooks",
"test": "Run unit tests",
"test:watch": "Watch files for changes and rerun tests related to changed files",
"dev": "Build bundles and tabs only, then serve. Skips linting / type checking, does not build jsons and HTML docs. For rapid testing during development",
"watch": "Watch files for changes and rebuild on those changes",
"postinstall": "Install all patches to node_modules packages"
},
"type": "module",
"scripts": {
"build": "yarn scripts build",
"build:help": "yarn scripts build --help",
"create": "yarn scripts create",
"dev": "yarn scripts build modules && yarn serve",
"docs": "yarn scripts build docs",
"lint": "yarn scripts lint",
"prepare": "husky install",
"postinstall": "patch-package && yarn scripts:build",
"scripts": "node --max-old-space-size=4096 scripts/bin.js",
"serve": "http-server --cors=* -c-1 -p 8022 ./build",
"test": "yarn scripts test",
"test:all": "yarn test && yarn scripts:test",
"test:watch": "yarn scripts test --watch",
"watch": "yarn scripts watch",
"devserver": "vite",
"devserver:lint": "yarn scripts devserver lint",
"devserver:tsc": "tsc --project devserver/tsconfig.json",
"scripts:all": "node scripts/scripts_manager.js",
"scripts:build": "node scripts/scripts_manager.js build",
"scripts:lint": "node scripts/scripts_manager.js lint",
"scripts:tsc": "tsc --project scripts/src/tsconfig.json",
"scripts:test": "node scripts/scripts_manager.js test"
},
"devDependencies": {
"@types/dom-mediacapture-record": "^1.0.11",
"@types/eslint": "^8.4.10",
"@types/estree": "^1.0.0",
"@types/jest": "^27.4.1",
"@types/lodash": "^4.14.198",
"@types/node": "^20.8.9",
"@types/plotly.js-dist": "npm:@types/plotly.js",
"@types/react": "^18.2.0",
"@types/react-dom": "^18.2.0",
"@typescript-eslint/eslint-plugin": "^6.6.0",
"@typescript-eslint/parser": "^6.6.0",
"@vitejs/plugin-react": "^4.0.4",
"acorn": "^8.8.1",
"acorn-jsx": "^5.3.2",
"astring": "^1.8.4",
"chalk": "^5.0.1",
"commander": "^9.4.0",
"console-table-printer": "^2.11.1",
"cross-env": "^7.0.3",
"esbuild": "^0.18.20",
"eslint": "^8.21.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-import-resolver-typescript": "^2.7.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.8.1",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.4.0",
"eslint-plugin-simple-import-sort": "^8.0.0",
"http-server": "^0.12.3",
"husky": "5",
"jest": "^29.4.1",
"jest-environment-jsdom": "^29.4.1",
"re-resizable": "^6.9.11",
"react-hotkeys": "^2.0.0",
"react-responsive": "^9.0.2",
"sass": "^1.66.1",
"ts-jest": "^29.1.1",
"typedoc": "^0.25.1",
"typescript": "5.0",
"vite": "^4.5.2",
"yarnhook": "^0.5.1"
},
"dependencies": {
"@blueprintjs/core": "^4.20.2",
"@blueprintjs/icons": "^4.4.0",
"@blueprintjs/popover2": "^1.4.3",
"@box2d/core": "^0.10.0",
"@box2d/debug-draw": "^0.10.0",
"@jscad/modeling": "2.9.6",
"@jscad/regl-renderer": "^2.6.1",
"@jscad/stl-serializer": "^2.1.13",
"ace-builds": "^1.25.1",
"classnames": "^2.3.1",
"dayjs": "^1.10.4",
"gl-matrix": "^3.3.0",
"js-slang": "^1.0.20",
"lodash": "^4.17.21",
"patch-package": "^6.5.1",
"phaser": "^3.54.0",
"plotly.js-dist": "^2.17.1",
"postinstall-postinstall": "^2.1.0",
"react": "^18.2.0",
"react-ace": "^10.1.0",
"react-dom": "^18.2.0",
"regl": "^2.1.0",
"save-file": "^2.3.1",
"source-academy-utils": "^1.0.0",
"source-academy-wabt": "^1.0.4",
"tslib": "^2.3.1"
},
"jest": {
"projects": [
"src/jest.config.js",
"scripts/src/jest.config.js"
]
},
"resolutions": {
"@types/react": "^18.2.0",
"esbuild": "^0.18.20"
}
}
Loading
Loading