Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update vite #183

Merged
merged 1 commit into from
Feb 8, 2025
Merged

update vite #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/babel-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import type * as Babel from '@babel/core';
import * as glimmer from '@glimmer/syntax';
import { ASTv1, NodeVisitor, WalkerPath } from '@glimmer/syntax';
import { ImportUtil } from 'babel-import-util';
import { join } from 'path';

interface ASTPluginEnvironment {
locals: string[];
Expand Down Expand Up @@ -354,13 +353,16 @@ export default function hotReplaceAst(babel: typeof Babel) {
((specifier as ImportSpecifier).imported as StringLiteral)?.value ||
'default';

// const timestamp = Date.now();
const sourceId = source.replace(
/@embroider\/virtual/g,
'embroider_virtual',
);
const ast = parse(`
(async () => {
const c = await import('/ember-vite-hmr/virtual/component:${source}:${specifierName}.gjs');
const c = await import('/ember-vite-hmr/virtual/component:${sourceId}:${specifierName}.gjs');
${hotAstProcessor.meta.importVar}.${imp} = c.default;
})()
import.meta.hot.accept('/ember-vite-hmr/virtual/component:${source}:${specifierName}.gjs', (c) => {
import.meta.hot.accept('/ember-vite-hmr/virtual/component:${sourceId}:${specifierName}.gjs', (c) => {
${hotAstProcessor.meta.importVar}.${imp} = c['${specifierName}'];
});
import.meta.hot.accept('${source}');
Expand Down
144 changes: 72 additions & 72 deletions lib/hmr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,14 @@ const cachedYields: Record<
}
> = {};

function getYieldsFromFile(filename: string, noCache?: boolean) {
function getYieldsFromFile(
filename: string,
content: string,
noCache?: boolean,
) {
if (cachedYields[filename] && !noCache) {
return cachedYields[filename];
}
const content = readFileSync(filename).toString();
// very basic, todo: make this use AST
const matches = content.matchAll(/to=['"\\]+(\w+)['"\\]+/g);
const yields = new Set(
Expand Down Expand Up @@ -119,63 +122,41 @@ export function hmr(enableViteHmrForModes: string[] = ['development']): Plugin {
.includes(config.mode)
.toString();
},
resolveId(id, importer) {
resolveId(id, importer, meta) {
if (importer?.startsWith(virtualPrefix)) {
importer = path.join(process.cwd(), 'package.json');
return this.resolve(id, importer);
return this.resolve(id, importer, meta);
}
if (id.startsWith(virtualPrefix)) {
return id;
}
if (id.startsWith('/@id/embroider_virtual:')) {
return this.resolve(
id.replace('/@id/', ''),
path.join(process.cwd(), 'package.json'),
);
}
if (id.startsWith(`/@id/${virtualPrefix}`)) {
return this.resolve(
id.replace('/@id/', ''),
path.join(process.cwd(), 'package.json'),
);
}
if (id === '/ember-vite-hmr/services/vite-hot-reload') {
return this.resolve(
'ember-vite-hmr/services/vite-hot-reload',
path.join(process.cwd(), 'package.json'),
meta,
);
}
},
async load(id: string) {
if (
cachedYields[id] &&
difference(cachedYields[id].yields, getYieldsFromFile(id, true).yields)
.length
) {
for (const y of getYieldsFromFile(id, true).yields) {
cachedYields[id].yields.add(y);
}
const modules = cachedYields[id].modules;
delete cachedYields[id];
for (const module of modules) {
server.moduleGraph.onFileChange(module);
let m = server.moduleGraph.getModuleById(module);
if (m) {
await server.reloadModule(m);
}
}
}
if (id.startsWith(virtualPrefix)) {
const [imp, specifier] = id
.split('?')[0]
let [imp, specifier] = id
.split('?')[0]!
.slice(virtualPrefix.length, -'.gts'.length)
.split(':');
imp = imp!.replace('embroider_virtual', '@embroider/virtual');
let filename = imp!;
if (filename.includes('__vpc__')) {
filename = filename.split('__vpc__')[0]!;
}
const resolved = await this.resolve(filename, id);
const cached = getYieldsFromFile(resolved.id);
// @ts-ignore
const res = await server.transformRequest(filename);
const content = res?.code;
const resId = await this.resolve(
filename,
path.resolve(process.cwd(), 'package.json'),
);
const cached = getYieldsFromFile(resId!.id, content!);
const yields = cached.yields;
cached.modules.push(id);
return getHotComponent(
Expand Down Expand Up @@ -224,6 +205,32 @@ export function hmr(enableViteHmrForModes: string[] = ['development']): Plugin {
}
return [...ctx.modules, ...otherModules];
},
async hotUpdate(options) {
if (options.type === 'update' || options.type === 'create') {
const id = options.file;
const source = readFileSync(id).toString();
if (
cachedYields[id] &&
difference(
cachedYields[id].yields,
getYieldsFromFile(id, source, true).yields,
).length
) {
for (const y of getYieldsFromFile(id, source).yields) {
cachedYields[id].yields.add(y);
}
const modules = cachedYields[id].modules;
delete cachedYields[id];
for (const module of modules) {
server.moduleGraph.onFileChange(module);
let m = server.moduleGraph.getModuleById(module);
if (m) {
await server.reloadModule(m);
}
}
}
}
},
async transform(source, id) {
if (process.env['EMBER_VITE_HMR_ENABLED'] !== 'true') {
return source;
Expand All @@ -246,6 +253,8 @@ export function hmr(enableViteHmrForModes: string[] = ['development']): Plugin {
if (resourcePath.includes('ember-vite-hmr/virtual/components')) {
return source;
}

const map: Record<string, string> = {};
if (!resourcePath.includes(`node_modules`)) {
const resolveDep = async (dep: string) => {
const resolved = await this.resolve(dep, resourcePath, {});
Expand Down Expand Up @@ -280,9 +289,7 @@ export function hmr(enableViteHmrForModes: string[] = ['development']): Plugin {
const dep = resultElement[1]!;
let possibleVirtual = { dep, specifier: null as any };
if (dep.includes(virtualPrefix)) {
const [imp, specifier] = dep
.slice(virtualPrefix.length)
.split(':');
const [imp, specifier] = dep.slice(virtualPrefix.length).split(':');
possibleVirtual.dep = imp!;
possibleVirtual.specifier = specifier;
}
Expand All @@ -293,39 +300,32 @@ export function hmr(enableViteHmrForModes: string[] = ['development']): Plugin {
id = virtualPrefix + id + ':' + possibleVirtual.specifier;
}
didReplaceSources = true;
source = source.replace(
`import.meta.hot.accept('${dep}'`,
`import.meta.hot.accept('${id}'`,
);
source = source.replace(
`import.meta.hot.accept("${dep}"`,
`import.meta.hot.accept("${id}"`,
);
}
const importMatches = [...source.matchAll(/import\(['"]([^']+)['"]/g)];
for (const resultElement of importMatches) {
const dep = resultElement[1]!;
if (!dep.startsWith(virtualPrefix)) {
continue;
}
const [imp, specifier] = dep
.slice(virtualPrefix.length, -'.gts'.length)
.split(':');
const id = await resolveDep(imp!);
if (!id) continue;
if (dep === id) continue;
didReplaceSources = true;
source = source.replace(
`import('${virtualPrefix}${imp}`,
`import('${virtualPrefix}${id}`,
);
source = source.replace(
`import("${virtualPrefix}${imp}`,
`import("${virtualPrefix}${id}`,
);
map[dep] = id;
}
}

source = source.replace(
/import.meta.hot.accept\(['"]([^'"]+)['"]/g,
function (str, group) {
if (group.startsWith(virtualPrefix) && map[group]) {
const id = map[group];
return `import.meta.hot.accept("${id}"`;
}
return str;
},
);

source = source.replace(
/import\(['"]([^'"]+)['"]/g,
function (str, group) {
if (group.startsWith(virtualPrefix) && map[group]) {
const id = map[group];
return `import("${id}"`;
}
return str;
},
);

if (didReplaceSources) {
source = transformSync(source, {
filename: id,
Expand All @@ -342,7 +342,7 @@ export function hmr(enableViteHmrForModes: string[] = ['development']): Plugin {
node.arguments[0].value.includes(
'ember-vite-hmr/virtual/component',
) &&
node.arguments[0].value.includes('node_modules')
map[node.arguments[0].value]?.includes('node_modules')
) {
let IfStatement = path as NodePath;
while (IfStatement.type !== 'IfStatement') {
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"build": "concurrently 'pnpm:build:*'",
"build:js": "rollup --config",
"build:lib": "tsc --p tsconfig.lib.json",
"watch:lib": "tsc --p tsconfig.lib.json --watch",
"build:types": "glint --declaration",
"lint": "concurrently 'npm:lint:*(!fix)' --names 'lint:'",
"lint:fix": "concurrently 'npm:lint:*:fix' --names 'fix:'",
Expand Down Expand Up @@ -104,7 +105,7 @@
"terser": "^5.7.0",
"thread-loader": "^4.0.2",
"typescript": "^5.1.6",
"vite": "^5.2.11",
"vite": "^6.1.0",
"vitest": "^2.0.5"
},
"peerDependencies": {
Expand Down
Loading