create-analog 0.1.5 → 0.1.8

package/index.js

@@ -1,27 +1,18 @@
 #!/usr/bin/env node
 
 // @ts-check
-import fs from 'node:fs'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import minimist from 'minimist'
-import prompts from 'prompts'
-import {
-  blue,
-  cyan,
-  green,
-  lightRed,
-  magenta,
-  red,
-  reset,
-  yellow
-} from 'kolorist'
-import { execSync } from 'node:child_process'
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import minimist from 'minimist';
+import prompts from 'prompts';
+import { red, reset, yellow } from 'kolorist';
+import { execSync } from 'node:child_process';
 
 // Avoids autoconversion to number of the project name by defining that the args
 // non associated with an option ( _ ) needs to be parsed as a string. See #4606
-const argv = minimist(process.argv.slice(2), { string: ['_'] })
-const cwd = process.cwd()
+const argv = minimist(process.argv.slice(2), { string: ['_'] });
+const cwd = process.cwd();
 
 const APPS = [
   {
@@ -31,29 +22,29 @@ const APPS = [
       {
         name: 'angular-v14',
         display: 'TypeScript',
-        color: yellow
-      }     
-    ]
-  }
-]
+        color: yellow,
+      },
+    ],
+  },
+];
 
 const TEMPLATES = APPS.map(
   (f) => (f.variants && f.variants.map((v) => v.name)) || [f.name]
-).reduce((a, b) => a.concat(b), [])
+).reduce((a, b) => a.concat(b), []);
 
 const renameFiles = {
-  _gitignore: '.gitignore'
-}
+  _gitignore: '.gitignore',
+};
 
 async function init() {
-  let targetDir = formatTargetDir(argv._[0])
-  let template = argv.template || argv.t
+  let targetDir = formatTargetDir(argv._[0]);
+  let template = argv.template || argv.t;
 
-  const defaultTargetDir = 'analog-project'
+  const defaultTargetDir = 'analog-project';
   const getProjectName = () =>
-    targetDir === '.' ? path.basename(path.resolve()) : targetDir
+    targetDir === '.' ? path.basename(path.resolve()) : targetDir;
 
-  let result = {}
+  let result = {};
 
   try {
     result = await prompts(
@@ -64,8 +55,8 @@ async function init() {
           message: reset('Project name:'),
           initial: defaultTargetDir,
           onState: (state) => {
-            targetDir = formatTargetDir(state.value) || defaultTargetDir
-          }
+            targetDir = formatTargetDir(state.value) || defaultTargetDir;
+          },
         },
         {
           type: () =>
@@ -75,16 +66,16 @@ async function init() {
             (targetDir === '.'
               ? 'Current directory'
               : `Target directory "${targetDir}"`) +
-            ` is not empty. Remove existing files and continue?`
+            ` is not empty. Remove existing files and continue?`,
         },
         {
           type: (_, { overwrite } = {}) => {
             if (overwrite === false) {
-              throw new Error(red('✖') + ' Operation cancelled')
+              throw new Error(red('✖') + ' Operation cancelled');
             }
-            return null
+            return null;
           },
-          name: 'overwriteChecker'
+          name: 'overwriteChecker',
         },
         {
           type: () => (isValidPackageName(getProjectName()) ? null : 'text'),
@@ -92,7 +83,7 @@ async function init() {
           message: reset('Package name:'),
           initial: () => toValidPackageName(getProjectName()),
           validate: (dir) =>
-            isValidPackageName(dir) || 'Invalid package.json name'
+            isValidPackageName(dir) || 'Invalid package.json name',
         },
         {
           type: template && TEMPLATES.includes(template) ? null : 'select',
@@ -105,12 +96,12 @@ async function init() {
               : reset('Select a template:'),
           initial: 0,
           choices: APPS.map((framework) => {
-            const frameworkColor = framework.color
+            const frameworkColor = framework.color;
             return {
               title: frameworkColor(framework.name),
-              value: framework
-            }
-          })
+              value: framework,
+            };
+          }),
         },
         {
           type: (framework) =>
@@ -120,107 +111,105 @@ async function init() {
           // @ts-ignore
           choices: (framework) =>
             framework.variants.map((variant) => {
-              const variantColor = variant.color
+              const variantColor = variant.color;
               return {
                 title: variantColor(variant.name),
-                value: variant.name
-              }
-            })
-        }
+                value: variant.name,
+              };
+            }),
+        },
       ],
       {
         onCancel: () => {
-          throw new Error(red('✖') + ' Operation cancelled')
-        }
+          throw new Error(red('✖') + ' Operation cancelled');
+        },
       }
