@analogjs/platform 1.9.0-beta.1 → 1.9.0-beta.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@analogjs/platform",
3
- "version": "1.9.0-beta.1",
3
+ "version": "1.9.0-beta.11",
4
4
  "description": "The fullstack meta-framework for Angular",
5
5
  "type": "module",
6
6
  "author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -29,8 +29,8 @@
29
29
  },
30
30
  "dependencies": {
31
31
  "nitropack": "^2.9.0",
32
- "@analogjs/vite-plugin-angular": "^1.9.0-beta.1",
33
- "@analogjs/vite-plugin-nitro": "^1.9.0-beta.1",
32
+ "@analogjs/vite-plugin-angular": "^1.9.0-beta.11",
33
+ "@analogjs/vite-plugin-nitro": "^1.9.0-beta.11",
34
34
  "vitefu": "^0.2.5"
35
35
  },
36
36
  "peerDependencies": {
@@ -0,0 +1,10 @@
1
+ const { join } = require('node:path');
2
+
3
+ module.exports = {
4
+ plugins: {
5
+ tailwindcss: {
6
+ config: join(__dirname, 'tailwind.config.ts')
7
+ },
8
+ autoprefixer: {}
9
+ }
10
+ };
@@ -0,0 +1,13 @@
1
+ import type { Config } from 'tailwindcss';
2
+ import { createGlobPatternsForDependencies } from '@nx/angular/tailwind';
3
+
4
+ export default {
5
+ content: [
6
+ join(__dirname, '<%= relativeSourceRoot %>/**/!(*.stories|*.spec).{ts,html,md,analog,ag}'),
7
+ ...createGlobPatternsForDependencies(__dirname),
8
+ ],
9
+ theme: {
10
+ extend: {},
11
+ },
12
+ plugins: [],
13
+ } satisfies Config;
@@ -95,19 +95,36 @@ function addTailwindConfigPathToProject(tree, options, project) {
95
95
  throw new Error((0, devkit_1.stripIndents) `The "${buildTarget.options.tailwindConfig}" file is already configured for the project "${options.project}". Are you sure this is the right project to set up Tailwind?
96
96
  If you are sure, you can remove the configuration and re-run the generator.`);
97
97
  }
98
- buildTarget.options = {
99
- ...buildTarget.options,
100
- tailwindConfig: (0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js'),
101
- };
98
+ const tailwindInstalledVersion = detectTailwindInstalledVersion(tree);
99
+ if (tailwindInstalledVersion === '2') {
100
+ buildTarget.options = {
101
+ ...buildTarget.options,
102
+ tailwindConfig: (0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js'),
103
+ };
104
+ }
105
+ else {
106
+ buildTarget.options = {
107
+ ...buildTarget.options,
108
+ tailwindConfig: (0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.ts'),
109
+ };
110
+ }
102
111
  (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
103
112
  }
104
113
  exports.addTailwindConfigPathToProject = addTailwindConfigPathToProject;
105
114
  function addTailwindConfigFile(tree, options, project) {
106
115
  if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js'))) {
107
- throw new Error((0, devkit_1.stripIndents) `The "tailwind.config.js" file already exists in the project "${options.project}". Are you sure this is the right project to set up Tailwind?
116
+ throw new Error((0, devkit_1.stripIndents) `The "tailwind.config" file already exists in the project "${options.project}". Are you sure this is the right project to set up Tailwind?
108
117
  If you are sure, you can remove the existing file and re-run the generator.`);
109
118
  }
110
- (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'tailwind'), project.root, {
119
+ const tailwindInstalledVersion = detectTailwindInstalledVersion(tree);
120
+ if (tailwindInstalledVersion === '2') {
121
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'tailwind/v2'), project.root, {
122
+ relativeSourceRoot: (0, node_path_1.relative)(project.root, project.sourceRoot),
123
+ template: '',
124
+ });
125
+ return;
126
+ }
127
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'tailwind/latest'), project.root, {
111
128
  relativeSourceRoot: (0, node_path_1.relative)(project.root, project.sourceRoot),
112
129
  template: '',
113
130
  });
@@ -1 +1 @@
1
- {"version":3,"file":"add-tailwind-helpers.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-tailwind-helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-tailwind-helpers.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-tailwind-helpers.ts"],"names":[],"mappings":";;;AAAA,wDAAsE;AACtE,6EAA4E;AAC5E,mCAA4B;AAC5B,uCAUoB;AAKpB,yCAAqC;AAErC,SAAgB,gBAAgB,CAC9B,OAAyB;IAEzB,OAAO;QACL,GAAG,OAAO;QACV,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,OAAO;KAC5C,CAAC;AACJ,CAAC;AAPD,4CAOC;AAED,SAAgB,8BAA8B,CAC5C,IAAU;IAEV,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACzE,MAAM,eAAe,GACnB,YAAY,EAAE,WAAW,IAAI,eAAe,EAAE,WAAW,CAAC;IAE5D,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,gCAAuB,EAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IACxE,IAAI,IAAA,WAAE,EAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,6BAA6B,eAAe,yDAAyD,CACtG,CAAC;IACJ,CAAC;IAED,OAAO,IAAA,WAAE,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAC1C,CAAC;AAnBD,wEAmBC;AAED,SAAgB,2BAA2B,CAAC,IAAU;IACpD,MAAM,WAAW,GAAG,IAAA,+CAAuB,GAAE,CAAC;IAC9C,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,YAAY,EAAE,WAAW,CAAC,YAAY;QACtC,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,WAAW,EAAE,WAAW,CAAC,WAAW;KACrC,CACF,CAAC;AACJ,CAAC;AAXD,kEAWC;AAED,SAAgB,uBAAuB,CACrC,IAAU,EACV,OAAmC,EACnC,OAA6B;IAE7B,IAAI,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAEhD,IAAI,gBAAgB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CACb,oCAAoC,gBAAgB,uBAAuB,CAC5E,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,gBAAgB,GAAG,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEhE,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,oDAAoD,OAAO,CAAC,OAAO;mFACJ,CAC5E,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACrE,IAAI,CAAC,KAAK,CACR,gBAAgB,EAChB,IAAA,qBAAY,EAAA;;;;MAIV,uBAAuB,EAAE,CAC5B,CAAC;AACJ,CAAC;AAjCD,0DAiCC;AAED,SAAS,oBAAoB,CAC3B,IAAU,EACV,OAAmC,EACnC,OAA6B;IAE7B,+BAA+B;IAC/B,MAAM,yBAAyB,GAAG;QAChC,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC;QACnE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC;QACpE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC;QACpE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC;KACrE,CAAC;IAEF,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5D,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CACf,CAAC;IACF,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,8EAA8E;IAC9E,MAAM,MAAM,GACV,OAAO,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,0DAA0D;IAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9B,OAAO,CAAC,KAAK,QAAQ;QACnB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;YAChC,CAAC,CAAC,MAAM,KAAK,KAAK;YAClB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CACzB,CAAC;IAEF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;AACzD,CAAC;AAED,SAAgB,8BAA8B,CAC5C,IAAU,EACV,OAAmC,EACnC,OAA6B;IAE7B,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3D,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,eAAe,OAAO,CAAC,WAAW,gCAAgC,OAAO,CAAC,OAAO;;4GAES,CACvG,CAAC;IACJ,CAAC;IAED,IACE,WAAW,CAAC,OAAO,EAAE,cAAc;QACnC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,EAC/C,CAAC;QACD,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,QAAQ,WAAW,CAAC,OAAO,CAAC,cAAc,iDAAiD,OAAO,CAAC,OAAO;kFAC1C,CAC7E,CAAC;IACJ,CAAC;IAED,MAAM,wBAAwB,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAC;IAEtE,IAAI,wBAAwB,KAAK,GAAG,EAAE,CAAC;QACrC,WAAW,CAAC,OAAO,GAAG;YACpB,GAAG,WAAW,CAAC,OAAO;YACtB,cAAc,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC;SACtE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,WAAW,CAAC,OAAO,GAAG;YACpB,GAAG,WAAW,CAAC,OAAO;YACtB,cAAc,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC;SACtE,CAAC;IACJ,CAAC;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC;AAxCD,wEAwCC;AAED,SAAgB,qBAAqB,CACnC,IAAU,EACV,OAAyB,EACzB,OAA6B;IAE7B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,6DAA6D,OAAO,CAAC,OAAO;kFACZ,CAC7E,CAAC;IACJ,CAAC;IAED,MAAM,wBAAwB,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAC;IAEtE,IAAI,wBAAwB,KAAK,GAAG,EAAE,CAAC;QACrC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,EAC1D,OAAO,CAAC,IAAI,EACZ;YACE,kBAAkB,EAAE,IAAA,oBAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;YAC9D,QAAQ,EAAE,EAAE;SACb,CACF,CAAC;QACF,OAAO;IACT,CAAC;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,CAAC,EAC9D,OAAO,CAAC,IAAI,EACZ;QACE,kBAAkB,EAAE,IAAA,oBAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;QAC9D,QAAQ,EAAE,EAAE;KACb,CACF,CAAC;AACJ,CAAC;AApCD,sDAoCC"}
@@ -47,6 +47,12 @@ export interface Options {
47
47
  * Additional files to include in compilation
48
48
  */
49
49
  include?: string[];
50
+ /**
51
+ * Toggles internal API middleware.
52
+ * If disabled, a proxy request is used to route /api
53
+ * requests to / in the production server build.
54
+ */
55
+ useAPIMiddleware?: boolean;
50
56
  }
51
57
  export interface PrerenderContentDir {
52
58
  /**
@@ -8,19 +8,11 @@ import { ssrXhrBuildPlugin } from './ssr/ssr-xhr-plugin.js';
8
8
  import { depsPlugin } from './deps-plugin.js';
9
9
  import { injectHTMLPlugin } from './ssr/inject-html-plugin.js';
10
10
  export function platformPlugin(opts = {}) {
11
- const { apiPrefix, ...platformOptions } = {
11
+ const { ...platformOptions } = {
12
12
  ssr: true,
13
13
  ...opts,
14
14
  };
15
15
  let nitroOptions = platformOptions?.nitro;
16
- if (apiPrefix) {
17
- nitroOptions = {
18
- ...nitroOptions,
19
- runtimeConfig: {
20
- apiPrefix,
21
- },
22
- };
23
- }
24
16
  return [
25
17
  ...viteNitroPlugin(platformOptions, nitroOptions),
26
18
  ...(platformOptions.ssr ? [ssrBuildPlugin(), ...injectHTMLPlugin()] : []),
@@ -41,4 +33,4 @@ export function platformPlugin(opts = {}) {
41
33
  clearClientPageEndpointsPlugin(),
42
34
  ];
43
35
  }
44
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm0tcGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvcGxhdGZvcm0vc3JjL2xpYi9wbGF0Zm9ybS1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxlQUFlLE1BQU0sNkJBQTZCLENBQUM7QUFDMUQsT0FBTyxPQUFPLE1BQU0sK0JBQStCLENBQUM7QUFHcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEQsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRS9ELE1BQU0sVUFBVSxjQUFjLENBQUMsT0FBZ0IsRUFBRTtJQUMvQyxNQUFNLEVBQUUsU0FBUyxFQUFFLEdBQUcsZUFBZSxFQUFFLEdBQUc7UUFDeEMsR0FBRyxFQUFFLElBQUk7UUFDVCxHQUFHLElBQUk7S0FDUixDQUFDO0lBRUYsSUFBSSxZQUFZLEdBQUcsZUFBZSxFQUFFLEtBQUssQ0FBQztJQUMxQyxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsWUFBWSxHQUFHO1lBQ2IsR0FBRyxZQUFZO1lBQ2YsYUFBYSxFQUFFO2dCQUNiLFNBQVM7YUFDVjtTQUNGLENBQUM7SUFDSixDQUFDO0lBRUQsT0FBTztRQUNMLEdBQUcsZUFBZSxDQUFDLGVBQWUsRUFBRSxZQUFZLENBQUM7UUFDakQsR0FBRyxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsY0FBYyxFQUFFLEVBQUUsR0FBRyxnQkFBZ0IsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUN6RSxHQUFHLFVBQVUsRUFBRTtRQUNmLEdBQUcsWUFBWSxDQUFDLGVBQWUsQ0FBQztRQUNoQyxHQUFHLGFBQWEsQ0FBQyxlQUFlLEVBQUUsT0FBTyxFQUFFLGVBQWUsQ0FBQztRQUMzRCxHQUFHLE9BQU8sQ0FBQztZQUNULEdBQUcsRUFBRSxlQUFlLENBQUMsR0FBRztZQUN4QixhQUFhLEVBQUUsZUFBZSxDQUFDLGFBQWE7WUFDNUMsT0FBTyxFQUFFO2dCQUNQLEdBQUcsQ0FBQyxlQUFlLENBQUMsT0FBTyxJQUFJLEVBQUUsQ0FBQztnQkFDbEMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxtQkFBbUIsSUFBSSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQ2hELENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxHQUFHLE9BQU8sZUFBZSxDQUN2QzthQUNGO1lBQ0QscUJBQXFCLEVBQUUsZUFBZSxDQUFDLHFCQUFxQjtZQUM1RCxHQUFHLENBQUMsSUFBSSxFQUFFLElBQUksSUFBSSxFQUFFLENBQUM7U0FDdEIsQ0FBQztRQUNGLGlCQUFpQixFQUFFO1FBQ25CLDhCQUE4QixFQUFFO0tBQ2pDLENBQUM7QUFDSixDQUFDIn0=
36
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm0tcGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvcGxhdGZvcm0vc3JjL2xpYi9wbGF0Zm9ybS1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxlQUFlLE1BQU0sNkJBQTZCLENBQUM7QUFDMUQsT0FBTyxPQUFPLE1BQU0sK0JBQStCLENBQUM7QUFHcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEQsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRS9ELE1BQU0sVUFBVSxjQUFjLENBQUMsT0FBZ0IsRUFBRTtJQUMvQyxNQUFNLEVBQUUsR0FBRyxlQUFlLEVBQUUsR0FBRztRQUM3QixHQUFHLEVBQUUsSUFBSTtRQUNULEdBQUcsSUFBSTtLQUNSLENBQUM7SUFFRixJQUFJLFlBQVksR0FBRyxlQUFlLEVBQUUsS0FBSyxDQUFDO0lBRTFDLE9BQU87UUFDTCxHQUFHLGVBQWUsQ0FBQyxlQUFlLEVBQUUsWUFBWSxDQUFDO1FBQ2pELEdBQUcsQ0FBQyxlQUFlLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLGNBQWMsRUFBRSxFQUFFLEdBQUcsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDekUsR0FBRyxVQUFVLEVBQUU7UUFDZixHQUFHLFlBQVksQ0FBQyxlQUFlLENBQUM7UUFDaEMsR0FBRyxhQUFhLENBQUMsZUFBZSxFQUFFLE9BQU8sRUFBRSxlQUFlLENBQUM7UUFDM0QsR0FBRyxPQUFPLENBQUM7WUFDVCxHQUFHLEVBQUUsZUFBZSxDQUFDLEdBQUc7WUFDeEIsYUFBYSxFQUFFLGVBQWUsQ0FBQyxhQUFhO1lBQzVDLE9BQU8sRUFBRTtnQkFDUCxHQUFHLENBQUMsZUFBZSxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUM7Z0JBQ2xDLEdBQUcsQ0FBQyxlQUFlLENBQUMsbUJBQW1CLElBQUksRUFBRSxDQUFDLENBQUMsR0FBRyxDQUNoRCxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsR0FBRyxPQUFPLGVBQWUsQ0FDdkM7YUFDRjtZQUNELHFCQUFxQixFQUFFLGVBQWUsQ0FBQyxxQkFBcUI7WUFDNUQsR0FBRyxDQUFDLElBQUksRUFBRSxJQUFJLElBQUksRUFBRSxDQUFDO1NBQ3RCLENBQUM7UUFDRixpQkFBaUIsRUFBRTtRQUNuQiw4QkFBOEIsRUFBRTtLQUNqQyxDQUFDO0FBQ0osQ0FBQyJ9
@@ -18,12 +18,12 @@ export function routerPlugin(options) {
18
18
  name: 'analogjs-router-invalidate-routes',
19
19
  configureServer(server) {
20
20
  function invalidateRoutes(path) {
21
- if (path.includes(normalizePath(`/app/routes/`)) ||
22
- path.includes(normalizePath(`/pages/`))) {
21
+ if (path.includes(`routes`) ||
22
+ path.includes(`pages`) ||
23
+ path.includes('content')) {
23
24
  server.moduleGraph.fileToModulesMap.forEach((mods) => {
24
25
  mods.forEach((mod) => {
25
- if (mod.id?.includes('analogjs') &&
26
- mod.id?.includes('router')) {
26
+ if (mod.id?.includes('analogjs') && mod.id?.includes('fesm')) {
27
27
  server.moduleGraph.invalidateModule(mod);
28
28
  mod.importers.forEach((imp) => {
29
29
  server.moduleGraph.invalidateModule(imp);
@@ -98,4 +98,4 @@ export function routerPlugin(options) {
98
98
  },
99
99
  ];
100
100
  }
101
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLXBsdWdpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3BsYXRmb3JtL3NyYy9saWIvcm91dGVyLXBsdWdpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFzQixNQUFNLE1BQU0sQ0FBQztBQUN6RCxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDM0IsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUlwQzs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FBQyxPQUFpQjtJQUM1QyxNQUFNLGFBQWEsR0FBRyxhQUFhLENBQUMsT0FBTyxFQUFFLGFBQWEsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUM3RSxJQUFJLE1BQWtCLENBQUM7SUFDdkIsSUFBSSxJQUFZLENBQUM7SUFFakIsT0FBTztRQUNMO1lBQ0UsSUFBSSxFQUFFLG1DQUFtQztZQUN6QyxlQUFlLENBQUMsTUFBTTtnQkFDcEIsU0FBUyxnQkFBZ0IsQ0FBQyxJQUFZO29CQUNwQyxJQUNFLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLGNBQWMsQ0FBQyxDQUFDO3dCQUM1QyxJQUFJLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUN2QyxDQUFDO3dCQUNELE1BQU0sQ0FBQyxXQUFXLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7NEJBQ25ELElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtnQ0FDbkIsSUFDRSxHQUFHLENBQUMsRUFBRSxFQUFFLFFBQVEsQ0FBQyxVQUFVLENBQUM7b0NBQzVCLEdBQUcsQ0FBQyxFQUFFLEVBQUUsUUFBUSxDQUFDLFFBQVEsQ0FBQyxFQUMxQixDQUFDO29DQUNELE1BQU0sQ0FBQyxXQUFXLENBQUMsZ0JBQWdC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
101
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLXBsdWdpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3BsYXRmb3JtL3NyYy9saWIvcm91dGVyLXBsdWdpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFzQixNQUFNLE1BQU0sQ0FBQztBQUN6RCxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDM0IsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUlwQzs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FBQyxPQUFpQjtJQUM1QyxNQUFNLGFBQWEsR0FBRyxhQUFhLENBQUMsT0FBTyxFQUFFLGFBQWEsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUM3RSxJQUFJLE1BQWtCLENBQUM7SUFDdkIsSUFBSSxJQUFZLENBQUM7SUFFakIsT0FBTztRQUNMO1lBQ0UsSUFBSSxFQUFFLG1DQUFtQztZQUN6QyxlQUFlLENBQUMsTUFBTTtnQkFDcEIsU0FBUyxnQkFBZ0IsQ0FBQyxJQUFZO29CQUNwQyxJQUNFLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDO3dCQUN2QixJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQzt3QkFDdEIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsRUFDeEIsQ0FBQzt3QkFDRCxNQUFNLENBQUMsV0FBVyxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFOzRCQUNuRCxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7Z0NBQ25CLElBQUksR0FBRyxDQUFDLEVBQUUsRUFBRSxRQUFRLENBQUMsVUFBVSxDQUFDLElBQUksR0FBRyxDQUFDLEVBQUUsRUFBRSxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztvQ0FDN0QsTUFBTSxDQUFDLFdBQVcsQ0FBQyxn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