vitrify 0.5.4 → 0.5.7

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 (8) hide show
  1. package/dist/bin/dev.js +3 -1
  2. package/dist/index.js +5 -2
  3. package/dist/plugins/quasar.js +69 -44
  4. package/package.json +1 -1
  5. package/src/node/bin/dev.ts +3 -1
  6. package/src/node/index.ts +5 -2
  7. package/src/node/plugins/quasar.ts +63 -54
  8. package/src/vite/vue/ssr/entry-server.ts +1 -1
package/dist/bin/dev.js CHANGED
@@ -33,7 +33,7 @@ ssr, framework = 'vue', host, appDir, publicDir, base }) {
33
33
  },
34
34
  port,
35
35
  // middlewareMode: mode === 'ssr' ? 'ssr' : undefined,
36
- middlewareMode: ssr ? 'ssr' : false,
36
+ middlewareMode: ssr ? true : false,
37
37
  fs: {
38
38
  strict: false,
39
39
  allow: [
@@ -51,6 +51,8 @@ ssr, framework = 'vue', host, appDir, publicDir, base }) {
51
51
  },
52
52
  host
53
53
  };
54
+ if (ssr)
55
+ config.appType = 'custom';
54
56
  const vitrifyDevServer = await (await import('vite')).createServer({
55
57
  configFile: false,
56
58
  ...config
package/dist/index.js CHANGED
@@ -16,6 +16,8 @@ const internalServerModules = [
16
16
  'vite',
17
17
  'fastify',
18
18
  '@fastify/static',
19
+ '@fastify/middie',
20
+ '@fastify',
19
21
  'node'
20
22
  ];
21
23
  const configPluginMap = {
@@ -130,7 +132,8 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
130
132
  console.log('No vitrify.config.(ts|js) file found, using defaults');
131
133
  vitrifyConfig = {};
132
134
  }
133
- const localPackages = ['vue', 'vue-router'];
135
+ // const localPackages = ['vue', 'vue-router', '@vue/server-renderer']
136
+ const localPackages = [];
134
137
  const cliPackages = [];
135
138
  const packageUrls = vitrifyConfig.vitrify?.urls?.packages || {};
136
139
  await (async () => {
@@ -476,7 +479,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
476
479
  exclude: ['vue', ...serverModules, ...builtinModules]
477
480
  },
478
481
  resolve: {
479
- dedupe: ['vue', 'vue-router'],
482
+ dedupe: ['vue', '@vue/server-renderer', 'vue-router'],
480
483
  alias
481
484
  },
482
485
  build: {
package/dist/plugins/quasar.js CHANGED
@@ -1,4 +1,3 @@
1
- import { readFileSync } from 'fs';
2
1
  import Components from 'unplugin-vue-components/vite';
3
2
  // import { quasarDir as defaultQuasarDir } from '../app-urls.js'
4
3
  // import { QuasarResolver } from '../resolver.js';
@@ -55,7 +54,8 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
55
54
  config: async (config, env) => {
56
55
  const { vitrify: { urls } = {}, quasar } = config;
57
56
  const globalCss = quasar?.extras.map((extra) => `@quasar/extras/${extra}/${extra}.css`);
58
- const localPackages = ['@quasar/extras', 'quasar'];
57
+ // const localPackages = ['@quasar/extras', 'quasar']
58
+ const localPackages = [];
59
59
  await (async () => {
60
60
  for (const val of localPackages)
61
61
  urls.packages[val] = getPkgJsonDir(new URL(await resolve(val, urls.app)));
@@ -104,8 +104,20 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
104
104
  enforce: 'post',
105
105
  config: async (config, env) => {
106
106
  const { quasar: quasarConf, vitrify: { urls } = {} } = config;
107
- const quasarPkgJsonPath = new URL('package.json', urls?.packages?.quasar).pathname;
108
- const { version } = JSON.parse(readFileSync(quasarPkgJsonPath, { encoding: 'utf-8' }));
107
+ // const quasarPkgJsonPath = new URL(
108
+ // 'package.json',
109
+ // urls?.packages?.quasar
110
+ // ).pathname
111
+ // const { version } = JSON.parse(
112
+ // readFileSync(quasarPkgJsonPath, { encoding: 'utf-8' })
113
+ // )
114
+ // const { version } = await import('quasar/package.json', {
115
+ // assert: { type: 'json' }
116
+ // })
117
+ /**
118
+ * Importing package.json is problematic
119
+ */
120
+ const version = '?';
109
121
  /**
110
122
  * All components should have been auto-imported
111
123
  */
@@ -119,47 +131,60 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
119
131
  }
120
132
  return {
121
133
  resolve: {
134
+ dedupe: ['quasar', '@quasar/extras'],
122
135
  alias: [
123
- {
124
- find: 'quasar/wrappers',
125
- replacement: new URL('quasar-wrappers.ts', urls?.cli).pathname
126
- },
127
- {
128
- find: 'quasar/vue-plugin',
129
- replacement: new URL('src/vue-plugin.js', urls?.packages?.quasar).pathname
130
- },
131
- {
132
- find: 'quasar/plugins',
133
- replacement: new URL('src/plugins.js', urls?.packages?.quasar)
134
- .pathname
135
- },
136
- {
137
- find: 'quasar/components',
138
- replacement: new URL('src/components.js', urls?.packages?.quasar).pathname
139
- },
140
- {
141
- find: 'quasar/composables',
142
- replacement: new URL('src/composables.js', urls?.packages?.quasar).pathname
143
- },
144
- {
145
- find: 'quasar/directives',
146
- replacement: new URL('src/directives.js', urls?.packages?.quasar).pathname
147
- },
148
- {
149
- find: 'quasar/src',
150
- replacement: new URL('src/', urls?.packages?.quasar).pathname
151
- },
152
- // {
153
- // find: new RegExp('^quasar$'),
154
- // replacement: new URL('src/index.all.js', urls?.packages?.quasar)
155
- // .pathname
156
- // },
157
- {
158
- find: `@quasar/extras`,
159
- replacement: new URL('.', urls?.packages?.['@quasar/extras'])
160
- .pathname
161
- }
162
- // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
136
+ // {
137
+ // find: 'quasar/wrappers',
138
+ // replacement: new URL('quasar-wrappers.ts', urls?.cli).pathname
139
+ // },
140
+ // {
141
+ // find: 'quasar/vue-plugin',
142
+ // replacement: new URL(
143
+ // 'src/vue-plugin.js',
144
+ // urls?.packages?.quasar
145
+ // ).pathname
146
+ // },
147
+ // {
148
+ // find: 'quasar/plugins',
149
+ // replacement: new URL('src/plugins.js', urls?.packages?.quasar)
150
+ // .pathname
151
+ // },
152
+ // {
153
+ // find: 'quasar/components',
154
+ // replacement: new URL(
155
+ // 'src/components.js',
156
+ // urls?.packages?.quasar
157
+ // ).pathname
158
+ // },
159
+ // {
160
+ // find: 'quasar/composables',
161
+ // replacement: new URL(
162
+ // 'src/composables.js',
163
+ // urls?.packages?.quasar
164
+ // ).pathname
165
+ // },
166
+ // {
167
+ // find: 'quasar/directives',
168
+ // replacement: new URL(
169
+ // 'src/directives.js',
170
+ // urls?.packages?.quasar
171
+ // ).pathname
172
+ // },
173
+ // {
174
+ // find: 'quasar/src',
175
+ // replacement: new URL('src/', urls?.packages?.quasar).pathname
176
+ // }
177
+ // {
178
+ // find: new RegExp('^quasar$'),
179
+ // replacement: new URL('src/index.all.js', urls?.packages?.quasar)
180
+ // .pathname
181
+ // },
182
+ // {
183
+ // find: `@quasar/extras`,
184
+ // replacement: new URL('.', urls?.packages?.['@quasar/extras'])
185
+ // .pathname
186
+ // }
187
+ // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
163
188
  ]
164
189
  },
165
190
  define: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vitrify",
3
- "version": "0.5.4",
3
+ "version": "0.5.7",
4
4
  "license": "MIT",
5
5
  "author": "Stefan van Herwijnen",
6
6
  "description": "Pre-configured Vite CLI for your framework",
package/src/node/bin/dev.ts CHANGED
@@ -60,7 +60,7 @@ export async function createVitrifyDevServer({
60
60
  },
61
61
  port,
62
62
  // middlewareMode: mode === 'ssr' ? 'ssr' : undefined,
63
- middlewareMode: ssr ? 'ssr' : false,
63
+ middlewareMode: ssr ? true : false,
64
64
  fs: {
65
65
  strict: false, // https://github.com/vitejs/vite/issues/8175
66
66
  allow: [
@@ -78,6 +78,8 @@ export async function createVitrifyDevServer({
78
78
  },
79
79
  host
80
80
  }
81
+ if (ssr) config.appType = 'custom'
82
+
81
83
  const vitrifyDevServer = await (
82
84
  await import('vite')
83
85
  ).createServer({
package/src/node/index.ts CHANGED
@@ -31,6 +31,8 @@ const internalServerModules = [
31
31
  'vite',
32
32
  'fastify',
33
33
  '@fastify/static',
34
+ '@fastify/middie',
35
+ '@fastify',
34
36
  'node'
35
37
  ]
36
38
 
@@ -192,7 +194,8 @@ export const baseConfig = async ({
192
194
  vitrifyConfig = {}
193
195
  }
194
196
 
195
- const localPackages = ['vue', 'vue-router']
197
+ // const localPackages = ['vue', 'vue-router', '@vue/server-renderer']
198
+ const localPackages: string[] = []
196
199
  const cliPackages = []
197
200
  const packageUrls: Record<string, URL> =
198
201
  vitrifyConfig.vitrify?.urls?.packages || {}
@@ -558,7 +561,7 @@ export const baseConfig = async ({
558
561
  exclude: ['vue', ...serverModules, ...builtinModules]
559
562
  },
560
563
  resolve: {
561
- dedupe: ['vue', 'vue-router'],
564
+ dedupe: ['vue', '@vue/server-renderer', 'vue-router'],
562
565
  alias
563
566
  },
564
567
  build: {
package/src/node/plugins/quasar.ts CHANGED
@@ -119,7 +119,8 @@ export const QuasarPlugin: VitrifyPlugin = async ({
119
119
  (extra) => `@quasar/extras/${extra}/${extra}.css`
120
120
  )
121
121
 
122
- const localPackages = ['@quasar/extras', 'quasar']
122
+ // const localPackages = ['@quasar/extras', 'quasar']
123
+ const localPackages: string[] = []
123
124
  await (async () => {
124
125
  for (const val of localPackages)
125
126
  urls!.packages![val] = getPkgJsonDir(
@@ -181,13 +182,20 @@ export const QuasarPlugin: VitrifyPlugin = async ({
181
182
  config: async (config: VitrifyConfig, env) => {
182
183
  const { quasar: quasarConf, vitrify: { urls } = {} } = config
183
184
 
184
- const quasarPkgJsonPath = new URL(
185
- 'package.json',
186
- urls?.packages?.quasar
187
- ).pathname
188
- const { version } = JSON.parse(
189
- readFileSync(quasarPkgJsonPath, { encoding: 'utf-8' })
190
- )
185
+ // const quasarPkgJsonPath = new URL(
186
+ // 'package.json',
187
+ // urls?.packages?.quasar
188
+ // ).pathname
189
+ // const { version } = JSON.parse(
190
+ // readFileSync(quasarPkgJsonPath, { encoding: 'utf-8' })
191
+ // )
192
+ // const { version } = await import('quasar/package.json', {
193
+ // assert: { type: 'json' }
194
+ // })
195
+ /**
196
+ * Importing package.json is problematic
197
+ */
198
+ const version = '?'
191
199
 
192
200
  /**
193
201
  * All components should have been auto-imported
@@ -202,58 +210,59 @@ export const QuasarPlugin: VitrifyPlugin = async ({
202
210
 
203
211
  return {
204
212
  resolve: {
213
+ dedupe: ['quasar', '@quasar/extras'],
205
214
  alias: [
206
- {
207
- find: 'quasar/wrappers',
208
- replacement: new URL('quasar-wrappers.ts', urls?.cli).pathname
209
- },
210
- {
211
- find: 'quasar/vue-plugin',
212
- replacement: new URL(
213
- 'src/vue-plugin.js',
214
- urls?.packages?.quasar
215
- ).pathname
216
- },
217
- {
218
- find: 'quasar/plugins',
219
- replacement: new URL('src/plugins.js', urls?.packages?.quasar)
220
- .pathname
221
- },
222
- {
223
- find: 'quasar/components',
224
- replacement: new URL(
225
- 'src/components.js',
226
- urls?.packages?.quasar
227
- ).pathname
228
- },
229
- {
230
- find: 'quasar/composables',
231
- replacement: new URL(
232
- 'src/composables.js',
233
- urls?.packages?.quasar
234
- ).pathname
235
- },
236
- {
237
- find: 'quasar/directives',
238
- replacement: new URL(
239
- 'src/directives.js',
240
- urls?.packages?.quasar
241
- ).pathname
242
- },
243
- {
244
- find: 'quasar/src',
245
- replacement: new URL('src/', urls?.packages?.quasar).pathname
246
- },
215
+ // {
216
+ // find: 'quasar/wrappers',
217
+ // replacement: new URL('quasar-wrappers.ts', urls?.cli).pathname
218
+ // },
219
+ // {
220
+ // find: 'quasar/vue-plugin',
221
+ // replacement: new URL(
222
+ // 'src/vue-plugin.js',
223
+ // urls?.packages?.quasar
224
+ // ).pathname
225
+ // },
226
+ // {
227
+ // find: 'quasar/plugins',
228
+ // replacement: new URL('src/plugins.js', urls?.packages?.quasar)
229
+ // .pathname
230
+ // },
231
+ // {
232
+ // find: 'quasar/components',
233
+ // replacement: new URL(
234
+ // 'src/components.js',
235
+ // urls?.packages?.quasar
236
+ // ).pathname
237
+ // },
238
+ // {
239
+ // find: 'quasar/composables',
240
+ // replacement: new URL(
241
+ // 'src/composables.js',
242
+ // urls?.packages?.quasar
243
+ // ).pathname
244
+ // },
245
+ // {
246
+ // find: 'quasar/directives',
247
+ // replacement: new URL(
248
+ // 'src/directives.js',
249
+ // urls?.packages?.quasar
250
+ // ).pathname
251
+ // },
252
+ // {
253
+ // find: 'quasar/src',
254
+ // replacement: new URL('src/', urls?.packages?.quasar).pathname
255
+ // }
247
256
  // {
248
257
  // find: new RegExp('^quasar$'),
249
258
  // replacement: new URL('src/index.all.js', urls?.packages?.quasar)
250
259
  // .pathname
251
260
  // },
252
- {
253
- find: `@quasar/extras`,
254
- replacement: new URL('.', urls?.packages?.['@quasar/extras'])
255
- .pathname
256
- }
261
+ // {
262
+ // find: `@quasar/extras`,
263
+ // replacement: new URL('.', urls?.packages?.['@quasar/extras'])
264
+ // .pathname
265
+ // }
257
266
  // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
258
267
  ]
259
268
  },
package/src/vite/vue/ssr/entry-server.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { createApp } from '../main.js'
2
- import { renderToString } from 'vue/server-renderer'
2
+ import { renderToString } from '@vue/server-renderer'
3
3
  import type { FastifyInstance } from 'fastify'
4
4
  // import * as ApolloSSR from '@vue/apollo-ssr'
5
5
  // import { ApolloClients } from '@vue/apollo-composable'