chore: pull base branch and fix conflicts

emulsify-ds · Aug 28, 2024 · 6a852fe · 6a852fe
2 parents d6e70d7 + a30a458
commit 6a852fe
Show file tree

Hide file tree

Showing 338 changed files with 28,105 additions and 56,511 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.yml b/.eslintrc.yml
diff --git a/.gitignore b/.gitignore
@@ -41,6 +41,10 @@ build/Release
 node_modules/
 jspm_packages/
 
+# Drupal compiled components
+components/
+!src/components/
+
 # TypeScript v1 declaration files
 typings/
 
@@ -99,6 +103,7 @@ dist
 
 # DynamoDB Local files
 .dynamodb/
+.history/
 
 # TernJS port file
 .tern-port

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16.13
+20
diff --git a/.prettierignore b/.prettierignore
diff --git a/.storybook/_drupal.js b/.storybook/_drupal.js
diff --git a/.storybook/main.js b/.storybook/main.js
diff --git a/.storybook/manager-head.html b/.storybook/manager-head.html
diff --git a/.storybook/manager.js b/.storybook/manager.js
diff --git a/.storybook/preview.js b/.storybook/preview.js
diff --git a/.storybook/setupTwig.js b/.storybook/setupTwig.js
diff --git a/.storybook/setupTwig.test.js b/.storybook/setupTwig.test.js