Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
bbcabab
Remove non-det
leeyi45 Oct 9, 2024
47b83cf
Continue removing non-det
leeyi45 Oct 9, 2024
b77b2ec
Update eslint and fix linting errors
leeyi45 Oct 11, 2024
7a8133a
Fix bug where cleaning docs would remove the gitignore
leeyi45 Oct 11, 2024
af91f2b
Add ts-check and tseslint helper as requested
leeyi45 Oct 11, 2024
a06bb43
Add explanation for ts-expect-error
leeyi45 Oct 11, 2024
cf9ea38
Remove jsdoc stuff pertaining to non-det
leeyi45 Oct 11, 2024
cabdfe1
Remove from non-det from the script
leeyi45 Oct 11, 2024
dff60b0
Merge branch 'remove-non-det' of github.com:source-academy/js-slang i…
leeyi45 Oct 12, 2024
49b6000
Replace docs scripts with javascript code
leeyi45 Oct 13, 2024
474bd64
Misc change
leeyi45 Oct 13, 2024
d419bdd
Get make to output to stdio
leeyi45 Oct 13, 2024
a0a2e3a
Update to use the proper functions from child_process
leeyi45 Oct 13, 2024
d9b4ba6
Add documentation and silent option for prepare
leeyi45 Oct 13, 2024
5685d4d
Make autocomplete exit with error code
leeyi45 Oct 16, 2024
04ac630
Put the query parameter back for module importing
leeyi45 Oct 18, 2024
d32fc4f
Merge remote-tracking branch 'origin/master' into remove-non-det
leeyi45 Nov 24, 2024
db1fb91
Merge remote-tracking branch 'origin/master' into remove-non-det
leeyi45 Dec 25, 2024
281a20e
Finish merge
leeyi45 Dec 30, 2024
b80a9a5
Merge branch 'remove-non-det' of github.com:source-academy/js-slang i…
leeyi45 Jan 10, 2025
b2e26fb
Merge main
leeyi45 Jan 22, 2025
9514256
Update eslint import
leeyi45 Jan 23, 2025
eda9b09
Merge branch 'remove-non-det' of github.com:source-academy/js-slang i…
leeyi45 Jan 24, 2025
172b796
Merge remote-tracking branch 'origin/master' into remove-non-det
leeyi45 Feb 18, 2025
8fcd02d
Merge from main
leeyi45 Feb 18, 2025
ecb9925
Merge commit '07f1f877a0447ac40a5a741511ffb8984ceaf5ad' into remove-n…
leeyi45 Feb 20, 2025
2dc951a
Update docs
leeyi45 Feb 25, 2025
26a8779
Merge commit '1ec766986e552f9e0d08e1075510838671117e1d' into remove-n…
leeyi45 Feb 27, 2025
f956613
Update scm-slang
s-kybound Feb 27, 2025
7a63ac3
Merge branch 'remove-non-det' of https://github.com/source-academy/js…
s-kybound Feb 27, 2025
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
3 changes: 0 additions & 3 deletions .eslintignore

This file was deleted.

65 changes: 0 additions & 65 deletions .eslintrc.json

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
node_modules
*.js
!eslint.config.js
!docs/jsdoc/templates/**/*.js
!docs/lib/**/*.js
*.map
Expand Down
75 changes: 75 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import tseslint from 'typescript-eslint'
import globals from 'globals'
import importPlugin from 'eslint-plugin-import'

