Merge pull request #81 from embroider-build/prepare-for-typescript-su…

…pport Prepare for typescript support by moving all the js files into a js folder
embroider-build · Sep 25, 2024 · 3e4aa11 · 3e4aa11
2 parents 6ec50f8 + e2d0c23
commit 3e4aa11
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 4 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -9,9 +9,9 @@ export default [
   },
   {
     files: [
-      'files/app/**/*.js',
-      'files-override/app/**/*.js',
-      'files-override/tests/**/*.js',
+      'files/*/app/**/*.js',
+      'files-override/*/app/**/*.js',
+      'files-override/*/tests/**/*.js',
     ],
     languageOptions: {
       sourceType: 'module',

diff --git a/files-override/.gitignore → files-override/js/.gitignore b/files-override/.gitignore → files-override/js/.gitignore
diff --git a/files-override/app/app.js → files-override/js/app/app.js b/files-override/app/app.js → files-override/js/app/app.js
diff --git a/files-override/ember-cli-build.js → files-override/js/ember-cli-build.js b/files-override/ember-cli-build.js → files-override/js/ember-cli-build.js
diff --git a/files-override/testem.js → files-override/js/testem.js b/files-override/testem.js → files-override/js/testem.js
diff --git a/files-override/tests/index.html → files-override/js/tests/index.html b/files-override/tests/index.html → files-override/js/tests/index.html
diff --git a/files-override/tests/test-helper.js → files-override/js/tests/test-helper.js b/files-override/tests/test-helper.js → files-override/js/tests/test-helper.js
diff --git a/files/app/config/environment.js → files/js/app/config/environment.js b/files/app/config/environment.js → files/js/app/config/environment.js
diff --git a/files/babel.config.cjs → files/js/babel.config.cjs b/files/babel.config.cjs → files/js/babel.config.cjs
diff --git a/files/index.html → files/js/index.html b/files/index.html → files/js/index.html
diff --git a/files/vite.config.mjs → files/js/vite.config.mjs b/files/vite.config.mjs → files/js/vite.config.mjs
diff --git a/index.js b/index.js
@@ -11,6 +11,19 @@ module.exports = {
   locals(options) {
     return appBlueprint.locals(options);
   },
+
+  /**
+   * NOTE: we can't have a "shared" file here,
+   *       as we can with files-override
+   */
+  filesPath(options) {
+    if (options.typescript) {
+      throw new Error(`TypeScript is not yet supported`);
+    }
+
+    return join(this.path, 'files/js');
+  },
+
   beforeInstall(options) {
     if (!appBlueprint) {
       throw new Error('Cannot find app blueprint for generating test-app!');
@@ -76,7 +89,7 @@ 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'),
+      join(__dirname, 'files-override/js'),
       options.target,
       options,
     );