start to remove app utils

packages/adapter-begin/index.js

@@ -1,5 +1,4 @@
 import { readFileSync, existsSync } from 'fs';
-import { copy } from '@sveltejs/app-utils/files';
 import { resolve, join } from 'path';
 import parse from '@architect/parser';
 
@@ -40,7 +39,7 @@ export default function () {
 
  builder.log.minor('Building lambda...');
  const local_lambda_dir = join(__dirname, 'files');
- copy(local_lambda_dir, lambda_directory);
+ builder.copy(local_lambda_dir, lambda_directory);
 
  builder.log.minor('Writing server application...');
  builder.copy_server_files(server_directory);

packages/adapter-begin/package.json

@@ -14,8 +14,7 @@
  "files"
  ],
  "dependencies": {
- "@architect/parser": "^3.0.1",
- "@sveltejs/app-utils": "workspace:*"
+ "@architect/parser": "^3.0.1"
  },
  "devDependencies": {
  "@sveltejs/kit": "workspace:*",

packages/adapter-node/src/server.js

@@ -4,7 +4,7 @@ import polka from 'polka';
 import { dirname, join } from 'path';
 import sirv from 'sirv';
 import { parse, URLSearchParams, fileURLToPath } from 'url';
-import { get_body } from '@sveltejs/app-utils/http';
+import { get_body } from '@sveltejs/kit/http';
 // App is a dynamic file built from the application layer.
 /*eslint import/no-unresolved: [2, { ignore: ['\.\/app\.js$'] }]*/
 import * as app from './app.js';

packages/adapter-vercel/index.js

@@ -1,6 +1,5 @@
 const { writeFileSync, mkdirSync, renameSync } = require('fs');
 const { resolve, join } = require('path');
-const { copy } = require('@sveltejs/app-utils/files');
 
 module.exports = function () {
  /** @type {import('@sveltejs/kit').Adapter} */
@@ -22,7 +21,7 @@ module.exports = function () {
  builder.copy_server_files(server_directory);
  renameSync(join(server_directory, 'app.js'), join(server_directory, 'app.mjs'));
 
- copy(join(__dirname, 'files'), lambda_directory);
+ builder.copy(join(__dirname, 'files'), lambda_directory);
 
  builder.log.minor('Prerendering static pages...');
  await builder.prerender({

packages/adapter-vercel/package.json

@@ -13,9 +13,6 @@
  "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
  "prepublishOnly": "npm run build"
  },
- "dependencies": {
- "@sveltejs/app-utils": "workspace:*"
- },
  "devDependencies": {
  "@sveltejs/kit": "workspace:*",
  "rollup": "^2.41.1",

packages/adapter-vercel/src/entry.js

@@ -1,5 +1,5 @@
 import { URL, URLSearchParams } from 'url';
-import { get_body } from '@sveltejs/app-utils/http';
+import { get_body } from '@sveltejs/kit/http';
 
 export default async (req, res) => {
  const host = `${req.headers['x-forwarded-proto']}:https://${req.headers.host}`;

packages/create-svelte/cli/index.js

@@ -1,4 +1,4 @@
-import { mkdirp } from '@sveltejs/app-utils/files';
+import { mkdirp } from '@sveltejs/kit/files';
 import fs from 'fs';
 import parser from 'gitignore-parser';
 import { bold, cyan, gray, green, red } from 'kleur/colors';

packages/create-svelte/package.json

@@ -5,7 +5,6 @@
  "devDependencies": {
  "@rollup/plugin-json": "^4.1.0",
  "@sveltejs/adapter-node": "workspace:*",
- "@sveltejs/app-utils": "workspace:*",
  "@sveltejs/kit": "workspace:*",
  "gitignore-parser": "^0.0.2",
  "kleur": "^4.1.4",

packages/kit/package.json

@@ -62,7 +62,13 @@
  "./ssr": {
  "import": "./dist/ssr.js"
  },
+ "./http": {
+ "require": "./dist/http/index.js"
+ },
+ "./files": {
+ "import": "./dist/files/index.js"
+ },
  "./types.d.ts": "./types.d.ts"
  },
  "types": "types.d.ts"
-}
+}

packages/kit/src/core/adapt/Builder.js

@@ -1,4 +1,4 @@
-import { copy } from '@sveltejs/app-utils/files';
+import { copy, rimraf, mkdirp } from '../filesystem/filesystem.js';
 import { prerender } from './prerender.js';
 
 export default class Builder {
@@ -32,6 +32,16 @@ export default class Builder {
  copy(this.#config.kit.files.assets, dest);
  }
 
+ /** @param {string} path */
+ rimraf(path) {
+ rimraf(path);
+ }
+
+ /** @param {string} dir */
+ mkdirp(dir) {
+ mkdirp(dir);
+ }
+
  /** @param {{ force: boolean, dest: string }} opts */
  async prerender({ force = false, dest }) {
  if (this.#config.kit.prerender.enabled) {

packages/kit/src/core/adapt/prerender.js

@@ -2,7 +2,7 @@ import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { dirname, join, resolve as resolve_path, sep as path_separator } from 'path';
 import { parse, pathToFileURL, resolve, URLSearchParams } from 'url';
 import glob from 'tiny-glob/sync.js';
-import { mkdirp } from '@sveltejs/app-utils/files';
+import { mkdirp } from '../filesystem/filesystem.js';
 
 /** @param {string} html */
 function clean_html(html) {
@@ -72,11 +72,11 @@ export async function prerender({ cwd, out, log, config, force }) {
  /** @type {(status: number, path: string) => void} */
  const error = config.kit.prerender.force
  ? (status, path) => {
-  log.error(`${status} ${path}`);
-  }
+ log.error(`${status} ${path}`);
+ }
  : (status, path) => {
-  throw new Error(`${status} ${path}`);
-  };
+ throw new Error(`${status} ${path}`);
+ };
 
  /** @param {string} path */
  async function visit(path) {