-    )
+    );
   } catch (cancelled) {
-    console.log(cancelled.message)
-    return
+    console.log(cancelled.message);
+    return;
   }
 
   // user choice associated with prompts
-  const { framework, overwrite, packageName, variant } = result
+  const { framework, overwrite, packageName, variant } = result;
 
-  const root = path.join(cwd, targetDir)
+  const root = path.join(cwd, targetDir);
 
   if (overwrite) {
-    emptyDir(root)
+    emptyDir(root);
   } else if (!fs.existsSync(root)) {
-    fs.mkdirSync(root, { recursive: true })
+    fs.mkdirSync(root, { recursive: true });
   }
 
   // determine template
-  template = variant || framework || template
+  template = variant || framework || template;
 
-  console.log(`\nScaffolding project in ${root}...`)
+  console.log(`\nScaffolding project in ${root}...`);
 
   const templateDir = path.resolve(
     fileURLToPath(import.meta.url),
     '..',
     `template-${template}`
-  )
+  );
 
   const write = (file, content) => {
     const targetPath = renameFiles[file]
       ? path.join(root, renameFiles[file])
-      : path.join(root, file)
+      : path.join(root, file);
     if (content) {
-      fs.writeFileSync(targetPath, content)
+      fs.writeFileSync(targetPath, content);
     } else {
-      copy(path.join(templateDir, file), targetPath)
+      copy(path.join(templateDir, file), targetPath);
     }
-  }
+  };
 
-  const files = fs.readdirSync(templateDir)
+  const files = fs.readdirSync(templateDir);
   for (const file of files.filter((f) => f !== 'package.json')) {
-    write(file)
+    write(file);
   }
 
+  const pkgInfo = pkgFromUserAgent(process.env.npm_config_user_agent);
+  const pkgManager = pkgInfo ? pkgInfo.name : 'npm';
   const pkg = JSON.parse(
     fs.readFileSync(path.join(templateDir, `package.json`), 'utf-8')
-  )
+  );
 
-  pkg.name = packageName || getProjectName()
+  pkg.name = packageName || getProjectName();
+  pkg.scripts.start = getStartCommand(pkgManager);
 
-  write('package.json', JSON.stringify(pkg, null, 2))
+  write('package.json', JSON.stringify(pkg, null, 2));
 
   console.log(`\nInitializing git repository:`);
-  execSync(`git init ${targetDir} && cd ${targetDir} && git add . && git commit -m "initial commit"`);
+  execSync(`git init ${targetDir} && cd ${targetDir} && git add .`);
 
-  const pkgInfo = pkgFromUserAgent(process.env.npm_config_user_agent)
-  const pkgManager = pkgInfo ? pkgInfo.name : 'npm'
+  // Fail Silent
+  // Can fail when user does not have global git credentials
+  try {
+    execSync(`git commit -m "initial commit"`);
+  } catch {}
 
-  console.log(`\nDone. Now run:\n`)
+  console.log(`\nDone. Now run:\n`);
   if (root !== cwd) {
-    console.log(`  cd ${path.relative(cwd, root)}`)
-  }
-  switch (pkgManager) {
-    case 'yarn':
-      console.log('  yarn')
-      console.log('  yarn dev')
-      break
-    default:
-      console.log(`  ${pkgManager} install`)
-      console.log(`  ${pkgManager} run dev`)
-      break
+    console.log(`  cd ${path.relative(cwd, root)}`);
   }
