test(scaffold): update tests to expect 48 files instead of 19

packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js

@@ -45,8 +45,8 @@ describe('in javascript (default) mode', () => {
     })
   })
 
-  test('returns exactly 19 files', async () => {
-    expect(Object.keys(files).length).toEqual(19)
+  test('returns exactly 48 files', async () => {
+    expect(Object.keys(files).length).toEqual(48)
   })
   // SDL
 
@@ -466,8 +466,8 @@ describe('in typescript mode', () => {
     })
   })
 
-  test('returns exactly 19 files', () => {
-    expect(Object.keys(tsFiles).length).toEqual(19)
+  test('returns exactly 48 files', () => {
+    expect(Object.keys(tsFiles).length).toEqual(48)
   })
 
   // SDL

packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js

@@ -27,8 +27,8 @@ describe('in javascript (default) mode', () => {
     })
   })
 
-  test('returns exactly 19 files', () => {
-    expect(Object.keys(files).length).toEqual(19)
+  test('returns exactly 48 files', () => {
+    expect(Object.keys(files).length).toEqual(48)
   })
   // SDL
 
@@ -308,8 +308,8 @@ describe('in typescript mode', () => {
     })
   })
 
-  test('returns exactly 19 files', () => {
-    expect(Object.keys(tsFiles).length).toEqual(19)
+  test('returns exactly 48 files', () => {
+    expect(Object.keys(tsFiles).length).toEqual(48)
   })
 
   // SDL

packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js

@@ -28,8 +28,8 @@ describe('admin/post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    it('returns exactly 19 files', () => {
-      expect(Object.keys(filesLower).length).toEqual(19)
+    it('returns exactly 48 files', () => {
+      expect(Object.keys(filesLower).length).toEqual(48)
     })
 
     // Layout
@@ -359,8 +359,8 @@ describe('Admin/Post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    it('returns exactly 19 files', () => {
-      expect(Object.keys(filesUpper).length).toEqual(19)
+    it('returns exactly 48 files', () => {
+      expect(Object.keys(filesUpper).length).toEqual(48)
     })
 
     // Layout

packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js

@@ -28,8 +28,8 @@ describe('admin/pages/post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    test('returns exactly 19 files', () => {
-      expect(Object.keys(filesNestedLower).length).toEqual(19)
+    test('returns exactly 48 files', () => {
+      expect(Object.keys(filesNestedLower).length).toEqual(48)
     })
 
     // Layout
@@ -369,8 +369,8 @@ describe('Admin/Pages/Post/Post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    test('returns exactly 19 files', () => {
-      expect(Object.keys(filesNestedUpper).length).toEqual(19)
+    test('returns exactly 48 files', () => {
+      expect(Object.keys(filesNestedUpper).length).toEqual(48)
     })
 
     // Layout

packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js

@@ -28,8 +28,8 @@ describe('admin/pages/post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    test('returns exactly 19 files', () => {
-      expect(Object.keys(filesNestedLower).length).toEqual(19)
+    test('returns exactly 48 files', () => {
+      expect(Object.keys(filesNestedLower).length).toEqual(48)
     })
 
     // Layout
@@ -361,8 +361,8 @@ describe('Admin/Pages/Post/Post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    test('returns exactly 19 files', () => {
-      expect(Object.keys(filesNestedUpper).length).toEqual(19)
+    test('returns exactly 48 files', () => {
+      expect(Object.keys(filesNestedUpper).length).toEqual(48)
     })
 
     // Layout

packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js

@@ -28,8 +28,8 @@ describe('AdminPages/Post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    test('returns exactly 19 files', () => {
-      expect(Object.keys(filesMultiwordUpper).length).toEqual(19)
+    test('returns exactly 48 files', () => {
+      expect(Object.keys(filesMultiwordUpper).length).toEqual(48)
     })
 
     // Layout
@@ -369,8 +369,8 @@ describe('admin-pages/Post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    test('returns exactly 19 files', () => {
-      expect(Object.keys(filesMultiwordDash).length).toEqual(19)
+    test('returns exactly 48 files', () => {
+      expect(Object.keys(filesMultiwordDash).length).toEqual(48)
     })
 
     // Layout
@@ -710,8 +710,8 @@ describe('admin_pages/Post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    test('returns exactly 19 files', () => {
-      expect(Object.keys(filesMultiwordUnderscore).length).toEqual(19)
+    test('returns exactly 48 files', () => {
+      expect(Object.keys(filesMultiwordUnderscore).length).toEqual(48)
     })
 
     // Layout

packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js

@@ -28,8 +28,8 @@ describe('AdminPages/Post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    test('returns exactly 19 files', () => {
-      expect(Object.keys(filesMultiwordUpper).length).toEqual(19)
+    test('returns exactly 48 files', () => {
+      expect(Object.keys(filesMultiwordUpper).length).toEqual(48)
     })
 
     // Layout
@@ -361,8 +361,8 @@ describe('admin-pages/Post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    test('returns exactly 19 files', () => {
-      expect(Object.keys(filesMultiwordDash).length).toEqual(19)
+    test('returns exactly 48 files', () => {
+      expect(Object.keys(filesMultiwordDash).length).toEqual(48)
     })
 
     // Layout
@@ -694,8 +694,8 @@ describe('admin_pages/Post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    test('returns exactly 19 files', () => {
-      expect(Object.keys(filesMultiwordUnderscore).length).toEqual(19)
+    test('returns exactly 48 files', () => {
+      expect(Object.keys(filesMultiwordUnderscore).length).toEqual(48)
     })
 
     // Layout

packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js

@@ -28,8 +28,8 @@ describe('admin/Post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    test('returns exactly 19 files', () => {
-      expect(Object.keys(filesLower).length).toEqual(19)
+    test('returns exactly 48 files', () => {
+      expect(Object.keys(filesLower).length).toEqual(48)
     })
 
     // Layout
@@ -357,8 +357,8 @@ describe('Admin/Post', () => {
   })
 
   describe('creates the correct files with the correct imports', () => {
-    test('returns exactly 19 files', () => {
-      expect(Object.keys(filesUpper).length).toEqual(19)
+    test('returns exactly 48 files', () => {
+      expect(Object.keys(filesUpper).length).toEqual(48)
     })
 
     // Layout

packages/cli/src/commands/generate/scaffold/scaffold.js

@@ -528,7 +528,7 @@ const pageFiles = async (
     const finalFolder =
       (nestScaffoldByModel ? singularName + '/' : '') +
       outputPageName
-        .replace(/(?:\.test|\.mock|\.stories)(?=\.ts)/, '')
+        .replace(/(?:\.test|\.mock|\.stories)(?=\.ts|\.js)/, '')
         .replace(/\.[jt]sx?/, '')
 
     const outputPath = path.join(
@@ -625,7 +625,7 @@ const componentFiles = async (
     const finalFolder =
       (nestScaffoldByModel ? singularName + '/' : '') +
       outputComponentName
-        .replace(/(?:\.test|\.mock|\.stories)(?=\.ts)/, '')
+        .replace(/(?:\.test|\.mock|\.stories)(?=\.ts|\.js)/, '')
         .replace(/\.[jt]sx?/, '')
 
     const outputPath = path.join(