@nocobase/app-server 2.0.0-beta.1 → 2.0.0-beta.2

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.
Files changed (3) hide show
  1. package/dist/spa/routes.js +44 -6
  2. package/dist/spa/routes.js.map +1 -1
  3. package/package.json +10 -10
package/dist/spa/routes.js CHANGED
@@ -33,7 +33,15 @@ export function registerSpaRoutes(router, options) {
33
33
  }));
34
34
  }
35
35
  async function serveSpaHandler(request, options) {
36
- const response = await options.handler?.(request);
36
+ let upstreamRequest = request;
37
+ if (isSpaPageRequest(request, options)) {
38
+ // The upstream validators describe HTML before runtime configuration is injected.
39
+ const headers = new Headers(request.headers);
40
+ headers.delete('if-none-match');
41
+ headers.delete('if-modified-since');
42
+ upstreamRequest = new Request(request, { headers });
43
+ }
44
+ const response = await options.handler?.(upstreamRequest);
37
45
  if (!response) {
38
46
  throw new Error('SPA handler is not configured.');
39
47
  }
@@ -43,12 +51,42 @@ async function serveSpaHandler(request, options) {
43
51
  }
44
52
  const headers = new Headers(response.headers);
45
53
  headers.delete('content-length');
54
+ headers.delete('etag');
55
+ headers.delete('last-modified');
46
56
  headers.set('cache-control', 'no-cache');
47
- return new Response(injectSpaRuntimeHtml(await response.text(), {
48
- clientConfig: options.clientConfig,
49
- publicConfig: resolvePublicConfig(options),
50
- publicBasePath: options.publicBasePath,
51
- }), { headers, status: response.status, statusText: response.statusText });
57
+ return new Response(request.method === 'HEAD'
58
+ ? null
59
+ : injectSpaRuntimeHtml(await response.text(), {
60
+ clientConfig: options.clientConfig,
61
+ publicConfig: resolvePublicConfig(options),
62
+ publicBasePath: options.publicBasePath,
63
+ }), { headers, status: response.status, statusText: response.statusText });
64
+ }
65
+ function isSpaPageRequest(request, options) {
66
+ if (request.method !== 'GET' && request.method !== 'HEAD')
67
+ return false;
68
+ const destination = request.headers.get('sec-fetch-dest');
69
+ if (destination &&
70
+ !['document', 'iframe', 'frame', 'empty'].includes(destination)) {
71
+ return false;
72
+ }
73
+ const url = new URL(request.url);
74
+ // HTML can also be imported as a Vite module; those requests keep resource caching.
75
+ if (['html-proxy', 'import', 'raw', 'url', 'worker', 'sharedworker'].some((name) => url.searchParams.has(name)))
76
+ return false;
77
+ const basePath = normalizeBasePath(options.basePath);
78
+ const pathname = url.pathname.slice(basePath.length) || '/';
79
+ if (/^\/(?:@vite|@id|@fs)(?:\/|$)|^\/@react-refresh(?:\/|$)/u.test(pathname)) {
80
+ return false;
81
+ }
82
+ const assetsPath = normalizeBasePath(options.assetsPath ?? '/assets');
83
+ if (pathname === assetsPath || pathname.startsWith(`${assetsPath}/`))
84
+ return false;
85
+ const extension = path.posix.extname(pathname).toLowerCase();
86
+ if (extension && extension !== '.html')
87
+ return false;
88
+ const accept = request.headers.get('accept')?.toLowerCase();
89
+ return !accept || accept.includes('text/html') || accept.includes('*/*');
52
90
  }
