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.

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

Switch to ESM #2028

Merged
merged 40 commits into from
Oct 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
f821f7b
Move all setting files to JS
Chalarangelo Sep 30, 2023
d2055d1
Temporarily remove test files
Chalarangelo Sep 30, 2023
b881fc9
Temporarily remove test env file
Chalarangelo Sep 30, 2023
8758c3c
Temporarily disable test action
Chalarangelo Sep 30, 2023
135dea4
Update jsiqle to 3.0.0
Chalarangelo Sep 30, 2023
76a95ff
Remove babel
Chalarangelo Sep 30, 2023
396c723
Define imports (directory aliases)
Chalarangelo Sep 30, 2023
ac85d28
Clean up scripts
Chalarangelo Sep 30, 2023
cf5d99b
Switch to ESM
Chalarangelo Sep 30, 2023
b2d3d11
Remove redundant packages
Chalarangelo Sep 30, 2023
968123b
Remove node-sass
Chalarangelo Sep 30, 2023
52eaa76
Update components for ESM
Chalarangelo Sep 30, 2023
bfd7171
Update Astro config for ESM
Chalarangelo Sep 30, 2023
3a7a404
Add imports and exports to schema
Chalarangelo Oct 1, 2023
cfcdab3
Update extractor for ESM
Chalarangelo Oct 1, 2023
8a5d91e
Remove JSONHandler#fromGlob
Chalarangelo Oct 1, 2023
8b41eba
Clean up imports in models
Chalarangelo Oct 1, 2023
0dc2de7
Clean up imports in serializers
Chalarangelo Oct 1, 2023
f292f88
Clean up imports in writers
Chalarangelo Oct 1, 2023
d12bd8d
Add writer exports
Chalarangelo Oct 1, 2023
8da5721
Clean up imports in utilities
Chalarangelo Oct 1, 2023
f34e2a3
Add settings exports
Chalarangelo Oct 1, 2023
ee35054
Fix utils imports
Chalarangelo Oct 1, 2023
8a30b2c
Update scripts imports
Chalarangelo Oct 1, 2023
7059e0b
Tidy up application
Chalarangelo Oct 1, 2023
3fa14ec
Bump chalk to 5.3.0
Chalarangelo Oct 1, 2023
b9f1111
Bump fs-extra to 11.1.1
Chalarangelo Oct 1, 2023
a679c91
Add NODE_ENV back to relevant scripts
Chalarangelo Oct 1, 2023
63ef868
Bump glob to 10.3.10
Chalarangelo Oct 1, 2023
3b719c8
Bump syntax-tree dependencies
Chalarangelo Oct 1, 2023
2b3f8fe
Bump prismjs to 1.29.0
Chalarangelo Oct 1, 2023
0e21127
Bump remark and remark-gfm
Chalarangelo Oct 1, 2023
6b9115d
Upgrade to Astro v3.2.0
Chalarangelo Oct 1, 2023
50a874e
Bump sass to 1.68.0
Chalarangelo Oct 1, 2023
6473c0e
Bump sharp to 0.32.6
Chalarangelo Oct 1, 2023
02c7fee
Bump linters
Chalarangelo Oct 1, 2023
ba41828
Update ESLint config
Chalarangelo Oct 1, 2023
d8c9ae4
Update ESLint config to new format
Chalarangelo Oct 1, 2023
4668474
Enable updated ESLint config for VS Code
Chalarangelo Oct 1, 2023
4ce75dd
Bump version to 10.0.0
Chalarangelo Oct 1, 2023
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
20 changes: 0 additions & 20 deletions .babelrc

This file was deleted.

2 changes: 0 additions & 2 deletions .env.test

This file was deleted.

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

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/deploy-production-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
filters: |
web:
- 'src/**'
- '.babelrc'
- 'astro.config.mjs'
- 'netlify.toml'
- 'package-lock.json'
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/test.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@
"**/CONTRIBUTING.md": true,
"**/LICENSE": true,
"**/README.md": true,
}
},
"eslint.experimental.useFlatConfig": true
}
2 changes: 1 addition & 1 deletion astro.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig } from 'astro/config';
import settings from './src/settings/global.json';
import settings from '#settings/global';

// https://astro.build/config
export default defineConfig({
Expand Down
130 changes: 130 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
import js from '@eslint/js';
import eslintConfigPrettier from 'eslint-config-prettier';
import globals from './globals.js';

export default [
js.configs.recommended,
eslintConfigPrettier,
{
languageOptions: {
ecmaVersion: 2023,
sourceType: 'module',
globals: {
...globals,
},
},
rules: {
indent: 'off',
'comma-dangle': [
'error',
{
arrays: 'always-multiline',
objects: 'always-multiline',
imports: 'always-multiline',
exports: 'only-multiline',
functions: 'never',
},
],
quotes: [
'error',
'single',
{
avoidEscape: true,
allowTemplateLiterals: true,
},
],
semi: ['error', 'always'],
'semi-spacing': [
'error',
{
before: false,
after: false,
},
],
'no-trailing-spaces': 'error',
'no-duplicate-imports': 'error',
'no-useless-computed-key': 'error',
'rest-spread-spacing': ['error', 'never'],
'no-console': 'off',
eqeqeq: ['error', 'smart'],
'brace-style': [
'error',
'1tbs',
{
allowSingleLine: true,
},
],
curly: 'off',
'object-shorthand': ['warn', 'always'],
'key-spacing': [
'error',
{
beforeColon: false,
afterColon: true,
mode: 'strict',
},
],
camelcase: [
'warn',
{
properties: 'always',
},
],
'dot-location': ['error', 'property'],
'generator-star-spacing': ['off'],
'block-spacing': ['error', 'always'],
'comma-style': ['error', 'last'],
'comma-spacing': [
'error',
{
before: false,
after: true,
},
],
'no-extend-native': 'error',
'no-loop-func': 'error',
'no-implied-eval': 'error',
'no-iterator': 'error',
'no-label-var': 'error',
'no-multi-str': 'error',
'no-script-url': 'error',
'no-shadow-restricted-names': 'error',
'no-spaced-func': 'error',
'no-sparse-arrays': 'warn',
'no-fallthrough': 'warn',
'no-caller': 'error',
'no-eval': 'error',
'no-multiple-empty-lines': [
'error',
{
max: 2,
maxEOF: 1,
},
],
'no-multi-spaces': [
'error',
{
ignoreEOLComments: true,
},
],
'no-negated-in-lhs': 'error',
'no-new': 'error',
'no-new-require': 'error',
'block-scoped-var': 'error',
'no-use-before-define': 'warn',
'no-proto': 'error',
complexity: ['warn', 50],
'wrap-iife': ['error', 'outside'],
'new-parens': 'error',
'space-infix-ops': 'error',
'eol-last': ['error', 'always'],
'space-unary-ops': 'error',
'arrow-parens': ['error', 'as-needed'],
'arrow-spacing': 'error',
'space-before-blocks': ['error', 'always'],
yoda: ['error', 'never'],
'space-before-function-paren': 'off',
'spaced-comment': ['error', 'always'],
},
},
];
Loading
Loading