feat: change access-api wrangler.toml to be no_bundle=false. use wrangler bundling #739
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| .dev.vars |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* eslint-disable unicorn/prefer-top-level-await */ | ||
| /* eslint-disable no-console */ | ||
| /* eslint-disable unicorn/prefer-module */ | ||
| /** | ||
| * @file | ||
| * use this at build time (node.js) to create files that can be | ||
| * imported at runtime (maybe workerd). | ||
| */ | ||
| import sade from 'sade' | ||
| import * as url from 'node:url' | ||
| import { getReleaseName } from '../src/utils/release.node.js' | ||
| import path from 'path' | ||
| import { fileURLToPath } from 'url' | ||
| // @ts-ignore | ||
| import git from 'git-rev-sync' | ||
|
|
||
| function __dirname() { | ||
| return path.dirname(fileURLToPath(import.meta.url)) | ||
| } | ||
|
|
||
| if (import.meta.url.startsWith('file:')) { | ||
| const modulePath = url.fileURLToPath(import.meta.url) | ||
| if (process.argv[1] === modulePath) { | ||
| main().catch((error) => { | ||
| throw error | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| async function main(argv = process.argv) { | ||
| const cli = sade('access-api-release') | ||
| cli | ||
| .command('name', '', { default: true }) | ||
| .option('--env', 'Environment', process.env.ENV) | ||
| .action((opts) => { | ||
| const releaseName = getReleaseName(opts.env) | ||
| console.log(releaseName) | ||
| }) | ||
| cli | ||
| .command('esm', 'print release info as ES Module string') | ||
| .option('--env', 'Environment', process.env.ENV) | ||
| .action((opts) => { | ||
| const lines = [ | ||
| `/** @type {string|undefined} */`, | ||
| `export const gitRevShort = '${git.short(__dirname())}'`, | ||
| `/** @type {string|undefined} */`, | ||
| `export const name = '${getReleaseName(opts.env)}'`, | ||
| ] | ||
| console.log(lines.join('\n')) | ||
| }) | ||
| cli.parse(argv) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /** | ||
| * @file | ||
| * This file MAY be rewritten during build | ||
| * to make some buildtime variables available at runtime. | ||
| */ | ||
| /** @type {string|undefined} */ | ||
| export const gitRevShort = undefined | ||
| /** @type {string|undefined} */ | ||
| export const name = undefined |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /** | ||
| * @file | ||
| * utils related to sentry that rely on node. | ||
| * These might be used at build time, | ||
| * but won't work at run-time in cloudflare workers | ||
| */ | ||
| /* eslint-disable no-console */ | ||
| /* eslint-disable unicorn/prefer-module */ | ||
|
|
||
| // @ts-ignore | ||
| import git from 'git-rev-sync' | ||
| import path from 'path' | ||
| import { fileURLToPath } from 'url' | ||
| import { createRequire } from 'node:module' | ||
|
|
||
| const packageJson = createRequire(import.meta.url)('../../package.json') | ||
| const __dirname = () => path.dirname(fileURLToPath(import.meta.url)) | ||
|
|
||
| /** | ||
| * Create a string to be used for the sentry release value | ||
| * | ||
| * @param {string} [env] - environment name e.g. 'dev' | ||
| * @param {object} pkg - package.json info | ||
| * @param {string} pkg.name | ||
| * @param {string} pkg.version | ||
| * @param {string} gitShort - git-rev-parse short value | ||
| * @returns {string} release name e.g. `@web3-storage__access-api@6.0.0-staging+92a89d3` | ||
| */ | ||
| export function getReleaseName( | ||
| env, | ||
| pkg = packageJson, | ||
| gitShort = git.short(__dirname()) | ||
| ) { | ||
| const version = `${pkg.name}@${pkg.version}-${env}+${gitShort}`.replace( | ||
| '/', | ||
| '__' | ||
| ) | ||
| return version | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is neat, but note that our other projects do this by injecting these in as variables into the bundle at build time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They do that using
no_bundle=trueand injection via custom esbuild, so this is a way of doing it withno_bundle=false.Yes it's different, but it seems worth it in order to get the stack traces.
If there's another way that works that seems better, lmk and I can try to implement.