CLI: Move all templates out of cli into renderers

code/.eslintrc.js

@@ -150,5 +150,12 @@ module.exports = {
         'no-undef': 'off', // ignore "window" undef errors
       },
     },
+    {
+      // Because those templates reference css files in other directory.
+      files: ['**/template/cli/**/*'],
+      rules: {
+        'import/no-unresolved': 'off',
+      },
+    },
   ],
 };

code/frameworks/angular/package.json

@@ -20,18 +20,18 @@
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/types/index.js",
-  "module": "dist/types/index.js",
-  "types": "dist/types/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
+    "template/**/*",
     "README.md",
     "*.js",
     "*.d.ts"
   ],
   "scripts": {
-    "check": "../../../scripts/node_modules/.bin/tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "check": "../../../scripts/node_modules/.bin/tsc",
+    "prep": "rimraf dist && ../../../scripts/node_modules/.bin/tsc --project tsconfig.build.json && echo \"Preventing passing flags to tsc\""
   },
   "dependencies": {
     "@storybook/addons": "7.0.0-alpha.46",
@@ -77,11 +77,13 @@
     "@angular/platform-browser": "^13.3.6",
     "@angular/platform-browser-dynamic": "^13.3.6",
     "@nrwl/workspace": "14.6.1",
+    "@types/rimraf": "^3.0.2",
     "@types/tmp": "^0.2.3",
     "cross-spawn": "^7.0.3",
     "jest": "^27.5.1",
     "jest-preset-angular": "^12.0.0",
     "jest-specific-snapshot": "^5.0.0",
+    "rimraf": "^3.0.2",
     "tmp": "^0.2.1",
     "typescript": "~4.6.3",
     "webpack": "5",
@@ -119,6 +121,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "builders": "dist/types/builders/builders.json",
+  "builders": "dist/builders/builders.json",
   "gitHead": "c64b5be851ed2affac56e1daaac3f453fbe6f230"
 }

code/frameworks/angular/preset.js

@@ -1 +1 @@
-module.exports = require('./dist/types/preset');
+module.exports = require('./dist/preset');

code/frameworks/angular/renderer.d.ts

@@ -1 +1 @@
-export * from './dist/types/renderer.d';
+export * from './dist/renderer.d';

code/frameworks/angular/renderer.js

@@ -1 +1 @@
-module.exports = require('./dist/types/renderer');
+module.exports = require('./dist/renderer');

code/frameworks/angular/src/server/framework-preset-angular-docs.ts

@@ -4,5 +4,5 @@ import { hasDocsOrControls } from '@storybook/docs-tools';
 
 export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = [], options) => {
   if (!hasDocsOrControls(options)) return entry;
-  return [...entry, path.join(__dirname, '../../../dist/types/client/docs/config')];
+  return [...entry, path.join(__dirname, '../../dist/client/docs/config')];
 };

code/frameworks/angular/template/cli/.eslintrc.json

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "@typescript-eslint/consistent-type-imports": ["error", { "disallowTypeAnnotations": false }]
+  }
+}

code/frameworks/angular/template/stories/argTypes/doc-button/doc-button.component.ts

@@ -68,7 +68,7 @@ export class DocButtonComponent<T> {
 
   /** Test null default value. */
   @Input()
-  public aNullValue = null;
+  public aNullValue: string | null = null;
 
   /** Test null default value. */
   @Input()

code/frameworks/angular/template/stories/argTypes/doc-injectable/doc-injectable.service.ts

@@ -21,7 +21,7 @@ export class DocInjectableService {
   /**
    * Get posts from Backend.
    */
-  getPosts() {
+  getPosts(): unknown[] {
     return [];
   }
 }

code/frameworks/angular/tsconfig.build.json

@@ -0,0 +1,21 @@
+{
+  "extends": "../../tsconfig.json",
+  "compileOnSave": false,
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "CommonJS",
+    "lib": ["es2020", "dom"],
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "declaration": true,
+    "outDir": "dist",
+    "types": ["node"],
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "allowJs": true,
+    "pretty": true,
+    "noErrorTruncation": true,
+    "listEmittedFiles": false
+  },
+  "include": ["src/**/*", "src/**/*.json"]
+}

code/frameworks/angular/tsconfig.json

@@ -1,17 +1,7 @@
 {
-  "extends": "../../tsconfig.json",
-  "compileOnSave": false,
+  "extends": "./tsconfig.build.json",
   "compilerOptions": {
-    "target": "ES2020",
-    "module": "CommonJS",
-    "lib": ["es2020", "dom"],
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "outDir": "dist",
-    "types": ["node"],
-    "skipLibCheck": true,
-    "resolveJsonModule": true,
-    "allowJs": true
+    "noEmit": true
   },
-  "include": ["src/**/*", "src/**/*.json"]
+  "include": ["src/**/*", "src/**/*.json", "template/**/*"]
 }

code/frameworks/ember/package.json

@@ -21,6 +21,7 @@
   "types": "dist/types/index.d.ts",
   "files": [
     "dist/**/*",
+    "template/**/*",
     "README.md",
     "*.js",
     "*.d.ts"

code/frameworks/nextjs/package.json

@@ -48,6 +48,7 @@
   "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
+    "template/**/*",
     "types/**/*",
     "README.md",
     "*.js",

code/frameworks/nextjs/template/cli/.eslintrc.json

@@ -0,0 +1,7 @@
+{
+  "rules": {
+    "import/no-extraneous-dependencies": "off",
+    "import/extensions": "off",
+    "react/no-unknown-property": "off"
+  }
+}

code/lib/cli/rendererAssets/nextjs/js/Header.jsx → code/frameworks/nextjs/template/cli/js/Header.jsx

@@ -46,7 +46,9 @@ export const Header = ({ user, onLogin, onLogout, onCreateAccount }) => (
 );
 
 Header.propTypes = {
-  user: PropTypes.shape({}),
+  user: PropTypes.shape({
+    name: PropTypes.string.isRequired,
+  }),
   onLogin: PropTypes.func.isRequired,
   onLogout: PropTypes.func.isRequired,
   onCreateAccount: PropTypes.func.isRequired,

code/lib/cli/rendererAssets/react/ts/Button.stories.tsx → code/frameworks/nextjs/template/cli/ts/Button.stories.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import type { ComponentStoryFn, ComponentMeta } from '@storybook/react';
 
 import { Button } from './Button';

code/frameworks/nextjs/tsconfig.json

@@ -5,6 +5,6 @@
     "resolveJsonModule": true,
     "skipLibCheck": true
   },
-  "include": ["src/**/*"],
+  "include": ["src/**/*", "template/**/*"],
   "exclude": ["src/**/*.test.*", "src/**/__testfixtures__/**"]
 }