feat: update template application to use platform and router packages (…

…#147)
analogjs · Nov 16, 2022 · c4f1619 · c4f1619
1 parent cbc0264
commit c4f1619
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 22 deletions.
diff --git a/packages/create-analog/template-angular-v14/package.json b/packages/create-analog/template-angular-v14/package.json
@@ -14,6 +14,7 @@
     "test": "vitest"
   },
   "dependencies": {
+    "@analogjs/router": "latest",
     "@angular/animations": "^14.0.0",
     "@angular/common": "^14.0.0",
     "@angular/compiler": "^14.0.0",
@@ -27,7 +28,7 @@
     "zone.js": "~0.11.8"
   },
   "devDependencies": {
-    "@analogjs/vite-plugin-angular": "latest",
+    "@analogjs/platform": "latest",
     "@angular-devkit/build-angular": "^14.0.3",
     "@angular/cli": "~14.0.3",
     "@angular/compiler-cli": "^14.0.0",

diff --git a/packages/create-analog/template-angular-v14/tsconfig.app.json b/packages/create-analog/template-angular-v14/tsconfig.app.json
@@ -7,5 +7,5 @@
     "types": []
   },
   "files": ["src/main.ts", "src/polyfills.ts"],
-  "include": ["src/**/*.d.ts"]
+  "include": ["src/**/*.d.ts", "src/app/routes/**/*.ts"]
 }
diff --git a/packages/create-analog/template-angular-v14/vite.config.ts b/packages/create-analog/template-angular-v14/vite.config.ts
@@ -1,21 +1,21 @@
 /// <reference types="vitest" />
 
 import { defineConfig } from 'vite';
-import angular from '@analogjs/vite-plugin-angular';
+import analog from '@analogjs/platform';
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => ({
   root: 'src',
   publicDir: 'assets',
   build: {
-    outDir: `../dist/my-app`,
+    outDir: `../dist/my-app/client`,
     emptyOutDir: true,
     target: 'es2020',
   },
   resolve: {
     mainFields: ['module'],
   },
-  plugins: [angular()],
+  plugins: [analog()],
   test: {
     globals: true,
     environment: 'jsdom',

diff --git a/packages/platform/README.md b/packages/platform/README.md
@@ -1,11 +1,5 @@
-# analog-platform
+# Analog
 
-This library was generated with [Nx](https://nx.dev).
+The fullstack meta-framework for Angular
 
-## Building
-
-Run `nx build analog-platform` to build the library.
-
-## Running unit tests
-
-Run `nx test analog-platform` to execute the unit tests via [Jest](https://jestjs.io).
+Learn more at [analogjs.org](https://analogjs.org)
diff --git a/packages/platform/package.json b/packages/platform/package.json
@@ -1,8 +1,32 @@
 {
   "name": "@analogjs/platform",
-  "version": "0.1.0-alpha.0",
+  "version": "0.1.0-beta.0",
   "type": "commonjs",
+  "description": "The fullstack meta-framework for Angular",
+  "author": "Brandon Roberts <robertsbt@gmail.com>",
+  "exports": {
+    ".": "./src/index.js",
+    "./package.json": "./package.json"
+  },
+  "keywords": [
+    "angular",
+    "vite",
+    "plugin-vite",
+    "meta-framework"
+  ],
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/analogjs/analog/issues"
+  },
+  "homepage": "https://analogjs.org",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/analogjs/analog.git"
+  },
+  "dependencies": {
+    "nitropack": "^0.6.1"
+  },
   "peerDependencies": {
-    "nitropack": "^0.5.4"
+    "@analogjs/vite-plugin-angular": "latest"
   }
 }
diff --git a/packages/platform/project.json b/packages/platform/project.json
@@ -10,7 +10,8 @@
         "outputPath": "node_modules/@analogjs/platform",
         "main": "packages/platform/src/index.ts",
         "tsConfig": "packages/platform/tsconfig.lib.json",
-        "assets": ["packages/platform/*.md"]
+        "assets": ["packages/platform/*.md"],
+        "updateBuildableProjectDepsInPackageJson": false
       },
       "configurations": {
         "production": {

diff --git a/packages/platform/src/index.ts b/packages/platform/src/index.ts
@@ -1,3 +1,4 @@
 import { platformPlugin } from './lib/platform-plugin';
 
+export { Options } from './lib/options';
 export default platformPlugin;
diff --git a/packages/platform/src/lib/platform-plugin.ts b/packages/platform/src/lib/platform-plugin.ts
@@ -1,9 +1,13 @@
 import { Plugin } from 'vite';
 import angular from '@analogjs/vite-plugin-angular';
-
 import { Options } from './options';
 import { viteNitroPlugin } from './vite-nitro-plugin';
+import { routerPlugin } from './router-plugin';
 
 export function platformPlugin(opts?: Options): Plugin[] {
-  return [viteNitroPlugin(opts?.nitro), ...angular(opts?.vite)];
+  return [
+    viteNitroPlugin(opts?.nitro),
+    ...angular(opts?.vite),
+    ...routerPlugin(),
+  ];
 }
diff --git a/...e-plugin-angular/src/lib/router-plugin.ts → packages/platform/src/lib/router-plugin.ts b/...e-plugin-angular/src/lib/router-plugin.ts → packages/platform/src/lib/router-plugin.ts
diff --git a/packages/platform/tsconfig.lib.json b/packages/platform/tsconfig.lib.json
@@ -3,9 +3,16 @@
   "compilerOptions": {
     "module": "commonjs",
     "outDir": "../../dist/out-tsc",
+    "inlineSourceMap": true,
+    "sourceMap": false,
     "declaration": true,
     "types": []
   },
   "include": ["**/*.ts"],
-  "exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.test.ts"]
+  "exclude": [
+    "vite.config.ts",
+    "**/*.spec.ts",
+    "**/*.test.ts",
+    "src/test-setup.ts"
+  ]
 }
diff --git a/packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts b/packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts
@@ -14,7 +14,6 @@ import {
   resolveTemplateUrl,
 } from './component-resolvers';
 import { componentAssetsPlugin } from './component-assets-plugin';
-import { routerPlugin } from './router-plugin';
 
 export interface PluginOptions {
   tsconfig?: string;
@@ -361,7 +360,6 @@ export function angular(options?: PluginOptions): Plugin[] {
       },
     },
     ...componentAssetsPlugin(pluginOptions.inlineStylesExtension),
-    ...routerPlugin(),
   ];
 
   function setupCompilation() {