bundle and transform filesystem module to cjs for builders

packages/kit/package.json

@@ -9,7 +9,6 @@
  },
  "devDependencies": {
  "@rollup/plugin-replace": "^2.4.1",
- "@sveltejs/app-utils": "workspace:*",
  "@types/amphtml-validator": "^1.0.1",
  "@types/mime": "^2.0.3",
  "@types/node": "^14.14.33",
@@ -63,10 +62,11 @@
  "import": "./dist/ssr.js"
  },
  "./http": {
- "require": "./dist/http/index.js"
+ "import": "./dist/http.js"
  },
- "./files": {
- "import": "./dist/files/index.js"
+ "./filesystem": {
+ "import": "./dist/filesystem.js",
+ "require": "./dist/filesystem.cjs"
  },
  "./types.d.ts": "./types.d.ts"
  },

packages/kit/rollup.config.js

@@ -40,7 +40,9 @@ export default [
  {
  input: {
  cli: 'src/cli.js',
- ssr: 'src/runtime/server/index.js'
+ ssr: 'src/runtime/server/index.js',
+ filesystem: 'src/core/filesystem/index.js',
+ http: 'src/core/http/index.js'
  },
  output: {
  dir: 'dist',
@@ -63,5 +65,32 @@ export default [
  commonjs()
  ],
  preserveEntrySignatures: true
+ },
+
+ {
+ input: {
+ http: 'src/core/filesystem/index.js'
+ },
+ output: {
+ dir: 'dist',
+ format: 'cjs',
+ chunkFileNames: 'chunks/[name].cjs'
+ },
+ external: (id) => {
+ return external.includes(id);
+ },
+ plugins: [
+ replace({
+ preventAssignment: true,
+ values: {
+ __VERSION__: pkg.version
+ }
+ }),
+ resolve({
+ extensions: ['.mjs', '.js', '.ts']
+ }),
+ commonjs()
+ ],
+ preserveEntrySignatures: true
  }
 ];

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

@@ -1,4 +1,4 @@
-import { copy, rimraf, mkdirp } from '../filesystem/filesystem.js';
+import { copy, rimraf, mkdirp } from '../filesystem/index.js';
 import { prerender } from './prerender.js';
 
 export default class Builder {

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 '../filesystem/filesystem.js';
+import { mkdirp } from '../filesystem/index.js';
 
 /** @param {string} html */
 function clean_html(html) {

packages/kit/src/core/build/index.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { rimraf } from '../filesystem/filesystem';
+import { rimraf } from '../filesystem/index.js';
 import create_manifest_data from '../../core/create_manifest_data/index.js';
 import { copy_assets } from '../utils.js';
 import { create_app } from '../../core/create_app/index.js';

packages/kit/src/core/create_app/index.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { mkdirp } from '../filesystem/filesystem';
+import { mkdirp } from '../filesystem/index.js';
 
 /** @type {Map<string, string>} */
 const previous_contents = new Map();

packages/kit/src/core/dev/index.js

@@ -8,7 +8,7 @@ import amp_validator from 'amphtml-validator';
 import vite from 'vite';
 import create_manifest_data from '../../core/create_manifest_data/index.js';
 import { create_app } from '../../core/create_app/index.js';
-import { rimraf } from '../filesystem/filesystem.js';
+import { rimraf } from '../filesystem/index.js';
 import { ssr } from '../../runtime/server/index.js';
 import { get_body } from '../http/index.js';
 import { copy_assets } from '../utils.js';

packages/kit/src/core/start/index.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import http from 'http';
 import { parse, pathToFileURL, URLSearchParams } from 'url';
 import sirv from 'sirv';
-import { get_body } from '../http';
+import { get_body } from '../http/index.js';
 import { join, resolve } from 'path';
 
 /** @param {string} dir */

packages/kit/src/core/utils.js

@@ -1,6 +1,6 @@
 import { dirname, resolve } from 'path';
 import colors from 'kleur';
-import { copy } from './filesystem/filesystem';
+import { copy } from './filesystem/index.js';
 import { fileURLToPath } from 'url';
 import { existsSync } from 'fs';