Skip to content

Commit

Permalink
feat: move plugins under platform package (#146)
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonroberts committed Nov 15, 2022
1 parent 295bdac commit cbc0264
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 18 deletions.
15 changes: 7 additions & 8 deletions apps/analog-app/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/// <reference types="vitest" />

import platform from '@analogjs/platform';
import angular from '@analogjs/vite-plugin-angular';
import analog from '@analogjs/platform';
import { offsetFromRoot } from '@nrwl/devkit';
import { visualizer } from 'rollup-plugin-visualizer';
import { defineConfig, Plugin, splitVendorChunkPlugin } from 'vite';
Expand All @@ -27,12 +26,10 @@ export default defineConfig(({ mode }) => {
mainFields: ['module'],
},
plugins: [
angular({
inlineStylesExtension: 'scss',
}),
visualizer() as Plugin,
splitVendorChunkPlugin(),
platform({
analog({
vite: {
inlineStylesExtension: 'scss',
},
nitro: {
output: {
dir: `${offsetFromRoot(
Expand All @@ -44,6 +41,8 @@ export default defineConfig(({ mode }) => {
)}/dist/apps/analog-app/.nitro`,
},
}),
visualizer() as Plugin,
splitVendorChunkPlugin(),
],
test: {
globals: true,
Expand Down
4 changes: 2 additions & 2 deletions packages/platform/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { analogPlatform } from './lib/analog-platform-plugin';
import { platformPlugin } from './lib/platform-plugin';

export default analogPlatform;
export default platformPlugin;
7 changes: 7 additions & 0 deletions packages/platform/src/lib/options.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import type { PluginOptions } from '@analogjs/vite-plugin-angular';
import { NitroConfig } from 'nitropack';

export interface Options {
vite?: PluginOptions;
nitro?: NitroConfig;
}
9 changes: 9 additions & 0 deletions packages/platform/src/lib/platform-plugin.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Plugin } from 'vite';
import angular from '@analogjs/vite-plugin-angular';

import { Options } from './options';
import { viteNitroPlugin } from './vite-nitro-plugin';

export function platformPlugin(opts?: Options): Plugin[] {
return [viteNitroPlugin(opts?.nitro), ...angular(opts?.vite)];
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, it, vi } from 'vitest';
import { analogPlatform } from './analog-platform-plugin';
import { viteNitroPlugin } from './vite-nitro-plugin';

const mockViteDevServer = {
middlewares: {
Expand All @@ -8,21 +8,21 @@ const mockViteDevServer = {
},
};

describe('analogPlatformVitePlugin', () => {
describe('viteNitroPlugin', () => {
afterEach(() => {
vi.restoreAllMocks();
});

it('should work', () => {
expect(analogPlatform({}).name).toEqual('vite-nitro-plugin');
expect(viteNitroPlugin({}).name).toEqual('vite-nitro-plugin');
});

it(`should have the route middleware "/api" `, async () => {
// Arrange
const spy = vi.spyOn(mockViteDevServer.middlewares, 'use');

// Act
await (analogPlatform({}).configureServer as any)(mockViteDevServer);
await (viteNitroPlugin({}).configureServer as any)(mockViteDevServer);

// Assert
expect(spy).toHaveBeenCalledTimes(1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ import { NitroConfig } from 'nitropack';
import { toNodeListener } from 'h3';
import { Plugin, ViteDevServer } from 'vite';

export function analogPlatform(opts: { nitro?: NitroConfig }): Plugin {
export function viteNitroPlugin(opts?: NitroConfig): Plugin {
const nitroConfig: NitroConfig = {
rootDir: 'src',
srcDir: 'src/server',
scanDirs: ['src/server'],
output: {
dir: '../../dist/server',
...opts.nitro?.output,
...opts?.output,
},
buildDir: '../dist/.nitro',
...opts.nitro,
...opts,
};
return {
name: 'vite-nitro-plugin',
Expand Down Expand Up @@ -45,7 +45,9 @@ export function analogPlatform(opts: { nitro?: NitroConfig }): Plugin {
await prepare(nitro);
await build(nitro);
await nitro.close();
console.log(`\n\nThe '@analogjs/platform' successfully built.`);
console.log(
`\n\nThe '@analogjs/platform' server has been successfully built.`
);
},
};
}

0 comments on commit cbc0264

Please sign in to comment.