Merge pull request #2124 from embroider-build/ts-module-resolution

moduleResolution nodenext

package.json

@@ -71,6 +71,5 @@
       "unlabeled": ":question: Unlabeled"
     },
     "wildcardLabel": "unlabeled"
-  },
-  "packageManager": "[email protected]+sha256.691fe176eea9a8a80df20e4976f3dfb44a04841ceb885638fe2a26174f81e65e"
+  }
 }

packages/addon-dev/package.json

@@ -35,8 +35,8 @@
   },
   "dependencies": {
     "@embroider/core": "workspace:^",
-    "@rollup/pluginutils": "^4.1.1",
-    "content-tag": "^2.0.1",
+    "@rollup/pluginutils": "^5.1.0",
+    "content-tag": "^2.0.2",
     "fs-extra": "^10.0.0",
     "minimatch": "^3.0.4",
     "rollup-plugin-copy-assets": "^2.0.3",

packages/compat/package.json

@@ -88,7 +88,7 @@
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.6",
     "broccoli-node-api": "^1.7.0",
-    "code-equality-assertions": "^0.9.0",
+    "code-equality-assertions": "^1.0.1",
     "ember-engines": "^0.8.19",
     "scenario-tester": "^3.0.1",
     "typescript": "^5.4.5"

packages/core/package.json

@@ -35,7 +35,6 @@
     "debug": "^4.3.2",
     "escape-string-regexp": "^4.0.0",
     "fast-sourcemap-concat": "^2.1.1",
-    "filesize": "^10.0.7",
     "fs-extra": "^9.1.0",
     "fs-tree-diff": "^2.0.1",
     "handlebars": "^4.7.7",

packages/core/src/measure-concat.ts

@@ -1,7 +1,6 @@
 import type SourceMapConcat from 'fast-sourcemap-concat';
 import { join } from 'path';
 import { statSync } from 'fs';
-import { filesize } from 'filesize';
 
 export default class MeasureConcat {
   stats: { [filename: string]: number } = {};
@@ -19,7 +18,7 @@ export default class MeasureConcat {
     console.log(
       Object.entries(this.stats)
         .sort((a, b) => b[1] - a[1])
-        .map(([name, bytes]) => `  ${name}: ${filesize(bytes, {})}`)
+        .map(([name, bytes]) => `  ${name}: ${bytes} bytes`)
         .join('\n')
     );
     return await this.concat.end();

packages/macros/package.json

@@ -48,7 +48,7 @@
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.6",
     "babel-plugin-ember-template-compilation": "^2.3.0",
-    "code-equality-assertions": "^0.9.0",
+    "code-equality-assertions": "^1.0.1",
     "scenario-tester": "^3.0.1",
     "typescript": "^5.4.5"
   },

packages/macros/src/macros-config.ts

@@ -71,7 +71,7 @@ function gatherAddonCacheKey(project: any): string {
 }
 
 const babelCacheBustingPluginPath: string = require.resolve(
-  '@embroider/shared-internals/src/babel-plugin-cache-busting.js'
+  '@embroider/shared-internals/src/babel-plugin-cache-busting'
 );
 
 export default class MacrosConfig {

packages/shared-internals/package.json

@@ -13,8 +13,7 @@
       "browser": "./src/browser-index.js",
       "default": "./src/index.js"
     },
-    "./src/babel-plugin-cache-busting.js": "./src/babel-plugin-cache-busting.js",
-    "./src/template-colocation-plugin": "./src/template-colocation-plugin.js"
+    "./src/*": "./src/*.js"
   },
   "license": "MIT",
   "author": "Edward Faulkner",

packages/vite/package.json

@@ -1,7 +1,13 @@
 {
   "name": "@embroider/vite",
   "version": "0.2.0",
-  "main": "index.mjs",
+  "type": "module",
+  "exports": {
+    ".": {
+      "default": "./index.mjs",
+      "types": "./index.d.ts"
+    }
+  },
   "peerDependencies": {
     "@embroider/core": "workspace:^",
     "vite": "^5.2.0"
@@ -13,9 +19,9 @@
     "@babel/core": "^7.22.9",
     "@embroider/macros": "workspace:*",
     "@embroider/reverse-exports": "workspace:*",
-    "@rollup/pluginutils": "^4.1.1",
+    "@rollup/pluginutils": "^5.1.0",
     "assert-never": "^1.2.1",
-    "content-tag": "^2.0.1",
+    "content-tag": "^2.0.2",
     "debug": "^4.3.2",
     "esbuild": "^0.17.19",
     "fast-glob": "^3.3.2",

packages/vite/src/assets.ts

@@ -1,9 +1,11 @@
 import type { Resolver } from '@embroider/core';
-import { ResolverLoader } from '@embroider/core';
+import core from '@embroider/core';
+const { ResolverLoader } = core;
 import type { Plugin } from 'vite';
 import * as process from 'process';
 import { join, posix } from 'path';
-import { existsSync, readFileSync, lstatSync } from 'fs-extra';
+import fs from 'fs-extra';
+const { existsSync, readFileSync, lstatSync } = fs;
 import send from 'send';
 import type { Readable } from 'stream';
 

packages/vite/src/content-for.ts

@@ -1,7 +1,9 @@
 import type { Plugin } from 'vite';
-import { readJSONSync } from 'fs-extra';
+import fs from 'fs-extra';
+const { readJSONSync } = fs;
 import { join } from 'path';
-import { locateEmbroiderWorkingDir } from '@embroider/core';
+import core from '@embroider/core';
+const { locateEmbroiderWorkingDir } = core;
 
 export function contentFor(): Plugin {
   return {

packages/vite/src/esbuild-request.ts

@@ -1,8 +1,9 @@
-import { type ModuleRequest, cleanUrl, packageName } from '@embroider/core';
+import core from '@embroider/core';
+const { cleanUrl, packageName } = core;
 import type { ImportKind, OnResolveResult, PluginBuild } from 'esbuild';
 import { dirname } from 'path';
 
-import type { PackageCache as _PackageCache, Resolution } from '@embroider/core';
+import type { PackageCache as _PackageCache, Resolution, ModuleRequest } from '@embroider/core';
 import { externalName } from '@embroider/reverse-exports';
 
 type PublicAPI<T> = { [K in keyof T]: T[K] };

packages/vite/src/esbuild-resolver.ts

@@ -1,9 +1,11 @@
 import type { Plugin as EsBuildPlugin, OnLoadResult, PluginBuild, ResolveResult } from 'esbuild';
 import { transform } from '@babel/core';
-import { ResolverLoader, virtualContent, needsSyntheticComponentJS, isInComponents } from '@embroider/core';
-import { readFileSync } from 'fs-extra';
-import { EsBuildModuleRequest } from './esbuild-request';
-import assertNever from 'assert-never';
+import core from '@embroider/core';
+const { ResolverLoader, virtualContent, needsSyntheticComponentJS, isInComponents } = core;
+import fs from 'fs-extra';
+const { readFileSync } = fs;
+import { EsBuildModuleRequest } from './esbuild-request.js';
+import { assertNever } from 'assert-never';
 import { hbsToJS } from '@embroider/core';
 import { Preprocessor } from 'content-tag';
 import { extname } from 'path';

packages/vite/src/optimize-deps.ts

@@ -1,4 +1,4 @@
-import { esBuildResolver } from './esbuild-resolver';
+import { esBuildResolver } from './esbuild-resolver.js';
 
 export interface OptimizeDeps {
   exclude?: string[];

packages/vite/src/request.ts

@@ -1,5 +1,6 @@
 import type { ModuleRequest, Resolution } from '@embroider/core';
-import { cleanUrl, getUrlQueryParams } from '@embroider/core';
+import core from '@embroider/core';
+const { cleanUrl, getUrlQueryParams } = core;
 import type { PluginContext, ResolveIdResult } from 'rollup';
 
 export const virtualPrefix = 'embroider_virtual:';

packages/vite/src/resolver.ts

@@ -1,10 +1,11 @@
 import type { Plugin, ViteDevServer } from 'vite';
-import { virtualContent, ResolverLoader } from '@embroider/core';
-import { RollupModuleRequest, virtualPrefix } from './request';
-import assertNever from 'assert-never';
+import core from '@embroider/core';
+const { virtualContent, ResolverLoader } = core;
+import { RollupModuleRequest, virtualPrefix } from './request.js';
+import { assertNever } from 'assert-never';
 import makeDebug from 'debug';
 import { resolve } from 'path';
-import { writeStatus } from './esbuild-request';
+import { writeStatus } from './esbuild-request.js';
 import type { PluginContext } from 'rollup';
 
 const debug = makeDebug('embroider:vite');

packages/vite/src/scripts.ts

@@ -1,7 +1,8 @@
 import type { Plugin } from 'vite';
 import type { EmittedFile } from 'rollup';
 import { JSDOM } from 'jsdom';
-import { readFileSync, readJSONSync, existsSync } from 'fs-extra';
+import fs from 'fs-extra';
+const { readFileSync, readJSONSync, existsSync } = fs;
 import { dirname, posix, resolve } from 'path';
 
 // This is a type-only import, so it gets compiled away. At runtime, we load
@@ -93,7 +94,7 @@ class ScriptOptimizer {
         terserOpts.sourceMap = { content, url: fileRelativeSourceMapURL };
       }
     }
-    let { code: outCode, map: outMap } = await Terser.default.minify(inCode, terserOpts);
+    let { code: outCode, map: outMap } = await Terser.minify(inCode, terserOpts);
     let finalFilename = await this.getFingerprintedFilename(script, outCode!);
     let emit: EmittedFile[] = [];
     emit.push({

packages/webpack/src/ember-webpack.ts

@@ -34,10 +34,13 @@ import { EmbroiderPlugin } from './webpack-resolver-plugin';
 
 const debug = makeDebug('embroider:debug');
 
-// This is a type-only import, so it gets compiled away. At runtime, we load
-// terser lazily so it's only loaded for production builds that use it. Don't
-// add any non-type-only imports here.
-import type { MinifyOptions } from 'terser';
+// this function is never called. It exists to workaround typescript being
+// obtuse. https://github.com/microsoft/TypeScript/pull/53426
+async function loadTerser() {
+  let Terser = await import('terser');
+  return Terser.minify;
+}
+type MinifyOptions = NonNullable<Parameters<Awaited<ReturnType<typeof loadTerser>>>[1]>;
 
 interface AppInfo {
   entrypoints: HTMLEntrypoint[];
@@ -331,7 +334,7 @@ const Webpack: PackagerConstructor<Options> = class Webpack implements Packager
         terserOpts.sourceMap = { content, url: fileRelativeSourceMapURL };
       }
     }
-    let { code: outCode, map: outMap } = await Terser.default.minify(inCode, terserOpts);
+    let { code: outCode, map: outMap } = await Terser.minify(inCode, terserOpts);
     let finalFilename = this.getFingerprintedFilename(script, outCode!);
     outputFileSync(join(this.outputPath, finalFilename), outCode!);
     written.add(script);