upgrade svelte (#102)

changelog.md

@@ -6,6 +6,8 @@
   ([#154](https://github.com/feltcoop/gro/pull/154))
 - **break**: rename `toArray` from `ensureArray`
   ([#117](https://github.com/feltcoop/gro/pull/117))
+- upgrade to `svelte@3.37.0`
+  ([#102](https://github.com/feltcoop/gro/pull/102))
 - export many more things from root: `import {/* !!! */} from '@feltcoop/gro';`
   ([#117](https://github.com/feltcoop/gro/pull/117))
 
@@ -290,7 +292,7 @@
 
 - handle build errors in the deploy task and add the `--dry` deploy flag
   ([#42](https://github.com/feltcoop/gro/pull/42))
-- update dependencies
+- upgrade dependencies
   ([#43](https://github.com/feltcoop/gro/pull/43),
   [#44](https://github.com/feltcoop/gro/pull/44))
 

package.json

@@ -62,6 +62,7 @@
     "esinstall": "1.0.5",
     "fs-extra": "^9.1.0",
     "kleur": "^4.1.4",
+    "locate-character": "^2.0.5",
     "mri": "^1.1.6",
     "path-browserify": "^1.0.1",
     "prettier": "^2.2.1",
@@ -70,7 +71,7 @@
     "source-map-support": "^0.5.19",
     "sourcemap-codec": "^1.4.8",
     "strict-event-emitter-types": "^2.0.0",
-    "svelte": "^3.31.0",
+    "svelte": "^3.37.0",
     "svelte-preprocess-esbuild": "^2.0.0",
     "terser": "^5.6.1",
     "tslib": "^2.1.0",

src/build/Filer.ts

@@ -3,13 +3,16 @@ import lexer from 'es-module-lexer';
 import {EventEmitter} from 'events';
 import type StrictEventEmitter from 'strict-event-emitter-types';
 
-import {FilerDir, FilerDirChangeCallback, createFilerDir} from '../build/FilerDir.js';
-import {MapDependencyToSourceId, mapDependencyToSourceId} from './utils.js';
+import {createFilerDir} from '../build/FilerDir.js';
+import type {FilerDir, FilerDirChangeCallback} from '../build/FilerDir.js';
+import {mapDependencyToSourceId} from './utils.js';
+import type {MapDependencyToSourceId} from './utils.js';
 import {remove, outputFile, pathExists} from '../fs/node.js';
 import {EXTERNALS_BUILD_DIR_SUBPATH, JS_EXTENSION, paths, toBuildOutPath} from '../paths.js';
 import {nulls, omitUndefined} from '../utils/object.js';
 import {UnreachableError} from '../utils/error.js';
-import {Logger, printLogLabel, SystemLogger} from '../utils/log.js';
+import {printLogLabel, SystemLogger} from '../utils/log.js';
+import type {Logger} from '../utils/log.js';
 import {gray, red, cyan} from '../utils/terminal.js';
 import {printError} from '../utils/print.js';
 import type {
@@ -20,29 +23,29 @@ import type {
 	BuilderState,
 	BuildResult,
 } from './builder.js';
-import {Encoding, inferEncoding} from '../fs/encoding.js';
-import {BuildConfig, printBuildConfigLabel} from '../config/buildConfig.js';
-import {EcmaScriptTarget, DEFAULT_ECMA_SCRIPT_TARGET} from './tsBuildHelpers.js';
-import {ServedDir, ServedDirPartial, toServedDirs} from './ServedDir.js';
-import {
-	assertBuildableSourceFile,
-	assertSourceFile,
-	BuildableSourceFile,
-	createSourceFile,
-	SourceFile,
-} from './sourceFile.js';
-import {BuildFile, createBuildFile, diffDependencies} from './buildFile.js';
+import {inferEncoding} from '../fs/encoding.js';
+import type {Encoding} from '../fs/encoding.js';
+import {printBuildConfigLabel} from '../config/buildConfig.js';
+import type {BuildConfig} from '../config/buildConfig.js';
+import {DEFAULT_ECMA_SCRIPT_TARGET} from './tsBuildHelpers.js';
+import type {EcmaScriptTarget} from './tsBuildHelpers.js';
+import {toServedDirs} from './ServedDir.js';
+import type {ServedDir, ServedDirPartial} from './ServedDir.js';
+import {assertBuildableSourceFile, assertSourceFile, createSourceFile} from './sourceFile.js';
+import type {BuildableSourceFile, SourceFile} from './sourceFile.js';
+import {createBuildFile, diffDependencies} from './buildFile.js';
+import type {BuildFile} from './buildFile.js';
 import type {BaseFilerFile} from './baseFilerFile.js';
 import {loadContents} from './load.js';
 import {isExternalBrowserModule} from '../utils/module.js';
 import {wrap} from '../utils/async.js';
 import {
 	DEFAULT_EXTERNALS_ALIASES,
-	ExternalsAliases,
 	EXTERNALS_SOURCE_ID,
 	getExternalsBuilderState,
 	getExternalsBuildState,
 } from './externalsBuildHelpers.js';
+import type {ExternalsAliases} from './externalsBuildHelpers.js';
 import {queueExternalsBuild} from './externalsBuilder.js';
 import type {SourceMeta} from './sourceMeta.js';
 import {deleteSourceMeta, updateSourceMeta, cleanSourceMeta, initSourceMeta} from './sourceMeta.js';

src/build/baseFilerFile.ts

@@ -1,4 +1,5 @@
-import {stat, Stats} from '../fs/node.js';
+import {stat} from '../fs/node.js';
+import type {Stats} from '../fs/node.js';
 import type {Encoding} from '../fs/encoding.js';
 import {getMimeTypeByExtension} from '../fs/mime.js';
 import {toHash} from './utils.js';

src/build/defaultBuilder.ts

@@ -1,19 +1,14 @@
-import {SVELTE_EXTENSION, TS_EXTENSION} from '../paths.js';
 import type {Builder} from './builder.js';
-import {createLazyBuilder, InitialOptions as LazyBuilderInitialOptions} from './lazyBuilder.js';
-import {
-	createEsbuildBuilder,
-	InitialOptions as SwcBuilderInitialOptions,
-} from './esbuildBuilder.js';
-import {
-	createSvelteBuilder,
-	InitialOptions as SvelteBuilderInitialOptions,
-} from './svelteBuilder.js';
-import {
-	createExternalsBuilder,
-	InitialOptions as ExternalsBuilderInitialOptions,
-} from './externalsBuilder.js';
 import {EXTERNALS_SOURCE_ID} from './externalsBuildHelpers.js';
+import {SVELTE_EXTENSION, TS_EXTENSION} from '../paths.js';
+import {createLazyBuilder} from './lazyBuilder.js';
+import type {InitialOptions as LazyBuilderInitialOptions} from './lazyBuilder.js';
+import {createEsbuildBuilder} from './esbuildBuilder.js';
+import type {InitialOptions as SwcBuilderInitialOptions} from './esbuildBuilder.js';
+import {createSvelteBuilder} from './svelteBuilder.js';
+import type {InitialOptions as SvelteBuilderInitialOptions} from './svelteBuilder.js';
+import {createExternalsBuilder} from './externalsBuilder.js';
+import type {InitialOptions as ExternalsBuilderInitialOptions} from './externalsBuilder.js';
 
 export const createDefaultBuilder = (
 	esbuildBuilderOptions?: SwcBuilderInitialOptions,

src/build/esbuildBuildHelpers.ts

@@ -1,7 +1,8 @@
 import type esbuild from 'esbuild';
 import type * as sveltePreprocessEsbuild from 'svelte-preprocess-esbuild';
 
-import {DEFAULT_ECMA_SCRIPT_TARGET, EcmaScriptTarget} from './tsBuildHelpers.js';
+import {DEFAULT_ECMA_SCRIPT_TARGET} from './tsBuildHelpers.js';
+import type {EcmaScriptTarget} from './tsBuildHelpers.js';
 
 export interface EsbuildTransformOptions extends esbuild.TransformOptions {
 	target: EcmaScriptTarget;

src/build/esbuildBuilder.ts

@@ -2,7 +2,8 @@ import esbuild from 'esbuild';
 
 import type {EcmaScriptTarget} from './tsBuildHelpers.js';
 import {getDefaultEsbuildOptions} from './esbuildBuildHelpers.js';
-import {Logger, SystemLogger, printLogLabel} from '../utils/log.js';
+import {SystemLogger, printLogLabel} from '../utils/log.js';
+import type {Logger} from '../utils/log.js';
 import {JS_EXTENSION, SOURCEMAP_EXTENSION, toBuildOutPath, TS_EXTENSION} from '../paths.js';
 import {omitUndefined} from '../utils/object.js';
 import type {Builder, BuildResult, TextBuild, TextBuildSource} from './builder.js';

src/build/externalsBuilder.ts

@@ -1,8 +1,10 @@
 import {basename, dirname, join} from 'path';
-import {install as installWithEsinstall, InstallResult} from 'esinstall';
+import {install as installWithEsinstall} from 'esinstall';
+import type {InstallResult} from 'esinstall';
 import type {Plugin as RollupPlugin} from 'rollup';
 
-import {Logger, printLogLabel, SystemLogger} from '../utils/log.js';
+import {printLogLabel, SystemLogger} from '../utils/log.js';
+import type {Logger} from '../utils/log.js';
 import {EXTERNALS_BUILD_DIR, JS_EXTENSION, toBuildOutPath} from '../paths.js';
 import {omitUndefined} from '../utils/object.js';
 import type {Builder, BuildResult, BuildContext, TextBuildSource, TextBuild} from './builder.js';
@@ -11,17 +13,18 @@ import {loadContents} from './load.js';
 import {groSveltePlugin} from '../project/rollup-plugin-gro-svelte.js';
 import {createDefaultPreprocessor} from './svelteBuildHelpers.js';
 import {createCssCache} from '../project/cssCache.js';
-import {BuildConfig, printBuildConfig} from '../config/buildConfig.js';
+import {printBuildConfig} from '../config/buildConfig.js';
+import type {BuildConfig} from '../config/buildConfig.js';
 import {
 	createDelayedPromise,
-	ExternalsBuildState,
 	getExternalsBuilderState,
 	getExternalsBuildState,
 	initExternalsBuilderState,
 	initExternalsBuildState,
 	loadImportMapFromDisk,
 	toSpecifiers,
 } from './externalsBuildHelpers.js';
+import type {ExternalsBuildState} from './externalsBuildHelpers.js';
 import {EMPTY_ARRAY} from '../utils/array.js';
 import {numberFromEnv} from '../utils/env.js';
 

src/build/lazyBuilder.ts

@@ -1,4 +1,5 @@
-import {BuildContext, Builder, BuildSource, noopBuilder} from './builder.js';
+import {noopBuilder} from './builder.js';
+import type {BuildContext, Builder, BuildSource} from './builder.js';
 import {omitUndefined} from '../utils/object.js';
 import type {BuildConfig} from '../config/buildConfig.js';
 

src/build/sourceFile.ts

@@ -1,7 +1,8 @@
 import {basename, dirname, join} from 'path';
 
 import type {NonBuildableFilerDir, BuildableFilerDir, FilerDir} from '../build/FilerDir.js';
-import {BuildFile, reconstructBuildFiles} from './buildFile.js';
+import {reconstructBuildFiles} from './buildFile.js';
+import type {BuildFile} from './buildFile.js';
 import type {BaseFilerFile} from './baseFilerFile.js';
 import {toHash} from './utils.js';
 import type {BuildConfig} from '../config/buildConfig.js';

src/build/sourceMeta.ts

@@ -1,6 +1,7 @@
 import {findFiles, remove, outputFile, pathExists, readJson} from '../fs/node.js';
 import type {Encoding} from '../fs/encoding.js';
-import {BuildOutDirname, JSON_EXTENSION, toBuildOutDirname} from '../paths.js';
+import {JSON_EXTENSION, toBuildOutDirname} from '../paths.js';
+import type {BuildOutDirname} from '../paths.js';
 import {getFileContentsHash} from './baseFilerFile.js';
 import type {BuildDependency, BuildContext} from './builder.js';
 import type {BuildableSourceFile} from './sourceFile.js';

src/build/svelteBuilder.ts

@@ -6,12 +6,12 @@ import type {EcmaScriptTarget} from './tsBuildHelpers.js';
 import {
 	baseSvelteCompileOptions,
 	createDefaultPreprocessor,
-	CreatePreprocessor,
 	handleStats,
 	handleWarn,
-	SvelteCompilation,
 } from './svelteBuildHelpers.js';
-import {Logger, printLogLabel, SystemLogger} from '../utils/log.js';
+import type {CreatePreprocessor, SvelteCompilation} from './svelteBuildHelpers.js';
+import {printLogLabel, SystemLogger} from '../utils/log.js';
+import type {Logger} from '../utils/log.js';
 import {
 	CSS_EXTENSION,
 	JS_EXTENSION,

src/config/config.ts

@@ -1,15 +1,13 @@
 import {paths, groPaths, toBuildOutPath, CONFIG_BUILD_BASE_PATH, toImportId} from '../paths.js';
-import {
-	BuildConfig,
-	normalizeBuildConfigs,
-	PartialBuildConfig,
-	validateBuildConfigs,
-} from './buildConfig.js';
-import {Logger, LogLevel, SystemLogger, configureLogLevel, printLogLabel} from '../utils/log.js';
+import {normalizeBuildConfigs, validateBuildConfigs} from './buildConfig.js';
+import type {BuildConfig, PartialBuildConfig} from './buildConfig.js';
+import {LogLevel, SystemLogger, configureLogLevel, printLogLabel} from '../utils/log.js';
+import type {Logger} from '../utils/log.js';
 import {importTs} from '../fs/importTs.js';
 import {pathExists} from '../fs/node.js';
 import {PRIMARY_NODE_BUILD_CONFIG} from './defaultBuildConfig.js';
-import {DEFAULT_ECMA_SCRIPT_TARGET, EcmaScriptTarget} from '../build/tsBuildHelpers.js';
+import {DEFAULT_ECMA_SCRIPT_TARGET} from '../build/tsBuildHelpers.js';
+import type {EcmaScriptTarget} from '../build/tsBuildHelpers.js';
 import {omitUndefined} from '../utils/object.js';
 import type {ServedDirPartial} from '../build/ServedDir.js';
 import {DEFAULT_SERVER_HOST, DEFAULT_SERVER_PORT} from '../server/server.js';

src/fs/inputPath.ts

@@ -5,12 +5,13 @@ import {
 	SOURCE_DIR,
 	SOURCE_DIR_NAME,
 	replaceRootDir,
-	Paths,
 	groDirBasename,
 	groPaths,
 } from '../paths.js';
+import type {Paths} from '../paths.js';
 import {stripStart} from '../utils/string.js';
-import {PathData, toPathData, PathStats} from './pathData.js';
+import {toPathData} from './pathData.js';
+import type {PathData, PathStats} from './pathData.js';
 
 /*
 

src/project/rollup-plugin-gro-esbuild.ts

@@ -5,7 +5,8 @@ import {createFilter} from '@rollup/pluginutils';
 
 import {red} from '../utils/terminal.js';
 import {createStopwatch} from '../utils/time.js';
-import {SystemLogger, Logger, printLogLabel} from '../utils/log.js';
+import {SystemLogger, printLogLabel} from '../utils/log.js';
+import type {Logger} from '../utils/log.js';
 import {printKeyValue, printMs, printPath} from '../utils/print.js';
 import {toRootPath, isSourceId, TS_EXTENSION} from '../paths.js';
 import {omitUndefined} from '../utils/object.js';

src/project/rollup-plugin-gro-svelte.ts

@@ -10,12 +10,8 @@ import {printLogLabel, SystemLogger} from '../utils/log.js';
 import {printPath} from '../utils/print.js';
 import type {GroCssBuild} from './types.js';
 import {omitUndefined} from '../utils/object.js';
-import {
-	SvelteCompilation,
-	baseSvelteCompileOptions,
-	handleWarn,
-	handleStats,
-} from '../build/svelteBuildHelpers.js';
+import {baseSvelteCompileOptions, handleWarn, handleStats} from '../build/svelteBuildHelpers.js';
+import type {SvelteCompilation} from '../build/svelteBuildHelpers.js';
 import {CSS_EXTENSION} from '../paths.js';
 import type {PartialExcept} from '../index.js';
 

src/project/rollup-plugin-output-css.ts

@@ -4,7 +4,8 @@ import sourcemapCodec from 'sourcemap-codec';
 
 import {blue, gray} from '../utils/terminal.js';
 import {outputFile} from '../fs/node.js';
-import {SystemLogger, Logger, printLogLabel} from '../utils/log.js';
+import {SystemLogger, printLogLabel} from '../utils/log.js';
+import type {Logger} from '../utils/log.js';
 import type {GroCssBuild, GroCssBundle} from './types.js';
 import {omitUndefined} from '../utils/object.js';
 import type {PartialExcept} from '../index.js';

src/server/server.ts

@@ -1,11 +1,12 @@
-import {
-	createServer as createHttp1Server,
+import {createServer as createHttp1Server} from 'http';
+import type {
 	Server as Http1Server,
 	RequestListener as Http1RequestListener,
 	IncomingHttpHeaders,
 	OutgoingHttpHeaders,
 } from 'http';
-import {createSecureServer as createHttp2Server, Http2Server, ServerHttp2Stream} from 'http2';
+import {createSecureServer as createHttp2Server} from 'http2';
+import type {Http2Server, ServerHttp2Stream} from 'http2';
 import type {ListenOptions} from 'net';
 
 import {cyan, yellow, gray, red, rainbow, green} from '../utils/terminal.js';
@@ -15,12 +16,12 @@ import {stripAfter} from '../utils/string.js';
 import {omitUndefined} from '../utils/object.js';
 import type {Filer} from '../build/Filer.js';
 import {
-	BaseFilerFile,
 	getFileMimeType,
 	getFileContentsBuffer,
 	getFileStats,
 	getFileContentsHash,
 } from '../build/baseFilerFile.js';
+import type {BaseFilerFile} from '../build/baseFilerFile.js';
 import {paths} from '../paths.js';
 import {loadPackageJson} from '../project/packageJson.js';
 import type {ProjectState} from './projectState.js';

src/task/taskModule.ts

@@ -1,6 +1,8 @@
 import {sourceIdToBasePath, paths, pathsFromId} from '../paths.js';
-import {ModuleMeta, LoadModuleResult, loadModule, loadModules, findModules} from '../fs/modules.js';
-import {Task, toTaskName, isTaskPath, TASK_FILE_SUFFIX} from './task.js';
+import {loadModule, loadModules, findModules} from '../fs/modules.js';
+import type {ModuleMeta, LoadModuleResult} from '../fs/modules.js';
+import {toTaskName, isTaskPath, TASK_FILE_SUFFIX} from './task.js';
+import type {Task} from './task.js';
 import {findFiles} from '../fs/node.js';
 import {getPossibleSourceIds} from '../fs/inputPath.js';
 import type {Obj} from '../index.js';