/**
* @type {import('eslint').Linter.FlatConfig[]}
*/
export default [
{
// global ignores
ignores: ['dist', 'src/alt-langs', 'src/py-slang', 'src/__tests__/sicp', '**/*.snap']
},
...tseslint.configs.recommended,
{
files: ['**/*.ts*'],
languageOptions: {
globals: {
...globals.node,
...globals.es2016,
...globals.browser
},
parser: tseslint.parser,
parserOptions: {
project: './tsconfig.json'
}
},
plugins: {
'@typescript-eslint': tseslint.plugin,
import: importPlugin
},
rules: {
'import/no-duplicates': ['warn', { 'prefer-inline': true }],
'import/order': 'warn',
'@typescript-eslint/no-base-to-string': 'off', // TODO: Remove
'prefer-const': 'off', // TODO: Remove
'no-var': 'off', // TODO: Remove
'@typescript-eslint/ban-ts-comment': 'warn',
'@typescript-eslint/ban-types': 'off',
'@typescript-eslint/camelcase': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/no-duplicate-type-constituents': 'off',
'@typescript-eslint/no-empty-function': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-floating-promises': 'off',
'@typescript-eslint/no-implied-eval': 'off',
'@typescript-eslint/no-inferrable-types': 'off',
'@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/no-redundant-type-constituents': 'off',
'@typescript-eslint/no-unnecessary-type-assertion': 'off',
'@typescript-eslint/no-unsafe-argument': 'off',
'@typescript-eslint/no-unsafe-assignment': 'off',
'@typescript-eslint/no-unsafe-call': 'off',
'@typescript-eslint/no-unsafe-enum-comparison': 'off',
'@typescript-eslint/no-unsafe-function-type': 'off',
'@typescript-eslint/no-unsafe-member-access': 'off',
'@typescript-eslint/no-unsafe-return': 'off',
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/require-await': 'error',
'@typescript-eslint/restrict-plus-operands': 'off',
'@typescript-eslint/restrict-template-expressions': 'off',
'@typescript-eslint/unbound-method': 'off',
'prefer-rest-params': 'off'
}
},
{
files: ['**/*.js', 'src/repl/*.ts'],
rules: {
'@typescript-eslint/no-require-imports': 'off'
}
}
]
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"scripts": {
"build": "yarn docs && yarn build:slang",
"build:slang": "tsc --project tsconfig.prod.json",
"eslint": "eslint --ext \".ts,.tsx\" src",
"eslint": "eslint src",
"format": "prettier --write \"src/**/*.{ts,tsx}\"",
"format:ci": "prettier --list-different \"src/**/*.{ts,tsx}\"",
"test": "jest",
Expand All @@ -72,14 +72,12 @@
"@types/lodash": "^4.14.202",
"@types/node": "^20.0.0",
"@types/offscreencanvas": "^2019.7.0",
"@typescript-eslint/eslint-plugin": "^7.3.1",
"@typescript-eslint/parser": "^7.3.1",
"ace-builds": "^1.4.12",
"coveralls": "^3.1.0",
"escodegen": "^2.0.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"globals": "^15.11.0",
"husky": "^8.0.1",
"jest": "^29.0.0",
"jest-environment-jsdom": "^29.0.0",
Expand All @@ -88,7 +86,8 @@
"jsdom": "^19.0.0",
"prettier": "^2.1.2",
"ts-jest": "^29.0.0",
"typescript": "^4.0.3"
"typescript": "^4.0.3",
"typescript-eslint": "^8.8.1"
},
"jest": {
"snapshotFormat": {
Expand Down
1 change: 0 additions & 1 deletion scripts/autocomplete.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ targets = [
"source_2_lazy",
"source_3",
"source_3_concurrent",
"source_3_non-det",
"source_4",
"source_4_explicit-control"
"External libraries",
Expand Down
15 changes: 0 additions & 15 deletions scripts/jsdoc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -130,21 +130,6 @@ run() {
${LIB}/pairmutator.js \
${LIB}/concurrency.js

# Source §3 Non-Det

${JSDOC} -r -t ${TMPL} \
-c docs/jsdoc/conf.json \
-R ${MD}/README_3_NON-DET.md \
-d ${DST}/"source_3_non-det"/ \
${LIB}/auxiliary.js \
${LIB}/misc.js \
${LIB}/math.js \
${LIB}/list.js \
${LIB}/stream.js \
${LIB}/array.js \
${LIB}/pairmutator.js \
${LIB}/non-det.js

# Source §3 Typed

${JSDOC} -r -t ${TMPL} \
Expand Down
1 change: 0 additions & 1 deletion scripts/updateAutocompleteDocs.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const TARGETS = [
"source_2_typed",
"source_3",
"source_3_concurrent",
"source_3_non-det",
"source_3_typed",
"source_4",
"source_4_typed",
Expand Down
Loading
Loading