Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/applications/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"target": "es2022",
"module": "ESNext",
"outDir": "./dist",
"rootDir": "./src",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"strict": true,
Expand Down
8 changes: 3 additions & 5 deletions packages/builder/vite.config.mjs
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import { createViteConfig } from '@aziontech/vite-config';
import { resolve } from 'path';

export default createViteConfig({
dirname: __dirname,
ssr: true,
alias: {
'@aziontech/unenv-preset': resolve(__dirname, '../unenv-preset/src/'),
'@aziontech/utils/node': resolve(__dirname, '../utils/src/node/'),
},
external: [
'@edge-runtime/primitives',
'@fastly/http-compute-js',
'@aziontech/unenv-preset',
'@aziontech/utils',
'@aziontech/config',
'@aziontech/presets',
'accepts',
'browserify-zlib',
'dotenv',
Expand Down
4 changes: 0 additions & 4 deletions packages/bundler-telemetry/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,6 @@ compareReports(report1: TelemetryReport, report2: TelemetryReport): object
extractPluginMetrics(spans: TelemetrySpan[]): TelemetryPluginMetrics[]
```

## Environment Variables

- `AZION_TELEMETRY=false` - Disable telemetry collection

## License

MIT
4 changes: 4 additions & 0 deletions packages/bundler-telemetry/src/collector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -309,4 +309,8 @@ export class TelemetryCollector {
private generateSpanId(): string {
return `span_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
}

getConfig(): TelemetryConfig {
return this.config;
}
}
14 changes: 7 additions & 7 deletions packages/bundler-telemetry/src/reporter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,14 @@ export function compareReports(
}

export const runPhaseWithTelemetry = async <T>(
telemetry: TelemetryCollector,
telemetryEnabled: boolean,
outputFormat: TelemetryOutputFormat,
telemetry: TelemetryCollector | undefined,
telemetryEnabled: boolean | undefined,
outputFormat: TelemetryOutputFormat | undefined,
phaseName: string,
displayName: string,
fn: () => Promise<T>,
): Promise<T> => {
const spanId = telemetry.startSpan(phaseName);
const spanId = telemetry?.startSpan(phaseName) ?? '';
if (telemetryEnabled && outputFormat !== 'json' && outputFormat !== 'html') {
console.log(
formatPhaseStart({
Expand All @@ -240,14 +240,14 @@ export const runPhaseWithTelemetry = async <T>(
}
try {
const result = await fn();
telemetry.endSpan(spanId);
telemetry?.endSpan(spanId);
if (telemetryEnabled && outputFormat !== 'json' && outputFormat !== 'html') {
const span = telemetry.getSpan(spanId);
const span = telemetry?.getSpan(spanId);
if (span) console.log(formatPhaseComplete(span));
}
return result;
} catch (error) {
telemetry.endSpan(spanId);
telemetry?.endSpan(spanId);
throw error;
}
};
12 changes: 0 additions & 12 deletions packages/client/vite.config.mjs
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
import { createViteConfig } from '@aziontech/vite-config';
import { resolve } from 'path';

export default createViteConfig({
dirname: __dirname,
ssr: true,
alias: {
'@aziontech/ai': resolve(__dirname, '../ai/src/'),
'@aziontech/sql': resolve(__dirname, '../sql/src/'),
'@aziontech/storage': resolve(__dirname, '../storage/src/'),
'@aziontech/purge': resolve(__dirname, '../purge/src/'),
'@aziontech/config': resolve(__dirname, '../config/src/'),
'@aziontech/domains': resolve(__dirname, '../domains/src/'),
'@aziontech/applications': resolve(__dirname, '../applications/src/'),
'@aziontech/types': resolve(__dirname, '../types/src/'),
azion: resolve(__dirname, './src/'),
},
dts: {
aliasesExclude: [/^azion\//],
},
Expand Down
6 changes: 0 additions & 6 deletions packages/config/vite.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { createViteConfig } from '@aziontech/vite-config';
import { resolve } from 'path';

export default createViteConfig({
dirname: __dirname,
Expand All @@ -8,11 +7,6 @@ export default createViteConfig({
index: 'src/index.ts',
rules: 'src/rules/index.ts',
},
alias: {
'@aziontech/unenv-preset': resolve(__dirname, '../unenv-preset/src/'),
'@aziontech/utils/node': resolve(__dirname, '../utils/src/node/'),
'@aziontech/builder': resolve(__dirname, '../builder/src/'),
},
external: ['ajv', 'ajv-errors', 'ajv-keywords', 'mathjs'],
dts: {
aliasesExclude: [/^azion\//],
Expand Down
10 changes: 5 additions & 5 deletions packages/presets/docs/preset-nuxt.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const require = createRequire(import.meta.url);

export default defineNuxtConfig({
nitro: {
preset: require.resolve('@aziontech/preset/nuxt/ssr'),
preset: require.resolve('@aziontech/presets/nuxt/ssr'),
},
});
```
Expand All @@ -36,7 +36,7 @@ Or directly with the path node_modules:
```typescript
export default defineNuxtConfig({
nitro: {
preset: './node_modules/@aziontech/packages/presets/src/presets/nuxt/nitro/ssr',
preset: './node_modules/@aziontech/presets/src/presets/nuxt/nitro/ssr',
},
});
```
Expand All @@ -49,7 +49,7 @@ If you're using `nuxt-og-image` in your project with SSR, you need to add the fo
export default defineNuxtConfig({
modules: ['nuxt-og-image'],
nitro: {
preset: require.resolve('@aziontech/preset/nuxt/ssr'),
preset: require.resolve('@aziontech/presets/nuxt/ssr'),
},
ogImage: {
compatibility: {
Expand All @@ -73,7 +73,7 @@ const require = createRequire(import.meta.url);

export default defineNuxtConfig({
nitro: {
preset: require.resolve('@aziontech/preset/nuxt/ssg'),
preset: require.resolve('@aziontech/presets/nuxt/ssg'),
},
});
```
Expand All @@ -83,7 +83,7 @@ Or directly with the path node_modules:
```typescript
export default defineNuxtConfig({
nitro: {
preset: './node_modules/@aziontech/packages/presets/src/presets/nuxt/nitro/ssg',
preset: './node_modules/@aziontech/presets/src/presets/nuxt/nitro/ssg',
},
});
```
Expand Down
2 changes: 1 addition & 1 deletion packages/presets/docs/preset-svelte.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ npm install azion
Configure your `svelte.config.js` to use the Azion SSR adapter:

```javascript
import adapter from '@aziontech/preset/svelte/ssr';
import adapter from '@aziontech/preset/sveltekit';

/** @type {import('@sveltejs/kit').Config} */
const config = {
Expand Down
10 changes: 5 additions & 5 deletions packages/presets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"require": "./dist/index.cjs",
"import": "./dist/index.mjs"
},
"./preset/nuxt/*": "./src/presets/nuxt/nitro/*/index.js",
"./preset/sveltekit/*": "./src/presets/svelte/kit/index.js",
"./preset/sveltekit/cache/*": "./src/presets/svelte/kit/cache/index.js",
"./presets/preset/*": "./dist/presets/*"
"./nuxt/*": "./src/presets/nuxt/nitro/*/index.js",
"./sveltekit": "./src/presets/svelte/kit/index.js",
"./sveltekit/cache": "./src/presets/svelte/kit/cache/index.js",
"./preset/*": "./dist/presets/*"
},
"author": "aziontech",
"license": "MIT",
Expand All @@ -36,7 +36,6 @@
],
"dependencies": {
"@aziontech/config": "workspace:*",
"@aziontech/presets": "workspace:*",
"@aziontech/types": "workspace:*",
"@aziontech/unenv-preset": "workspace:*",
"@aziontech/utils": "workspace:*",
Expand All @@ -45,6 +44,7 @@
"pcre-to-regexp": "^1.1.0",
"semver": "^7.7.4",
"ts-jest": "^29.4.9",
"mime-types": "^3.0.1",
"webpack": "^5.97.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/presets/src/presets/svelte/kit/files/worker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { lookup as lookupCache, save as saveCache } from '@aziontech/presets/preset/sveltekit/cache/default';
import { lookup as lookupCache, save as saveCache } from '@aziontech/presets/sveltekit/cache';
import { base_path, manifest, prerendered } from 'MANIFEST';
import { Server } from 'SERVER';

Expand Down
2 changes: 1 addition & 1 deletion packages/presets/src/presets/svelte/prebuild.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ async function readSvelteConfig() {
}

const content = await readFile(configPath, 'utf8');
const hasAzionPreset = /@aziontech\/presets\/preset\/sveltekit/i.test(content);
const hasAzionPreset = /@aziontech\/presets\/sveltekit/i.test(content);
const hasAzionAdapter = /@sveltejs\/adapter-azion/i.test(content);
const hasAzionConfig = hasAzionPreset || hasAzionAdapter;

Expand Down
15 changes: 3 additions & 12 deletions packages/presets/vite.config.mjs
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
import { createViteConfig } from '@aziontech/vite-config';
import { resolve } from 'path';

export default createViteConfig({
dirname: __dirname,
ssr: true,
alias: {
'@aziontech/unenv-preset': resolve(__dirname, '../unenv-preset/src/'),
'@aziontech/utils/edge': resolve(__dirname, '../utils/src/edge/'),
'@aziontech/utils/node': resolve(__dirname, '../utils/src/node/'),
'@aziontech/utils': resolve(__dirname, '../utils/src/'),
'@aziontech/config': resolve(__dirname, '../config/src/'),
'@aziontech/config/rules': resolve(__dirname, '../config/src/rules/'),
'@aziontech/presets': resolve(__dirname, '../presets/src/'),
'@aziontech/builder': resolve(__dirname, '../builder/src/'),
'@aziontech/types': resolve(__dirname, '../types/src/'),
},
external: (id) => {
if (id.includes('node_modules')) return true;

Expand All @@ -29,6 +17,9 @@ export default createViteConfig({
'fs/promises',
'path',
'cookie',
'@aziontech/unenv-preset',
'@aziontech/utils',
'@aziontech/config',
];

return deps.some((dep) => id === dep || id.startsWith(`${dep}/`));
Expand Down
16 changes: 3 additions & 13 deletions packages/presets/vite.config.presets.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,6 @@ const getPresetsEntries = () => {
};

export default defineConfig({
resolve: {
alias: {
'@aziontech/unenv-preset': resolve(__dirname, '../unenv-preset/src/'),
'@aziontech/utils/edge': resolve(__dirname, '../utils/src/edge/'),
'@aziontech/utils/node': resolve(__dirname, '../utils/src/node/'),
'@aziontech/utils': resolve(__dirname, '../utils/src/'),
'@aziontech/config/rules': resolve(__dirname, '../config/src/rules/'),
'@aziontech/config': resolve(__dirname, '../config/src/'),
'@aziontech/presets': resolve(__dirname, '../presets/src/'),
'@aziontech/builder': resolve(__dirname, '../builder/src/'),
'@aziontech/types': resolve(__dirname, '../types/src/'),
},
},
build: {
ssr: true,
emptyOutDir: false,
Expand All @@ -54,6 +41,9 @@ export default defineConfig({
'fs',
'fs/promises',
'path',
'@aziontech/unenv-preset',
'@aziontech/utils',
'@aziontech/config',
];

return deps.some((dep) => id === dep || id.startsWith(`${dep}/`));
Expand Down
3 changes: 3 additions & 0 deletions packages/unenv-preset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@
"src/polyfills/*"
],
"dependencies": {
"accepts": "^1.3.8",
"assert-browserify": "^2.0.0",
"browserify-zlib": "^0.2.0",
"base64-js": "^1.5.1",
"crypto-browserify": "^3.12.1",
"string_decoder": "^1.3.0",
"timers-browserify": "^2.0.12",
"unenv": "^2.0.0-rc.15",
"url": "^0.11.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/unenv-preset/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default {
buffer: `${polyfillsPath}/node/buffer.js`,
https: `${polyfillsPath}/node/https.js`,
module: `${polyfillsPath}/node/module.js`,
string_decoder: 'string_decoder',
string_decoder: 'string_decoder/',
timers: 'timers-browserify',
util: `${polyfillsPath}/node/util.js`,
zlib: `${polyfillsPath}/node/zlib.js`,
Expand Down
11 changes: 10 additions & 1 deletion packages/unenv-preset/vite.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,14 @@ import { createViteConfig } from '@aziontech/vite-config';
export default createViteConfig({
dirname: __dirname,
ssr: true,
external: ['crypto-browserify'],
external: [
'crypto-browserify',
'assert-browserify',
'browserify-zlib',
'string_decoder',
'unenv',
'url',
'accepts',
'timers-browserify',
],
});
15 changes: 12 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading