Merge pull request #99 from embroider-build/prepare-for-ts-via-shared…

…-directory Move more files to the files-override/shared folder
embroider-build · Oct 7, 2024 · 117c16d · 117c16d
2 parents ec657eb + 39dec37
commit 117c16d
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 2 deletions.
diff --git a/files-override/js/.gitignore → files-override/shared/.gitignore b/files-override/js/.gitignore → files-override/shared/.gitignore
diff --git a/files-override/shared/.prettierrc.cjs b/files-override/shared/.prettierrc.cjs
@@ -2,14 +2,20 @@
 
 module.exports = {
   plugins: ['prettier-plugin-ember-template-tag'],
+  singleQuote: true,
   overrides: [
     {
       files: ['*.js', '*.ts', '*.cjs', '.mjs', '.cts', '.mts', '.cts'],
       options: {
-        singleQuote: true,
         trailingComma: 'es5',
       },
     },
+    {
+      files: ['*.html'],
+      options: {
+        singleQuote: false,
+      },
+    },
     {
       files: ['*.json'],
       options: {
@@ -25,7 +31,6 @@ module.exports = {
     {
       files: ['*.gjs', '*.gts'],
       options: {
-        singleQuote: true,
         templateSingleQuote: false,
         trailingComma: 'es5',
       },

diff --git a/files/js/app/config/environment.js → ...override/shared/app/config/environment.js b/files/js/app/config/environment.js → ...override/shared/app/config/environment.js
diff --git a/files-override/js/ember-cli-build.js → files-override/shared/ember-cli-build.js b/files-override/js/ember-cli-build.js → files-override/shared/ember-cli-build.js
diff --git a/files/js/index.html → files-override/shared/index.html b/files/js/index.html → files-override/shared/index.html
diff --git a/files-override/js/testem.js → files-override/shared/testem.js b/files-override/js/testem.js → files-override/shared/testem.js
diff --git a/files-override/js/tests/index.html → files-override/shared/tests/index.html b/files-override/js/tests/index.html → files-override/shared/tests/index.html
diff --git a/files/js/vite.config.mjs → files-override/shared/vite.config.mjs b/files/js/vite.config.mjs → files-override/shared/vite.config.mjs
diff --git a/index.js b/index.js
@@ -112,6 +112,12 @@ module.exports = {
 
     // there doesn't seem to be a way to tell ember-cli to not prompt to override files that were added in the beforeInstall
     // so I'm just copying a few over at this stage
+    copyWithTemplate(
+      join(__dirname, 'files-override/shared'),
+      options.target,
+      options,
+    );
+
     copyWithTemplate(
       join(__dirname, 'files-override/js'),
       options.target,