53
91
  function resolvePublicConfig(options) {
54
92
  return typeof options.publicConfig === 'function'
package/dist/spa/routes.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/spa/routes.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,MAAM,UAAU,iBAAiB,CAC/B,MAAY,EACZ,OAAiC;IAEjC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAEhC,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,CAAC,GAAG,CAAC,QAAQ,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CACtC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAC1C,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CACtC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAC1C,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,eAAe,GAAG,YAAY,CAClC,QAAQ,EACR,OAAO,CAAC,UAAU,IAAI,SAAS,CAChC,CAAC;IAEF,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE,CACtC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE;QAC7B,OAAO;QACP,QAAQ;KACT,CAAC,CACH,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,GAAG,eAAe,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAC7C,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE;QAC7B,OAAO;QACP,QAAQ;KACT,CAAC,CACH,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,QAAQ,IAAI,GAAG,EAAE,GAAG,EAAE,CAC/B,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE;QAC/B,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,YAAY,EAAE,mBAAmB,CAAC,OAAO,CAAC;QAC1C,cAAc,EAAE,OAAO,CAAC,cAAc;KACvC,CAAC,CACH,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,IAAI,EAAE,GAAG,EAAE,CAC/B,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE;QAC/B,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,YAAY,EAAE,mBAAmB,CAAC,OAAO,CAAC;QAC1C,cAAc,EAAE,OAAO,CAAC,cAAc;KACvC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,OAAgB,EAChB,OAAiC;IAEjC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,WAAW,EAAE,CAAC;IACxE,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACxC,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9C,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACjC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IACzC,OAAO,IAAI,QAAQ,CACjB,oBAAoB,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE;QAC1C,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,YAAY,EAAE,mBAAmB,CAAC,OAAO,CAAC;QAC1C,cAAc,EAAE,OAAO,CAAC,cAAc;KACvC,CAAC,EACF,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,CACtE,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAC1B,OAAiC;IAEjC,OAAO,OAAO,OAAO,CAAC,YAAY,KAAK,UAAU;QAC/C,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE;QACxB,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;AAC3B,CAAC"}
1
+ {"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/spa/routes.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nocobase/app-server",
3
- "version": "2.0.0-beta.1",
3
+ "version": "2.0.0-beta.2",
4
4
  "type": "module",
5
5
  "prettier": "@nocobase/dev-config/prettier",
6
6
  "engines": {
@@ -114,10 +114,10 @@
114
114
  "zod": "^4.6.5",
115
115
  "openapi-types": "^12.1.3",
116
116
  "@nocobase/app-websocket": "^0.0.1",
117
- "@nocobase/config": "^0.1.0-beta.2",
118
117
  "@nocobase/drive": "^0.1.0-beta.4",
119
- "@nocobase/realtime": "^0.0.2-beta.0",
118
+ "@nocobase/config": "^0.1.0-beta.2",
120
119
  "@nocobase/logging": "^0.1.0-beta.6",
120
+ "@nocobase/realtime": "^0.0.2-beta.0",
121
121
  "@nocobase/secrets": "^0.1.0-beta.0",
122
122
  "@nocobase/session": "^0.1.0-beta.2",
123
123
  "@nocobase/snowflake": "^1.0.0-beta.3"
@@ -130,31 +130,31 @@
130
130
  "vitest": "^4.1.10",
131
131
  "swagger-ui-dist": "^5.33.1",
132
132
  "@nocobase/db-mysql": "0.1.0-beta.4",
133
+ "@nocobase/db-mssql": "0.1.0-beta.3",
133
134
  "@nocobase/db-oracle": "0.1.0-beta.3",
134
135
  "@nocobase/db-postgres": "0.1.0-beta.3",
135
136
  "@nocobase/db-sqlite": "0.1.0-beta.4",
136
- "@nocobase/db-mssql": "0.1.0-beta.3",
137
137
  "@nocobase/db-testing": "0.1.0-beta.0",
138
138
  "@nocobase/api-client": "1.0.0-beta.3",
139
- "@nocobase/dev-config": "0.1.0-beta.19",
140
- "@nocobase/db-kingbase": "0.1.0-beta.3",
139
+ "@nocobase/dev-config": "0.1.0-beta.20",
141
140
  "@nocobase/db-dameng": "0.1.0-beta.3",
141
+ "@nocobase/db-kingbase": "0.1.0-beta.3",
142
142
  "@nocobase/db-oceanbase": "0.1.0-beta.3"
143
143
  },
144
144
  "peerDependencies": {
145
145
  "@nocobase/i18n": "^1.0.0-beta.5",
146
146
  "@nocobase/caching": "^0.1.0-beta.2",
147
147
  "@nocobase/db": "^1.0.0-beta.18",
148
- "@nocobase/queue": "^0.1.0-beta.8",
149
- "@nocobase/jobs": "^0.1.0-beta.2",
150
148
  "@nocobase/service-provider": "^0.0.2-beta.1",
149
+ "@nocobase/jobs": "^0.1.0-beta.2",
151
150
  "@nocobase/db-sqlite": "^0.1.0-beta.4",
152
151
  "@nocobase/db-mysql": "^0.1.0-beta.4",
152
+ "@nocobase/queue": "^0.1.0-beta.8",
153
153
  "@nocobase/db-postgres": "^0.1.0-beta.3",
154
+ "@nocobase/db-mssql": "^0.1.0-beta.3",
155
+ "@nocobase/db-oracle": "^0.1.0-beta.3",
154
156
  "@nocobase/db-dameng": "^0.1.0-beta.3",
155
157
  "@nocobase/db-kingbase": "^0.1.0-beta.3",
156
- "@nocobase/db-oracle": "^0.1.0-beta.3",
157
- "@nocobase/db-mssql": "^0.1.0-beta.3",
158
158
  "@nocobase/db-oceanbase": "^0.1.0-beta.3"
159
159
  },
160
160
  "peerDependenciesMeta": {