Skip to content

deps: generator update #17

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

deps: generator update #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b765c
deps: upgrade to latest generator toolchain
guybedford Aug 5, 2024
552838d
fixup
guybedford Oct 1, 2024
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
1 change: 1 addition & 0 deletions chompfile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ version = 0.1
[[task]]
name = 'test'
run = 'node test/test.js'
# env = { JSPM_GENERATOR_LOG = '1' }
18 changes: 8 additions & 10 deletions jspm-rollup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,20 +152,14 @@ export default ({ baseUrl, defaultProvider = 'nodemodules', env = ['browser', 'd
cache = Object.create(null);

// run the generator phase _first_
generator = new Generator({ mapUrl: baseUrl, env, defaultProvider, inputMap });

// (async () => {
// for await (const { type, message } of generator.logStream()) {
// console.log(`${type}: ${message}`);
// }
// })();
generator = new Generator({ mapUrl: baseUrl, env, defaultProvider, inputMap, commonJS: true, typeScript: true });

if (minify && !terser)
terser = await import('terser');

// always trace process and buffer builtins
try {
await Promise.all([generator.traceInstall('process'), generator.traceInstall('buffer'), generator.traceInstall('module')]);
await Promise.all([generator.link('process'), generator.link('buffer'), generator.link('module')]);
processBuiltinResolved = generator.importMap.resolve('process');
bufferBuiltinResolved = generator.importMap.resolve('buffer');
moduleBuiltinResolved = generator.importMap.resolve('module');
Expand All @@ -175,11 +169,14 @@ export default ({ baseUrl, defaultProvider = 'nodemodules', env = ['browser', 'd
}

await Promise.all(Object.values(opts.input).map(async specifier => {
await generator.traceInstall(specifier, baseUrl.href);
await generator.link(specifier, baseUrl.href);
}));

// Pending next Generator update
importMap = new ImportMap(generator.importMap.mapUrl, generator.importMap.toJSON());
importMap = new ImportMap({
mapUrl: generator.importMap.mapUrl,
map: generator.importMap.toJSON()
});

if (externals) {
externalsMap = new Map();
Expand Down Expand Up @@ -384,6 +381,7 @@ export default ({ baseUrl, defaultProvider = 'nodemodules', env = ['browser', 'd
}
if (depId === 'buffer' || depId === 'module' || depId === 'process')
return true;
if (depId.endsWith('/')) depId = depId.slice(0, -1);
const resolved = importMap.resolve(depId, id);
if (!resolved)
throw new Error('Could not resolve ' + depId + ' in ' + id);
Expand Down
17 changes: 8 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,21 @@
"identifier.mjs"
],
"dependencies": {
"@babel/core": "^7.14.8",
"@babel/preset-typescript": "^7.14.5",
"@babel/core": "^7.25.2",
"@babel/preset-typescript": "^7.24.7",
"@jspm/core": "^2.0.0-beta.8",
"@jspm/generator": "^1.0.0-beta.11",
"@jspm/import-map": "^0.1.5",
"@jspm/generator": "^2.3.1",
"@jspm/import-map": "^1.1.0",
"babel-plugin-transform-cjs-dew": "github:jspm/babel-plugin-transform-cjs-dew#main",
"cjs-module-lexer": "^1.2.2",
"terser": "^5.7.1",
"typescript": "^4.8.4"
"cjs-module-lexer": "^1.3.1",
"terser": "^5.31.3",
"typescript": "^5.5.4"
},
"devDependencies": {
"chalk": "^2.3.0",
"cjs-module-lexer": "^1.2.2",
"lodash": "^4.17.4",
"mocha": "^9.0.2",
"rollup": "^2.55.1"
"rollup": "^4.20.0"
},
"type": "module"
}
2 changes: 1 addition & 1 deletion test/chunked.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ suite('Chunked builds', () => {

const { output: [babel, lodash] } = await bundle.write({ format: 'esm', dir: outFixturesPath });

assert.strictEqual(Object.keys(babel.modules).length, 277);
assert.strictEqual(Object.keys(babel.modules).length, 306);
assert.strictEqual(Object.keys(lodash.modules).length, 138);

// test we can execute (assertions in code)
Expand Down