vitrify 0.5.7 → 0.5.8

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 (6) hide show
  1. package/dist/index.js +3 -2
  2. package/dist/plugins/quasar.js +101 -80
  3. package/dist/types/bin/dev.d.ts +1 -1
  4. package/package.json +17 -17
  5. package/src/node/index.ts +3 -2
  6. package/src/node/plugins/quasar.ts +48 -37
package/dist/index.js CHANGED
@@ -460,7 +460,8 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
460
460
  };
461
461
  }
462
462
  const config = {
463
- root: ssr === 'fastify' ? appDir.pathname : frameworkDir.pathname,
463
+ // root: ssr === 'fastify' ? appDir.pathname : frameworkDir.pathname,
464
+ root: appDir.pathname,
464
465
  publicDir: publicDir.pathname,
465
466
  base,
466
467
  envDir: appDir.pathname,
@@ -476,7 +477,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
476
477
  },
477
478
  plugins,
478
479
  optimizeDeps: {
479
- exclude: ['vue', ...serverModules, ...builtinModules]
480
+ exclude: ['vue', 'vue-router', ...serverModules, ...builtinModules]
480
481
  },
481
482
  resolve: {
482
483
  dedupe: ['vue', '@vue/server-renderer', 'vue-router'],
package/dist/plugins/quasar.js CHANGED
@@ -35,19 +35,28 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
35
35
  Components({
36
36
  resolvers: [QuasarResolver()]
37
37
  }),
38
- {
39
- name: 'vite-plugin-quasar-transform',
40
- enforce: 'pre',
41
- transform: (code, id, options) => {
42
- const { ssr } = options || {};
43
- code = code
44
- .replaceAll('__QUASAR_SSR__', ssr ? ssr.toString() : 'false')
45
- .replaceAll('__QUASAR_SSR_SERVER__', ssr ? 'import.meta.env.SSR' : 'false')
46
- .replaceAll('__QUASAR_SSR_CLIENT__', ssr ? '!import.meta.env.SSR' : 'false')
47
- .replaceAll('__QUASAR_SSR_PWA__', ssr && pwa ? '!import.meta.env.SSR' : 'false');
48
- return code;
49
- }
50
- },
38
+ // {
39
+ // name: 'vite-plugin-quasar-transform',
40
+ // enforce: 'pre',
41
+ // transform: (code, id, options) => {
42
+ // const { ssr: transformSsr } = options || {}
43
+ // code = code
44
+ // .replaceAll('__QUASAR_SSR__', ssr ? ssr.toString() : 'false')
45
+ // .replaceAll(
46
+ // '__QUASAR_SSR_SERVER__',
47
+ // transformSsr ? 'import.meta.env.SSR' : 'false'
48
+ // )
49
+ // .replaceAll(
50
+ // '__QUASAR_SSR_CLIENT__',
51
+ // ssr ? '!import.meta.env.SSR' : 'false'
52
+ // )
53
+ // .replaceAll(
54
+ // '__QUASAR_SSR_PWA__',
55
+ // ssr && pwa ? '!import.meta.env.SSR' : 'false'
56
+ // )
57
+ // return code
58
+ // }
59
+ // },
51
60
  {
52
61
  name: 'vite-plugin-quasar-setup',
53
62
  enforce: 'pre',
@@ -72,7 +81,7 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
72
81
  // @ts-ignore
73
82
  const quasarPlugins = await import('virtual:quasar-plugins');
74
83
  // @ts-ignore
75
- const directives = await import('quasar/src/directives.js');
84
+ const directives = await import('virtual:quasar-directives');
76
85
  app.use(staticImports?.Quasar, {
77
86
  plugins: quasarPlugins,
78
87
  directives
@@ -133,70 +142,77 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
133
142
  resolve: {
134
143
  dedupe: ['quasar', '@quasar/extras'],
135
144
  alias: [
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' }
145
+ // {
146
+ // find: 'quasar/wrappers',
147
+ // replacement: new URL('quasar-wrappers.ts', urls?.cli).pathname
148
+ // },
149
+ // {
150
+ // find: 'quasar/vue-plugin',
151
+ // replacement: new URL(
152
+ // 'src/vue-plugin.js',
153
+ // urls?.packages?.quasar
154
+ // ).pathname
155
+ // },
156
+ // {
157
+ // find: 'quasar/plugins',
158
+ // replacement: new URL('src/plugins.js', urls?.packages?.quasar)
159
+ // .pathname
160
+ // },
161
+ // {
162
+ // find: 'quasar/components',
163
+ // replacement: new URL(
164
+ // 'src/components.js',
165
+ // urls?.packages?.quasar
166
+ // ).pathname
167
+ // },
168
+ // {
169
+ // find: 'quasar/composables',
170
+ // replacement: new URL(
171
+ // 'src/composables.js',
172
+ // urls?.packages?.quasar
173
+ // ).pathname
174
+ // },
175
+ // {
176
+ // find: 'quasar/directives',
177
+ // replacement: new URL(
178
+ // 'src/directives.js',
179
+ // urls?.packages?.quasar
180
+ // ).pathname
181
+ // },
182
+ // {
183
+ // find: 'quasar/src',
184
+ // replacement: new URL('src/', urls?.packages?.quasar).pathname
185
+ // }
186
+ {
187
+ find: new RegExp('^quasar$'),
188
+ replacement: 'quasar/src/index.all.js'
189
+ }
190
+ // {
191
+ // find: new RegExp('^quasar$'),
192
+ // replacement: new URL('src/index.all.js', urls?.packages?.quasar)
193
+ // .pathname
194
+ // },
195
+ // {
196
+ // find: `@quasar/extras`,
197
+ // replacement: new URL('.', urls?.packages?.['@quasar/extras'])
198
+ // .pathname
199
+ // }
200
+ // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
188
201
  ]
189
202
  },
203
+ optimizeDeps: {
204
+ exclude: ['quasar']
205
+ },
190
206
  define: {
191
207
  __DEV__: process.env.NODE_ENV !== 'production' || true,
192
- __QUASAR_VERSION__: `'${version}'`
193
- // __QUASAR_SSR__: !!ssr,
194
- // // __QUASAR_SSR_SERVER__: ssr === 'server',
195
- // __QUASAR_SSR_SERVER__: `import.meta.env.SSR`,
196
- // // __QUASAR_SSR_CLIENT__: ssr === 'client',
197
- // __QUASAR_SSR_CLIENT__: `!import.meta.env.SSR`,
198
- // // __QUASAR_SSR_PWA__: ssr === 'client' && pwa
199
- // __QUASAR_SSR_PWA__: pwa ? `!import.meta.env.SSR` : false
208
+ __QUASAR_VERSION__: `'${version}'`,
209
+ __QUASAR_SSR__: !!ssr,
210
+ // __QUASAR_SSR_SERVER__: ssr === 'server',
211
+ __QUASAR_SSR_SERVER__: `import.meta.env.SSR`,
212
+ // __QUASAR_SSR_CLIENT__: ssr === 'client',
213
+ __QUASAR_SSR_CLIENT__: `!import.meta.env.SSR`,
214
+ // __QUASAR_SSR_PWA__: ssr === 'client' && pwa
215
+ __QUASAR_SSR_PWA__: pwa ? `!import.meta.env.SSR` : false
200
216
  },
201
217
  ssr: {
202
218
  noExternal: ['quasar']
@@ -218,6 +234,8 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
218
234
  switch (id) {
219
235
  case 'virtual:quasar-plugins':
220
236
  return 'virtual:quasar-plugins';
237
+ case 'virtual:quasar-directives':
238
+ return 'virtual:quasar-directives';
221
239
  case 'quasar':
222
240
  return { id: 'quasar', moduleSideEffects: false };
223
241
  default:
@@ -228,13 +246,16 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
228
246
  if (id === 'virtual:quasar-plugins') {
229
247
  return `export { ${plugins.join(',')} } from 'quasar'`;
230
248
  }
249
+ else if (id === 'virtual:quasar-directives') {
250
+ return `export * from 'quasar/src/directives'`;
251
+ }
231
252
  else if (id === 'quasar') {
232
- return `export * from 'quasar/src/plugins.js';
233
- export * from 'quasar/src/components.js';
234
- export * from 'quasar/src/composables.js';
235
- export * from 'quasar/src/directives.js';
236
- export * from 'quasar/src/utils.js';
237
- export { default as Quasar } from 'quasar/src/install-quasar.js'`;
253
+ return `export * from 'quasar/src/plugins';
254
+ export * from 'quasar/src/components';
255
+ export * from 'quasar/src/composables';
256
+ export * from 'quasar/src/directives';
257
+ export * from 'quasar/src/utils';
258
+ export { default as Quasar } from 'quasar/src/install-quasar'`;
238
259
  }
239
260
  return null;
240
261
  }
package/dist/types/bin/dev.d.ts CHANGED
@@ -22,7 +22,7 @@ export declare function createServer({ port, logLevel, ssr, framework, host, app
22
22
  publicDir?: URL;
23
23
  }): Promise<{
24
24
  server: Server;
25
- config: Readonly<Omit<import("vite").UserConfig, "plugins" | "assetsInclude" | "optimizeDeps" | "worker"> & {
25
+ config: Readonly<Omit<import("vite").UserConfig, "optimizeDeps" | "plugins" | "assetsInclude" | "worker"> & {
26
26
  configFile: string | undefined;
27
27
  configFileDependencies: string[];
28
28
  inlineConfig: InlineConfig;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vitrify",
3
- "version": "0.5.7",
3
+ "version": "0.5.8",
4
4
  "license": "MIT",
5
5
  "author": "Stefan van Herwijnen",
6
6
  "description": "Pre-configured Vite CLI for your framework",
@@ -54,46 +54,46 @@
54
54
  "dependencies": {
55
55
  "@fastify/middie": "^8.0.0",
56
56
  "@fastify/static": "^6.4.0",
57
- "@quasar/extras": "^1.14.0",
57
+ "@quasar/extras": "^1.14.1",
58
58
  "@vitejs/plugin-vue": "^3.0.0-alpha.1",
59
59
  "builtin-modules": "^3.3.0",
60
60
  "cac": "^6.7.12",
61
61
  "chalk": "^5.0.1",
62
+ "critters": "^0.0.16",
62
63
  "cross-env": "^7.0.3",
63
- "esbuild": "^0.14.43",
64
- "fastify": "^4.0.0",
64
+ "esbuild": "^0.14.47",
65
+ "fastify": "^4.2.0",
65
66
  "glob": "^8.0.3",
66
- "happy-dom": "^5.2.0",
67
+ "happy-dom": "^5.3.4",
67
68
  "magic-string": "^0.26.2",
68
69
  "merge-deep": "^3.0.3",
69
70
  "readline": "^1.3.0",
70
71
  "rollup-plugin-visualizer": "^5.6.0",
71
- "sass": "1.52.3",
72
+ "sass": "1.53.0",
72
73
  "ts-node": "^10.8.1",
73
- "unplugin-vue-components": "^0.19.6",
74
+ "unplugin-vue-components": "^0.20.1",
74
75
  "vite": "^3.0.0-beta.0",
75
- "vitest": "^0.14.1"
76
+ "vitest": "^0.16.0"
76
77
  },
77
78
  "devDependencies": {
78
79
  "@types/connect": "^3.4.35",
79
80
  "@types/glob": "^7.2.0",
80
81
  "@types/merge-deep": "^3.0.0",
81
- "@types/node": "^17.0.41",
82
+ "@types/node": "^18.0.0",
82
83
  "@types/ws": "^8.5.3",
83
84
  "@vue/runtime-core": "^3.2.37",
84
- "quasar": "^2.7.1",
85
- "rollup": "^2.75.6",
86
- "typescript": "^4.7.3",
87
- "vite": "^3.0.0-alpha.11",
85
+ "quasar": "^2.7.3",
86
+ "rollup": "^2.75.7",
87
+ "typescript": "^4.7.4",
88
88
  "vue": "^3.2.37",
89
- "vue-router": "^4.0.15"
89
+ "vue-router": "^4.0.16"
90
90
  },
91
91
  "peerDependencies": {
92
92
  "@fastify/static": "^6.4.0",
93
- "fastify": "^4.0.0",
94
- "quasar": "^2.7.1",
93
+ "fastify": "^4.2.0",
94
+ "quasar": "^2.7.3",
95
95
  "vue": "^3.2.37",
96
- "vue-router": "^4.0.15"
96
+ "vue-router": "^4.0.16"
97
97
  },
98
98
  "publishConfig": {
99
99
  "access": "public",
package/src/node/index.ts CHANGED
@@ -542,7 +542,8 @@ export const baseConfig = async ({
542
542
  }
543
543
 
544
544
  const config = {
545
- root: ssr === 'fastify' ? appDir.pathname : frameworkDir.pathname,
545
+ // root: ssr === 'fastify' ? appDir.pathname : frameworkDir.pathname,
546
+ root: appDir.pathname,
546
547
  publicDir: publicDir.pathname,
547
548
  base,
548
549
  envDir: appDir.pathname,
@@ -558,7 +559,7 @@ export const baseConfig = async ({
558
559
  },
559
560
  plugins,
560
561
  optimizeDeps: {
561
- exclude: ['vue', ...serverModules, ...builtinModules]
562
+ exclude: ['vue', 'vue-router', ...serverModules, ...builtinModules]
562
563
  },
563
564
  resolve: {
564
565
  dedupe: ['vue', '@vue/server-renderer', 'vue-router'],
package/src/node/plugins/quasar.ts CHANGED
@@ -86,29 +86,29 @@ export const QuasarPlugin: VitrifyPlugin = async ({
86
86
  Components({
87
87
  resolvers: [QuasarResolver()]
88
88
  }),
89
- {
90
- name: 'vite-plugin-quasar-transform',
91
- enforce: 'pre',
92
- transform: (code, id, options) => {
93
- const { ssr } = options || {}
94
- code = code
95
- .replaceAll('__QUASAR_SSR__', ssr ? ssr.toString() : 'false')
96
- .replaceAll(
97
- '__QUASAR_SSR_SERVER__',
98
- ssr ? 'import.meta.env.SSR' : 'false'
99
- )
100
- .replaceAll(
101
- '__QUASAR_SSR_CLIENT__',
102
- ssr ? '!import.meta.env.SSR' : 'false'
103
- )
104
- .replaceAll(
105
- '__QUASAR_SSR_PWA__',
106
- ssr && pwa ? '!import.meta.env.SSR' : 'false'
107
- )
89
+ // {
90
+ // name: 'vite-plugin-quasar-transform',
91
+ // enforce: 'pre',
92
+ // transform: (code, id, options) => {
93
+ // const { ssr: transformSsr } = options || {}
94
+ // code = code
95
+ // .replaceAll('__QUASAR_SSR__', ssr ? ssr.toString() : 'false')
96
+ // .replaceAll(
97
+ // '__QUASAR_SSR_SERVER__',
98
+ // transformSsr ? 'import.meta.env.SSR' : 'false'
99
+ // )
100
+ // .replaceAll(
101
+ // '__QUASAR_SSR_CLIENT__',
102
+ // ssr ? '!import.meta.env.SSR' : 'false'
103
+ // )
104
+ // .replaceAll(
105
+ // '__QUASAR_SSR_PWA__',
106
+ // ssr && pwa ? '!import.meta.env.SSR' : 'false'
107
+ // )
108
108
 
109
- return code
110
- }
111
- },
109
+ // return code
110
+ // }
111
+ // },
112
112
  {
113
113
  name: 'vite-plugin-quasar-setup',
114
114
  enforce: 'pre',
@@ -143,7 +143,7 @@ export const QuasarPlugin: VitrifyPlugin = async ({
143
143
  // @ts-ignore
144
144
  const quasarPlugins = await import('virtual:quasar-plugins')
145
145
  // @ts-ignore
146
- const directives = await import('quasar/src/directives.js')
146
+ const directives = await import('virtual:quasar-directives')
147
147
 
148
148
  app.use(
149
149
  staticImports?.Quasar,
@@ -253,6 +253,10 @@ export const QuasarPlugin: VitrifyPlugin = async ({
253
253
  // find: 'quasar/src',
254
254
  // replacement: new URL('src/', urls?.packages?.quasar).pathname
255
255
  // }
256
+ {
257
+ find: new RegExp('^quasar$'),
258
+ replacement: 'quasar/src/index.all.js'
259
+ }
256
260
  // {
257
261
  // find: new RegExp('^quasar$'),
258
262
  // replacement: new URL('src/index.all.js', urls?.packages?.quasar)
@@ -266,16 +270,19 @@ export const QuasarPlugin: VitrifyPlugin = async ({
266
270
  // { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
267
271
  ]
268
272
  },
273
+ optimizeDeps: {
274
+ exclude: ['quasar']
275
+ },
269
276
  define: {
270
277
  __DEV__: process.env.NODE_ENV !== 'production' || true,
271
- __QUASAR_VERSION__: `'${version}'`
272
- // __QUASAR_SSR__: !!ssr,
273
- // // __QUASAR_SSR_SERVER__: ssr === 'server',
274
- // __QUASAR_SSR_SERVER__: `import.meta.env.SSR`,
275
- // // __QUASAR_SSR_CLIENT__: ssr === 'client',
276
- // __QUASAR_SSR_CLIENT__: `!import.meta.env.SSR`,
277
- // // __QUASAR_SSR_PWA__: ssr === 'client' && pwa
278
- // __QUASAR_SSR_PWA__: pwa ? `!import.meta.env.SSR` : false
278
+ __QUASAR_VERSION__: `'${version}'`,
279
+ __QUASAR_SSR__: !!ssr,
280
+ // __QUASAR_SSR_SERVER__: ssr === 'server',
281
+ __QUASAR_SSR_SERVER__: `import.meta.env.SSR`,
282
+ // __QUASAR_SSR_CLIENT__: ssr === 'client',
283
+ __QUASAR_SSR_CLIENT__: `!import.meta.env.SSR`,
284
+ // __QUASAR_SSR_PWA__: ssr === 'client' && pwa
285
+ __QUASAR_SSR_PWA__: pwa ? `!import.meta.env.SSR` : false
279
286
  },
280
287
  ssr: {
281
288
  noExternal: ['quasar']
@@ -297,6 +304,8 @@ export const QuasarPlugin: VitrifyPlugin = async ({
297
304
  switch (id) {
298
305
  case 'virtual:quasar-plugins':
299
306
  return 'virtual:quasar-plugins'
307
+ case 'virtual:quasar-directives':
308
+ return 'virtual:quasar-directives'
300
309
  case 'quasar':
301
310
  return { id: 'quasar', moduleSideEffects: false }
302
311
  default:
@@ -306,13 +315,15 @@ export const QuasarPlugin: VitrifyPlugin = async ({
306
315
  load(id) {
307
316
  if (id === 'virtual:quasar-plugins') {
308
317
  return `export { ${plugins.join(',')} } from 'quasar'`
318
+ } else if (id === 'virtual:quasar-directives') {
319
+ return `export * from 'quasar/src/directives'`
309
320
  } else if (id === 'quasar') {
310
- return `export * from 'quasar/src/plugins.js';
311
- export * from 'quasar/src/components.js';
312
- export * from 'quasar/src/composables.js';
313
- export * from 'quasar/src/directives.js';
314
- export * from 'quasar/src/utils.js';
315
- export { default as Quasar } from 'quasar/src/install-quasar.js'`
321
+ return `export * from 'quasar/src/plugins';
322
+ export * from 'quasar/src/components';
323
+ export * from 'quasar/src/composables';
324
+ export * from 'quasar/src/directives';
325
+ export * from 'quasar/src/utils';
326
+ export { default as Quasar } from 'quasar/src/install-quasar'`
316
327
  }
317
328
  return null
318
329
  }