-  console.log()
+  console.log(`  ${getInstallCommand(pkgManager)}`);
+  console.log(`  ${getStartCommand(pkgManager)}`);
+  console.log();
 }
 
 /**
  * @param {string | undefined} targetDir
  */
 function formatTargetDir(targetDir) {
-  return targetDir?.trim().replace(/\/+$/g, '')
+  return targetDir?.trim().replace(/\/+$/g, '');
 }
 
 function copy(src, dest) {
-  const stat = fs.statSync(src)
+  const stat = fs.statSync(src);
   if (stat.isDirectory()) {
-    copyDir(src, dest)
+    copyDir(src, dest);
   } else {
-    fs.copyFileSync(src, dest)
+    fs.copyFileSync(src, dest);
   }
 }
 
@@ -230,7 +219,7 @@ function copy(src, dest) {
 function isValidPackageName(projectName) {
   return /^(?:@[a-z0-9-*~][a-z0-9-*._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/.test(
     projectName
-  )
+  );
 }
 
 /**
@@ -242,7 +231,7 @@ function toValidPackageName(projectName) {
     .toLowerCase()
     .replace(/\s+/g, '-')
     .replace(/^[._]/, '')
-    .replace(/[^a-z0-9-~]+/g, '-')
+    .replace(/[^a-z0-9-~]+/g, '-');
 }
 
 /**
@@ -250,11 +239,11 @@ function toValidPackageName(projectName) {
  * @param {string} destDir
  */
 function copyDir(srcDir, destDir) {
-  fs.mkdirSync(destDir, { recursive: true })
+  fs.mkdirSync(destDir, { recursive: true });
   for (const file of fs.readdirSync(srcDir)) {
-    const srcFile = path.resolve(srcDir, file)
-    const destFile = path.resolve(destDir, file)
-    copy(srcFile, destFile)
+    const srcFile = path.resolve(srcDir, file);
+    const destFile = path.resolve(destDir, file);
+    copy(srcFile, destFile);
   }
 }
 
@@ -262,8 +251,8 @@ function copyDir(srcDir, destDir) {
  * @param {string} path
  */
 function isEmpty(path) {
-  const files = fs.readdirSync(path)
-  return files.length === 0 || (files.length === 1 && files[0] === '.git')
+  const files = fs.readdirSync(path);
+  return files.length === 0 || (files.length === 1 && files[0] === '.git');
 }
 
 /**
@@ -271,10 +260,10 @@ function isEmpty(path) {
  */
 function emptyDir(dir) {
   if (!fs.existsSync(dir)) {
-    return
+    return;
   }
   for (const file of fs.readdirSync(dir)) {
-    fs.rmSync(path.resolve(dir, file), { recursive: true, force: true })
+    fs.rmSync(path.resolve(dir, file), { recursive: true, force: true });
   }
 }
 
@@ -283,15 +272,31 @@ function emptyDir(dir) {
  * @returns object | undefined
  */
 function pkgFromUserAgent(userAgent) {
-  if (!userAgent) return undefined
-  const pkgSpec = userAgent.split(' ')[0]
-  const pkgSpecArr = pkgSpec.split('/')
+  if (!userAgent) return undefined;
+  const pkgSpec = userAgent.split(' ')[0];
+  const pkgSpecArr = pkgSpec.split('/');
   return {
     name: pkgSpecArr[0],
-    version: pkgSpecArr[1]
-  }
+    version: pkgSpecArr[1],
+  };
+}
+
+/**
+ * @param {string} pkgManager
+ * @returns string
+ */
+function getInstallCommand(pkgManager) {
+  return pkgManager === 'yarn' ? 'yarn' : `${pkgManager} install`;
+}
+
+/**
+ * @param {string} pkgManager
+ * @returns string
+ */
+function getStartCommand(pkgManager) {
+  return pkgManager === 'yarn' ? 'yarn dev' : `${pkgManager} run dev`;
 }
 
 init().catch((e) => {
-  console.error(e)
-})
+  console.error(e);
+});

package/package.json

@@ -1,12 +1,10 @@
 {
   "name": "create-analog",
-  "version": "0.1.5",
+  "version": "0.1.8",
   "type": "module",
   "license": "MIT",
   "author": "Brandon Roberts",
-  "scripts": {
-    
-  },
+  "scripts": {},
   "bin": {
     "create-analog": "index.js"
   },

package/template-angular-v14/README.md

@@ -8,13 +8,19 @@ Run `yarn` to install the application dependencies.
 
 ## Development
 
-Run `yarn dev` for a dev server. Navigate to `http://localhost:3000/`. The application will automatically reload if you change any of the source files.
+Run `yarn dev` for a dev server. Navigate to `http://localhost:5173/`. The application will automatically reload if you change any of the source files.
 
 ## Build
 
 Run `yarn build` to build the project. The build artifacts will be stored in the `dist/` directory.
 
+## Test
+
+Run `yarn test` to run unit tests with [Vitest](https://vitest.dev).
+
 ## Community
 
 - Join the [Discord](https://discord.gg/mKC2Ec48U5)
-- Visit the [GitHub Repo](https://github.com/analogjs/analog)
+- Visit and Star the [GitHub Repo](https://github.com/analogjs/analog)
+- Visit the [Website](https://analogjs.org/)
+- Follow us on [Twitter](https://twitter.com/analogjs)

package/template-angular-v14/angular.json

@@ -10,6 +10,7 @@
       "sourceRoot": "src",
       "prefix": "app",
       "architect": {
+        "targets": {}
       }
     }
   }

package/template-angular-v14/package.json

@@ -1,16 +1,19 @@
 {
   "name": "my-app",
   "version": "0.0.0",
+  "private": true,
+  "engines": {
+    "node": ">=16.0.0"
+  },
   "scripts": {
     "dev": "vite",
     "ng": "ng",
     "start": "npm run dev",
     "build": "vite build",
     "watch": "vite build --watch",
-    "test": "ng test",
+    "test": "vitest",
     "postinstall": "vite optimize"
   },
-  "private": true,
   "dependencies": {
     "@angular/animations": "^14.0.0",
     "@angular/common": "^14.0.0",
@@ -20,16 +23,18 @@
     "@angular/platform-browser": "^14.0.0",
     "@angular/platform-browser-dynamic": "^14.0.0",
     "@angular/router": "^14.0.0",
-    "rxjs": "~7.5.0",
-    "tslib": "^2.3.0",
-    "zone.js": "~0.11.4"
+    "rxjs": "~7.5.6",
+    "tslib": "^2.4.0",
+    "zone.js": "~0.11.8"
   },
   "devDependencies": {
     "@analogjs/vite-plugin-angular": "latest",
     "@angular-devkit/build-angular": "^14.0.3",
     "@angular/cli": "~14.0.3",
     "@angular/compiler-cli": "^14.0.0",
-    "typescript": "~4.7.2",
-    "vite": "^2.9.13"
+    "jsdom": "^20.0.0",
+    "typescript": "~4.7.4",
+    "vite": "^3.0.9",
+    "vitest": "^0.22.1"
   }
 }

package/template-angular-v14/src/app/app.component.spec.ts

@@ -8,26 +8,26 @@ describe('AppComponent', () => {
       imports: [
         RouterTestingModule,
         AppComponent
-      ],
+      ]
     }).compileComponents();
   });
-
+  
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;
     expect(app).toBeTruthy();
   });
 
-  it(`should have as title 'my-app'`, () => {
+  it(`should have an initial count of 0`, () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;
-    expect(app.title).toEqual('my-app');
+    expect(app.count).toEqual(0);
   });
 
   it('should render title', () => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
     const compiled = fixture.nativeElement as HTMLElement;
-    expect(compiled.querySelector('.content span')?.textContent).toContain('my-app app is running!');
+    expect(compiled.querySelector('h1')?.textContent).toContain('Vite + Angular');
   });
 });

