Merge branch 'main' into feature/4229-Better-project-template-selection

* main: #4150 - Upgrade dependencies
inception-project · Oct 8, 2023 · 57cc57d · 57cc57d
2 parents df5a645 + 82fe61f
commit 57cc57d
Show file tree

Hide file tree

Showing 53 changed files with 6,614 additions and 5,990 deletions.
diff --git a/inception/inception-bootstrap/src/main/ts/.eslintrc.yml b/inception/inception-bootstrap/src/main/ts/.eslintrc.yml
@@ -4,11 +4,21 @@ env:
   mocha: true
 extends:
   - standard
+  - plugin:svelte/recommended
 parser: '@typescript-eslint/parser'
 parserOptions:
   ecmaVersion: latest
   sourceType: module
+  extraFileExtensions: ['.svelte']
 plugins:
   - '@typescript-eslint'
+  - 'chai-friendly'
+overrides:
+  - files: ['*.svelte']
+    parser: svelte-eslint-parser
+    parserOptions:
+      parser: '@typescript-eslint/parser'
 rules: {
+  "no-unused-expressions": 0,
+  "chai-friendly/no-unused-expressions": 2
 }
diff --git a/inception/inception-bootstrap/src/main/ts_template/package-lock.json b/inception/inception-bootstrap/src/main/ts_template/package-lock.json
diff --git a/inception/inception-brat-editor/src/main/ts/.eslintrc.yml b/inception/inception-brat-editor/src/main/ts/.eslintrc.yml
@@ -4,13 +4,20 @@ env:
   mocha: true
 extends:
   - standard
+  - plugin:svelte/recommended
 parser: '@typescript-eslint/parser'
 parserOptions:
   ecmaVersion: latest
   sourceType: module
+  extraFileExtensions: ['.svelte']
 plugins:
   - '@typescript-eslint'
   - 'chai-friendly'
+overrides:
+  - files: ['*.svelte']
+    parser: svelte-eslint-parser
+    parserOptions:
+      parser: '@typescript-eslint/parser'
 rules: {
   "no-unused-expressions": 0,
   "chai-friendly/no-unused-expressions": 2

diff --git a/inception/inception-brat-editor/src/main/ts/esbuild-runner.config.js b/inception/inception-brat-editor/src/main/ts/esbuild-runner.config.js
@@ -17,16 +17,14 @@
  */
 const esbuildSvelte = require('esbuild-svelte')
 const sveltePreprocess = require('svelte-preprocess')
-const { sassPlugin } = require('esbuild-sass-plugin')
 
 module.exports = {
-  type: 'bundle',
+  type: 'bundle', // bundle or transform (see description above)
   esbuild: {
     target: 'es2018',
     plugins: [
-      sassPlugin(),
       esbuildSvelte({
-        compilerOptions: { css: true },
+        compilerOptions: { css: 'injected' },
         preprocess: sveltePreprocess({ sourceMap: true })
       })
     ]