@quilted/create 0.1.90 → 0.2.1

package/source/cli.ts

@@ -5,7 +5,7 @@ import {AbortError, stripIndent, color, parseArguments} from '@quilted/cli-kit';
 import {printHelp} from './help.ts';
 import {prompt} from './shared.ts';
 
-const VALID_PROJECT_KINDS = new Set(['app', 'package', 'module', 'service']);
+const VALID_PROJECT_KINDS = new Set(['app', 'package', 'module', 'server']);
 
 run().catch((error) => {
   if (AbortError.test(error)) return;
@@ -59,7 +59,7 @@ async function run() {
         {title: 'App', value: 'app'},
         {title: 'Module', value: 'module'},
         {title: 'Package', value: 'package'},
-        {title: 'Backend service', value: 'service'},
+        {title: 'Server', value: 'server'},
       ],
     });
   }
@@ -80,9 +80,9 @@ async function run() {
       await createProject();
       break;
     }
-    case 'service': {
-      const {createService} = await import('./service.ts');
-      await createService();
+    case 'server': {
+      const {createServer} = await import('./server.ts');
+      await createServer();
       break;
     }
   }

package/source/help.ts

@@ -5,7 +5,7 @@ export function printHelp({
   options: customOptions,
   packageManager,
 }: {
-  kind?: 'app' | 'package' | 'module' | 'service';
+  kind?: 'app' | 'package' | 'module' | 'server';
   options?: string;
   packageManager?: string;
 } = {}) {

package/source/index.ts

@@ -1,3 +1,4 @@
 export {createApp} from './app.ts';
 export {createProject} from './package.ts';
 export {createModule} from './module.ts';
+export {createServer} from './server.ts';

package/source/{service.ts → server.ts}

@@ -29,12 +29,12 @@ import {addToPackageManagerWorkspaces} from './shared/package-manager.ts';
 
 type Arguments = ReturnType<typeof getArgv>;
 
-export async function createService() {
+export async function createServer() {
   const argv = getArgv();
 
   if (argv['--help']) {
     printHelp({
-      kind: 'service',
+      kind: 'server',
       packageManager: argv['--package-manager']?.toLowerCase(),
     });
     return;
@@ -48,7 +48,7 @@ export async function createService() {
   const createAsMonorepo =
     !inWorkspace &&
     (await getCreateAsMonorepo(argv, {
-      type: 'service',
+      type: 'server',
       default: false,
     }));
   const setupExtras = await getExtrasToSetup(argv, {inWorkspace});
@@ -73,7 +73,7 @@ export async function createService() {
 
   const rootDirectory = inWorkspace ? process.cwd() : directory;
   const outputRoot = createOutputTarget(rootDirectory);
-  const serviceTemplate = loadTemplate('service-basic');
+  const serverTemplate = loadTemplate('server-basic');
   const workspaceTemplate = loadTemplate('workspace');
 
   // If we aren’t already in a workspace, copy the workspace files over, which
@@ -126,10 +126,10 @@ export async function createService() {
     } else {
       const [projectPackageJson, projectTSConfig, workspacePackageJson] =
         await Promise.all([
-          serviceTemplate
+          serverTemplate
             .read('package.json')
             .then((content) => JSON.parse(content)),
-          serviceTemplate
+          serverTemplate
             .read('tsconfig.json')
             .then((content) => JSON.parse(content)),
           workspaceTemplate
@@ -167,7 +167,7 @@ export async function createService() {
     }
   }
 
-  await serviceTemplate.copy(serviceDirectory, (file) => {
+  await serverTemplate.copy(serviceDirectory, (file) => {
     // If we are in a monorepo, we can use all the template files as they are
     if (file === 'tsconfig.json') {
       return partOfMonorepo;
@@ -182,7 +182,7 @@ export async function createService() {
     return file !== 'package.json';
   });
 
-  let quiltProject = await serviceTemplate.read('quilt.project.ts');
+  let quiltProject = await serverTemplate.read('quilt.project.ts');
 
   if (!partOfMonorepo) {
     quiltProject = quiltProject
@@ -202,13 +202,13 @@ export async function createService() {
 
   await outputRoot.write(
     path.join(serviceDirectory, entry),
-    await serviceTemplate.read('service.ts'),
+    await serverTemplate.read('service.ts'),
   );
 
   if (partOfMonorepo) {
     // Write the app’s package.json (the root one was already created)
     const projectPackageJson = JSON.parse(
-      await serviceTemplate.read('package.json'),
+      await serverTemplate.read('package.json'),
     );
 
     adjustPackageJson(projectPackageJson, {name, entry});

package/source/shared/prompts.ts

@@ -35,7 +35,7 @@ export async function getCreateAsMonorepo(
   {
     type,
     default: defaultCreateAsMonorepo = true,
-  }: {type: 'app' | 'package' | 'module' | 'service'; default?: boolean},
+  }: {type: 'app' | 'package' | 'module' | 'server'; default?: boolean},
 ) {
   let createAsMonorepo: boolean;
 

package/source/shared.ts

@@ -12,7 +12,7 @@ export function loadTemplate(
     | 'app-graphql'
     | 'app-trpc'
     | 'module'
-    | 'service-basic'
+    | 'server-basic'
     | 'workspace'
     | 'workspace-simple'
     | 'github'
@@ -90,7 +90,7 @@ async function templateDirectory(
     | 'app-graphql'
     | 'app-trpc'
     | 'module'
-    | 'service-basic'
+    | 'server-basic'
     | 'workspace'
     | 'workspace-simple'
     | 'github'

package/templates/app-basic/features/start/Start/Start.test.tsx

@@ -1,4 +1,4 @@
-import {describe, it, expect} from '@quilted/quilt/testing';
+import {describe, it, expect} from 'vitest';
 
 import {renderApp} from '~/tests/render.ts';
 

package/templates/app-basic/foundation/html/Head.test.tsx

@@ -1,4 +1,4 @@
-import {describe, it, expect} from '@quilted/quilt/testing';
+import {describe, it, expect} from 'vitest';
 import {Viewport, SearchRobots} from '@quilted/quilt/html';
 
 import {renderApp} from '~/tests/render.ts';

package/templates/app-basic/foundation/http/Headers.test.tsx

@@ -1,4 +1,4 @@
-import {describe, it, expect} from '@quilted/quilt/testing';
+import {describe, it, expect} from 'vitest';
 import {CacheControl, ContentSecurityPolicy} from '@quilted/quilt/http';
 
 import {renderApp} from '~/tests/render.ts';

package/templates/app-basic/package.json

@@ -21,13 +21,16 @@
   ],
   "browserslist": {
     "defaults": [
-      "extends @quilted/browserslist-config/defaults"
+      "defaults and not dead"
     ],
     "modules": [
-      "extends @quilted/browserslist-config/modules"
+      "defaults and fully supports es6-module and fully supports es6-module-dynamic-import"
     ],
     "evergreen": [
-      "extends @quilted/browserslist-config/evergreen"
+      "last 1 firefox version",
+      "last 1 safari version",
+      "last 1 edge version",
+      "last 1 chrome version"
     ]
   },
   "eslintConfig": {

package/templates/app-basic/rollup.config.js

@@ -0,0 +1,6 @@
+import {quiltApp} from '@quilted/rollup/app';
+
+export default quiltApp({
+  browser: {entry: './browser.tsx'},
+  server: {entry: './server.tsx'},
+});

package/templates/app-basic/server.tsx

@@ -1,6 +1,6 @@
 import '@quilted/quilt/globals';
 import {RequestRouter} from '@quilted/quilt/request-router';
-import {BrowserAssets} from '@quilted/quilt/magic/assets';
+import {BrowserAssets} from 'quilt:module/assets';
 
 const router = new RequestRouter();
 const assets = new BrowserAssets();

package/templates/app-basic/vite.config.js

@@ -0,0 +1,6 @@
+import {defineConfig} from 'vite';
+import {quiltApp} from '@quilted/vite/app';
+
+export default defineConfig({
+  plugins: [quiltApp()],
+});

package/templates/app-empty/package.json

@@ -21,13 +21,16 @@
   ],
   "browserslist": {
     "defaults": [
-      "extends @quilted/browserslist-config/defaults"
+      "defaults and not dead"
     ],
     "modules": [
-      "extends @quilted/browserslist-config/modules"
+      "defaults and fully supports es6-module and fully supports es6-module-dynamic-import"
     ],
     "evergreen": [
-      "extends @quilted/browserslist-config/evergreen"
+      "last 1 firefox version",
+      "last 1 safari version",
+      "last 1 edge version",
+      "last 1 chrome version"
     ]
   },
   "eslintConfig": {

package/templates/app-empty/rollup.config.js

@@ -0,0 +1,6 @@
+import {quiltApp} from '@quilted/rollup/app';
+
+export default quiltApp({
+  browser: {entry: './browser.tsx'},
+  server: {entry: './server.tsx'},
+});

package/templates/app-empty/server.tsx

@@ -1,6 +1,6 @@
 import '@quilted/quilt/globals';
 import {RequestRouter} from '@quilted/quilt/request-router';
-import {BrowserAssets} from '@quilted/quilt/magic/assets';
+import {BrowserAssets} from 'quilt:module/assets';
 
 const router = new RequestRouter();
 const assets = new BrowserAssets();

package/templates/app-empty/vite.config.js

@@ -0,0 +1,6 @@
+import {defineConfig} from 'vite';
+import {quiltApp} from '@quilted/vite/app';
+
+export default defineConfig({
+  plugins: [quiltApp()],
+});

package/templates/app-graphql/features/start/Start/Start.test.tsx

@@ -1,4 +1,4 @@
-import {describe, it, expect} from '@quilted/quilt/testing';
+import {describe, it, expect} from 'vitest';
 
 import {renderApp} from '~/tests/render.ts';
 import {fillGraphQL, GraphQLController} from '~/tests/graphql.ts';

package/templates/app-graphql/foundation/html/Head.test.tsx

@@ -1,4 +1,4 @@
-import {describe, it, expect} from '@quilted/quilt/testing';
+import {describe, it, expect} from 'vitest';
 import {Viewport, SearchRobots} from '@quilted/quilt/html';
 
 import {renderApp} from '~/tests/render.ts';

package/templates/app-graphql/foundation/http/Headers.test.tsx

@@ -1,4 +1,4 @@
-import {describe, it, expect} from '@quilted/quilt/testing';
+import {describe, it, expect} from 'vitest';
 import {CacheControl, ContentSecurityPolicy} from '@quilted/quilt/http';
 
 import {renderApp} from '~/tests/render.ts';

package/templates/app-graphql/package.json

@@ -24,13 +24,16 @@
   ],
   "browserslist": {
     "defaults": [
-      "extends @quilted/browserslist-config/defaults"
+      "defaults and not dead"
     ],
     "modules": [
-      "extends @quilted/browserslist-config/modules"
+      "defaults and fully supports es6-module and fully supports es6-module-dynamic-import"
     ],
     "evergreen": [
-      "extends @quilted/browserslist-config/evergreen"
+      "last 1 firefox version",
+      "last 1 safari version",
+      "last 1 edge version",
+      "last 1 chrome version"
     ]
   },
   "eslintConfig": {

package/templates/app-graphql/rollup.config.js

@@ -0,0 +1,6 @@
+import {quiltApp} from '@quilted/rollup/app';
+
+export default quiltApp({
+  browser: {entry: './browser.tsx'},
+  server: {entry: './server.tsx'},
+});

package/templates/app-graphql/server.tsx

@@ -1,7 +1,7 @@
 import '@quilted/quilt/globals';
 
 import {RequestRouter, JSONResponse} from '@quilted/quilt/request-router';
-import {BrowserAssets} from '@quilted/quilt/magic/assets';
+import {BrowserAssets} from 'quilt:module/assets';
 
 const router = new RequestRouter();
 const assets = new BrowserAssets();

package/templates/app-graphql/tests/graphql.ts

@@ -1,4 +1,3 @@
-import '@quilted/quilt/polyfills/fetch';
 import {
   GraphQLTesting,
   GraphQLController,

package/templates/app-graphql/vite.config.js

@@ -0,0 +1,6 @@
+import {defineConfig} from 'vite';
+import {quiltApp} from '@quilted/vite/app';
+
+export default defineConfig({
+  plugins: [quiltApp()],
+});

package/templates/app-trpc/features/start/Start/Start.test.tsx

@@ -1,4 +1,4 @@
-import {describe, it, expect} from '@quilted/quilt/testing';
+import {describe, it, expect} from 'vitest';
 
 import {renderApp} from '~/tests/render.ts';
 

package/templates/app-trpc/foundation/html/Head.test.tsx

@@ -1,4 +1,4 @@
-import {describe, it, expect} from '@quilted/quilt/testing';
+import {describe, it, expect} from 'vitest';
 import {Viewport, SearchRobots} from '@quilted/quilt/html';
 
 import {renderApp} from '~/tests/render.ts';

package/templates/app-trpc/foundation/http/Headers.test.tsx

@@ -1,4 +1,4 @@
-import {describe, it, expect} from '@quilted/quilt/testing';
+import {describe, it, expect} from 'vitest';
 import {CacheControl, ContentSecurityPolicy} from '@quilted/quilt/http';
 
 import {renderApp} from '~/tests/render.ts';

package/templates/app-trpc/package.json

@@ -28,13 +28,16 @@
   ],
   "browserslist": {
     "defaults": [
-      "extends @quilted/browserslist-config/defaults"
+      "defaults and not dead"
     ],
     "modules": [
-      "extends @quilted/browserslist-config/modules"
+      "defaults and fully supports es6-module and fully supports es6-module-dynamic-import"
     ],
     "evergreen": [
-      "extends @quilted/browserslist-config/evergreen"
+      "last 1 firefox version",
+      "last 1 safari version",
+      "last 1 edge version",
+      "last 1 chrome version"
     ]
   },
   "eslintConfig": {

package/templates/app-trpc/rollup.config.js

@@ -0,0 +1,6 @@
+import {quiltApp} from '@quilted/rollup/app';
+
+export default quiltApp({
+  browser: {entry: './browser.tsx'},
+  server: {entry: './server.tsx'},
+});

package/templates/app-trpc/server.tsx

@@ -1,6 +1,6 @@
 import '@quilted/quilt/globals';
 import {RequestRouter} from '@quilted/quilt/request-router';
-import {BrowserAssets} from '@quilted/quilt/magic/assets';
+import {BrowserAssets} from 'quilt:module/assets';
 
 import {createDirectClient} from '@quilted/trpc/server';
 import {fetchRequestHandler} from '@trpc/server/adapters/fetch';

package/templates/app-trpc/tests/render/types.ts

@@ -1,10 +1,8 @@
-import type {createTestRouter} from '@quilted/quilt/testing';
+import type {TestRouter} from '@quilted/quilt/navigate/testing';
 import type {QueryClient} from '@tanstack/react-query';
 
 import type {AppContext} from '~/shared/context.ts';
 
-type Router = ReturnType<typeof createTestRouter>;
-
 export interface RenderOptions {
   /**
    * A custom router to use for this component test. You can use a
@@ -12,7 +10,7 @@ export interface RenderOptions {
    * its navigation method to check that components navigate as
    * you expect.
    */
-  readonly router?: Router;
+  readonly router?: TestRouter;
 
   /**
    * A custom locale to use for this component test.
@@ -24,7 +22,7 @@ export interface RenderContext extends AppContext {
   /**
    * The router used for this component test.
    */
-  readonly router: Router;
+  readonly router: TestRouter;
 
   /**
    * The react-query client used for this component test.

package/templates/app-trpc/tests/render.ts

@@ -1,6 +1,6 @@
-import '@quilted/quilt/matchers';
+import '@quilted/quilt/react/testing';
 
-export {createTestRouter} from '@quilted/quilt/testing';
+export {TestRouter} from '@quilted/quilt/navigate/testing';
 
 export * from './render/types.ts';
 export {renderApp} from './render/render.tsx';

package/templates/app-trpc/vite.config.js

@@ -0,0 +1,6 @@
+import {defineConfig} from 'vite';
+import {quiltApp} from '@quilted/vite/app';
+
+export default defineConfig({
+  plugins: [quiltApp()],
+});

package/templates/package/rollup.config.js

@@ -1,3 +1,3 @@
-import {quiltPackageESModules} from '@quilted/rollup';
+import {quiltPackage} from '@quilted/rollup/package';
 
-export default quiltPackageESModules();
+export default quiltPackage();

package/templates/package/vite.config.js

@@ -0,0 +1,6 @@
+import {defineConfig} from 'vite';
+import {quiltPackage} from '@quilted/vite/package';
+
+export default defineConfig({
+  plugins: [quiltPackage()],
+});

package/templates/{service-basic → server-basic}/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "template-service-basic",
+  "name": "template-server-basic",
   "version": "0.0.0",
   "type": "module",
   "private": true,

package/templates/workspace/_nvmrc

@@ -1 +1 @@
-18.17.0
+20.9.0

package/templates/workspace-simple/_gitignore

@@ -2,7 +2,6 @@
 node_modules/
 
 # Build outputs
-.quilt/
 build/
 bin/
 

package/templates/workspace-simple/_nvmrc

@@ -1 +1 @@
-18.17.0
+20.9.0

package/templates/workspace-simple/package.json

@@ -8,14 +8,19 @@
     "format": "prettier --write --cache .",
     "lint": "prettier --check --cache .",
     "test": "vitest",
-    "type-check": "tsc --build --pretty"
+    "type-check": "tsc --build --pretty",
+    "typescript:run": "tsx --conditions quilt:source",
+    "typescript:watch": "tsx watch --conditions quilt:source"
   },
   "devDependencies": {
-    "@quilted/rollup": "^0.1.11",
+    "@quilted/rollup": "^0.2.0",
+    "@quilted/vite": "^0.1.0",
     "@quilted/typescript": "^0.2.0",
     "rollup": "^4.1.0",
     "prettier": "^3.0.0",
+    "tsx": "^3.14.0",
     "typescript": "^5.2.0",
+    "vite": "^4.5.0",
     "vitest": "^0.34.0"
   },
   "prettier": {

package/tsconfig.json

@@ -5,7 +5,7 @@
     "outDir": "build/typescript"
   },
   "include": ["source"],
-  "exclude": ["quilt.project.ts", "**/*.test.ts", "**/*.test.tsx"],
+  "exclude": ["**/*.test.ts", "**/*.test.tsx"],
   "references": [
     {"path": "../quilt"},
     {"path": "../craft"},

package/build/cjs/_virtual/Alias.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var Alias = {};
-
-exports.__exports = Alias;

package/build/cjs/_virtual/Collection.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var Collection = {};
-
-exports.__exports = Collection;

package/build/cjs/_virtual/Document.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var Document = {};
-
-exports.__exports = Document;

package/build/cjs/_virtual/Node.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var Node = {};
-
-exports.__exports = Node;

package/build/cjs/_virtual/Pair.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var Pair = {};
-
-exports.__exports = Pair;

package/build/cjs/_virtual/Scalar.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var Scalar = {};
-
-exports.__exports = Scalar;

package/build/cjs/_virtual/Schema.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var Schema = {};
-
-exports.__exports = Schema;

package/build/cjs/_virtual/YAMLMap.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var YAMLMap = {};
-
-exports.__exports = YAMLMap;

package/build/cjs/_virtual/YAMLSeq.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var YAMLSeq = {};
-
-exports.__exports = YAMLSeq;

package/build/cjs/_virtual/_commonjsHelpers.cjs

@@ -1,10 +0,0 @@
-'use strict';
-
-var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
-function getDefaultExportFromCjs (x) {
-	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
-}
-
-exports.commonjsGlobal = commonjsGlobal;
-exports.getDefaultExportFromCjs = getDefaultExportFromCjs;

package/build/cjs/_virtual/addPairToJSMap.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var addPairToJSMap = {};
-
-exports.__exports = addPairToJSMap;

package/build/cjs/_virtual/anchors.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var anchors = {};
-
-exports.__exports = anchors;

package/build/cjs/_virtual/applyReviver.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var applyReviver = {};
-
-exports.__exports = applyReviver;

package/build/cjs/_virtual/array.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var array = {};
-
-exports.__exports = array;

package/build/cjs/_virtual/async.cjs

@@ -1,5 +0,0 @@
-'use strict';
-
-var async = {};
-
-exports.__exports = async;