package/template-angular-v14/src/test.ts

@@ -1,26 +1,12 @@
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+import '@analogjs/vite-plugin-angular/setup-vitest';
 
-import 'zone.js/testing';
-import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
+  platformBrowserDynamicTesting,
 } from '@angular/platform-browser-dynamic/testing';
+import { getTestBed } from '@angular/core/testing';
 
-declare const require: {
-  context(path: string, deep?: boolean, filter?: RegExp): {
-    <T>(id: string): T;
-    keys(): string[];
-  };
-};
-
-// First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
+  platformBrowserDynamicTesting()
 );
-
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().forEach(context);

package/template-angular-v14/tsconfig.app.json

@@ -2,14 +2,10 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./out-tsc/app",
     "types": []
   },
-  "files": [
-    "src/main.ts",
-    "src/polyfills.ts"
-  ],
-  "include": [
-    "src/**/*.d.ts"
-  ]
+  "files": ["src/main.ts", "src/polyfills.ts"],
+  "include": ["src/**/*.d.ts"]
 }

package/template-angular-v14/tsconfig.json

@@ -18,15 +18,16 @@
     "importHelpers": true,
     "target": "es2020",
     "module": "es2020",
-    "lib": [
-      "es2020",
-      "dom"
-    ]
+    "lib": ["es2020", "dom"]
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,
     "strictInjectionParameters": true,
     "strictInputAccessModifiers": true,
     "strictTemplates": true
