express-generator-typescript 2.9.0 → 3.0.1

package/lib/template/tsconfig.json

@@ -1,27 +1,26 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "module": "commonjs",
-    "lib": ["ES2020"],
-    "strict": true,
+    "target": "ES2022",
+    "module": "esnext",
+    "moduleResolution": "bundler",
     "esModuleInterop": true,
+    "lib": ["ES2022"],
+    "strict": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "paths": {
       "@src/*": ["./src/*"]
     },
+    // tsx transpiles one file at a time, so type-only imports must say so
+    "verbatimModuleSyntax": true,
     "useUnknownInCatchVariables": false,
-    "types": ["vitest/globals"]
-  },
-  "ts-node": {
-    "swc": true,
-    "require": ["tsconfig-paths/register", "dotenv/config"],
+    "types": ["node", "vitest/globals"]
   },
   "include": [
     "src/**/*.ts",
     "tests/**/*.ts",
     "eslint.config.ts",
-    "vitest.config.mts"
+    "vitest.config.ts"
   ],
   "exclude": ["src/public/*"]
 }

package/lib/template/tsconfig.prod.json

@@ -1,21 +1,30 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "module": "CommonJS",
-    "lib": ["ES2020"],
+    "target": "ES2022",
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "esModuleInterop": true,
+    "lib": ["ES2022"],
     "strict": true,
     "rootDir": "./src",
     "outDir": "dist",
-    "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "paths": {
       "@src/*": ["./src/*"]
     },
+    "verbatimModuleSyntax": true,
     "useUnknownInCatchVariables": false,
+    "types": ["node"],
     "sourceMap": false,
     "removeComments": true
   },
+  // After tsc, tsc-alias rewrites "@src/..." imports in dist/ to relative
+  // paths and adds the ".js" extensions Node's ESM loader requires (source
+  // imports are written without extensions)
+  "tsc-alias": {
+    "resolveFullPaths": true
+  },
   "include": ["src/**/*.ts"],
   "exclude": ["src/public/"]
 }

package/lib/template/{vitest.config.mts → vitest.config.ts}

@@ -1,7 +1,11 @@
 import path from 'path';
 import { defineConfig } from 'vitest/config';
 
-const config = defineConfig({
+// ========================================================================= //
+//                                  EXPORT                                   //
+// ========================================================================= //
+
+export default defineConfig({
   test: {
     globals: true,
     environment: 'node',
@@ -15,9 +19,7 @@ const config = defineConfig({
   },
   resolve: {
     alias: {
-      '@src': path.resolve(__dirname, './src'),
+      '@src': path.resolve(import.meta.dirname, './src'),
     },
   },
 });
-
-export default config;

package/package.json

@@ -1,15 +1,11 @@
 {
   "name": "express-generator-typescript",
-  "version": "2.9.0",
+  "version": "3.0.1",
   "description": "Generate new Express applications similar to express-generate which but sets it up to use TypeScript instead",
   "scripts": {
     "commit": "git add -A && git commit -m \"dev commit\"",
     "commit:push": "npm run commit && git push",
     "install:clean": "rm -rf node_modules && rm -rf package-lock.json && npm i",
-    "prepack": "npm run readme:swap",
-    "postpack": "npm run readme:restore",
-    "readme:swap": "node scripts/readme.js swap",
-    "readme:restore": "node scripts/readme.js restore",
     "test": "node --test \"tests/**/*.test.js\"",
     "test:e2e": "node scripts/e2e.js"
   },

package/lib/template/bs-config.js

@@ -1,8 +0,0 @@
-module.exports = {
-  proxy: "http://localhost:3000/", // The address where your Express app runs
-  open: true, // Avoid reopening the browser on every nodemon restart
-  port: 3001, // The port BrowserSync will run on
-  files: ["src/**/*.*"], // Files to watch
-  ignore: ['**/node_modules/**', '**/repos/**/*.json'],
-  reloadDelay: 500, // Wait for nodemon to restart
-};

package/lib/template/src/models/User.model.ts

@@ -1,95 +0,0 @@
-import jetid from 'jet-id';
-import { isNonEmptyString, isString } from 'jet-validators';
-import { parseObject, Schema, testObject } from 'jet-validators/utils';
-
-import { getISOString, isISOString } from '@src/common/utils/date-utils';
-
-import { Entity } from './common/types';
-
-// ========================================================================= //
-//                                 CONSTANTS                                 //
-// ========================================================================= //
-
-const GetDefaults = (): IUser => ({
-  id: jetid(),
-  name: '',
-  email: '',
-  created: getISOString(),
-});
-
-const schema: Schema<IUser> = {
-  id: isUserId,
-  name: isString,
-  email: isString,
-  created: isISOString,
-};
-
-// ========================================================================= //
-//                                   TYPES                                   //
-// ========================================================================= //
-
-/**
- * @entity users
- */
-export interface IUser extends Entity {
-  name: string;
-  email: string;
-}
-
-/**
- * Fields a client supplies when creating a user; the server sets the rest.
- */
-export type IUserInput = Pick<IUser, 'name' | 'email'>;
-
-// ========================================================================= //
-//                                 FUNCTIONS                                 //
-// ========================================================================= //
-
-/**
- * Validate the `User` schema.
- */
-const parseUser = parseObject<IUser>(schema);
-
-/**
- * For the APIs make sure the right fields are complete
- */
-const isCompleteUser = testObject<IUser>({
-  ...schema,
-  name: isNonEmptyString,
-  email: isNonEmptyString,
-});
-
-/**
- * Validate the fields a client sends to create a user.
- */
-const isUserInput = testObject<IUserInput>({
-  name: isNonEmptyString,
-  email: isNonEmptyString,
-});
-
-/**
- * Test if an id is a valid user id.
- */
-function isUserId(val: unknown): val is string {
-  return jetid.test(val);
-}
-
-/**
- * New user object.
- */
-function new_(user?: Partial<IUser>): IUser {
-  return parseUser({ ...GetDefaults(), ...user }, (errors) => {
-    throw new Error('Setup new user failed ' + JSON.stringify(errors, null, 2));
-  });
-}
-
-// ========================================================================= //
-//                                  EXPORT                                   //
-// ========================================================================= //
-
-export default {
-  new: new_,
-  isId: isUserId,
-  isComplete: isCompleteUser,
-  isInput: isUserInput,
-} as const;

package/lib/template/src/public/scripts/http.js

@@ -1,25 +0,0 @@
-var Http = (() => {
-  // Setup request for json
-  var getOptions = (verb, data) => {
-    var options = {
-      dataType: 'json',
-      method: verb,
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-    };
-    if (!!data) {
-      options.body = JSON.stringify(data);
-    }
-    return options;
-  };
-
-  // Set Http methods
-  return {
-    get: (path) => fetch(path, getOptions('GET')),
-    post: (path, data) => fetch(path, getOptions('POST', data)),
-    put: (path, data) => fetch(path, getOptions('PUT', data)),
-    delete: (path) => fetch(path, getOptions('DELETE')),
-  };
-})();