-  }
+  },
+  "references": [
+    { "path": "tsconfig.app.json" },
+    { "path": "tsconfig.spec.json" }
+  ]
 }

package/template-angular-v14/tsconfig.spec.json

@@ -2,17 +2,10 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./out-tsc/spec",
-    "types": [
-      "jasmine"
-    ]
+    "types": ["node", "vitest/globals"]
   },
-  "files": [
-    "src/test.ts",
-    "src/polyfills.ts"
-  ],
-  "include": [
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
+  "files": ["src/test.ts", "src/polyfills.ts"],
+  "include": ["src/**/*.spec.ts", "src/**/*.ts"]
 }

package/template-angular-v14/vite.config.ts

@@ -1,17 +1,31 @@
+/// <reference types="vitest" />
+
 import { defineConfig } from 'vite';
 import angular from '@analogjs/vite-plugin-angular';
 
 // https://vitejs.dev/config/
-export default defineConfig({
+export default defineConfig(({ mode }) => ({
   root: 'src',
   publicDir: 'assets',
   build: {
     outDir: `../dist/my-app`,
     emptyOutDir: true,
-    target: 'es2020'
+    target: 'es2020',
   },
   resolve: {
     mainFields: ['module'],
   },
   plugins: [angular()],
-});
+  test: {
+    globals: true,
+    environment: 'jsdom',
+    setupFiles: ['test.ts'],
+    include: ['**/*.spec.ts'],
+    cache: {
+      dir: `../node_modules/.vitest`,
+    },
+  },
+  define: {
+    'import.meta.vitest': mode !== 'production',
+  },
+}));

package/CHANGELOG.md

@@ -1,10 +0,0 @@
-<a name="0.0.1"></a>
-## 0.0.1 (2022-06-25)
-
-
-### Features
-
-* add v14 templates, README, docs updates ([300de6e](https://github.com/brandonroberts/create-vite/commit/300de6e))
-
-
-

package/template-angular-v14/.gitignore

@@ -1,42 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# Compiled output
-/dist
-/tmp
-/out-tsc
-/bazel-out
-
-# Node
-/node_modules
-npm-debug.log
-yarn-error.log
-
-# IDEs and editors
-.idea/
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# Visual Studio Code
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-.history/*
-
-# Miscellaneous
-/.angular/cache
-.sass-cache/
-/connect.lock
-/coverage
-/libpeerconnection.log
-testem.log
-/typings
-
-# System files
-.DS_Store
-Thumbs.db