vitrify 0.6.5 → 0.6.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.
- package/dist/index.js +30 -22
- package/dist/plugins/quasar.js +62 -59
- package/dist/types/helpers/routes.d.ts +2 -2
- package/package.json +12 -12
- package/src/node/helpers/routes.ts +3 -3
- package/src/node/index.ts +30 -22
- package/src/node/plugins/quasar.ts +7 -7
- package/src/vite/vue/ssr/entry-server.ts +1 -1
package/dist/index.js
CHANGED
|
@@ -140,8 +140,8 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
|
|
|
140
140
|
console.log('No vitrify.config.(ts|js) file found, using defaults');
|
|
141
141
|
vitrifyConfig = {};
|
|
142
142
|
}
|
|
143
|
-
const localPackages = ['vue', 'vue-router', '@vue/server-renderer']
|
|
144
|
-
|
|
143
|
+
// const localPackages = ['vue', 'vue-router', '@vue/server-renderer']
|
|
144
|
+
const localPackages = [];
|
|
145
145
|
const cliPackages = [];
|
|
146
146
|
const packageUrls = vitrifyConfig.vitrify?.urls?.packages || {};
|
|
147
147
|
await (async () => {
|
|
@@ -197,25 +197,25 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
|
|
|
197
197
|
];
|
|
198
198
|
const plugins = [
|
|
199
199
|
vuePlugin({
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
200
|
+
// compiler: await import('vue/compiler-sfc'),
|
|
201
|
+
// template: {
|
|
202
|
+
// ssr: !!ssr,
|
|
203
|
+
// compilerOptions: {
|
|
204
|
+
// directiveTransforms: {
|
|
205
|
+
// 'close-popup': ssrTransformCustomDir,
|
|
206
|
+
// intersection: ssrTransformCustomDir,
|
|
207
|
+
// ripple: ssrTransformCustomDir,
|
|
208
|
+
// mutation: ssrTransformCustomDir,
|
|
209
|
+
// morph: ssrTransformCustomDir,
|
|
210
|
+
// scroll: ssrTransformCustomDir,
|
|
211
|
+
// 'scroll-fire': ssrTransformCustomDir,
|
|
212
|
+
// 'touch-hold': ssrTransformCustomDir,
|
|
213
|
+
// 'touch-pan': ssrTransformCustomDir,
|
|
214
|
+
// 'touch-repeat': ssrTransformCustomDir,
|
|
215
|
+
// 'touch-swipe': ssrTransformCustomDir
|
|
216
|
+
// }
|
|
217
|
+
// }
|
|
218
|
+
// }
|
|
219
219
|
}),
|
|
220
220
|
...frameworkPlugins,
|
|
221
221
|
{
|
|
@@ -376,7 +376,15 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
|
|
|
376
376
|
...Object.entries(packageUrls).map(([key, value]) => ({
|
|
377
377
|
find: key,
|
|
378
378
|
replacement: value.pathname
|
|
379
|
-
}))
|
|
379
|
+
})),
|
|
380
|
+
{
|
|
381
|
+
find: new RegExp('^vue$'),
|
|
382
|
+
replacement: 'vue/dist/vue.runtime.esm-bundler.js'
|
|
383
|
+
},
|
|
384
|
+
{
|
|
385
|
+
find: new RegExp('^vue-router$'),
|
|
386
|
+
replacement: 'vue-router/dist/vue-router.esm-bundler.js'
|
|
387
|
+
}
|
|
380
388
|
// { find: 'vue', replacement: packageUrls['vue'].pathname },
|
|
381
389
|
// { find: 'vue-router', replacement: packageUrls['vue-router'].pathname },
|
|
382
390
|
// { find: 'vitrify', replacement: cliDir.pathname }
|
package/dist/plugins/quasar.js
CHANGED
|
@@ -140,65 +140,68 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
|
|
|
140
140
|
resolve: {
|
|
141
141
|
// dedupe: ['quasar', '@quasar/extras'],
|
|
142
142
|
alias: [
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
143
|
+
// {
|
|
144
|
+
// find: 'quasar/wrappers',
|
|
145
|
+
// replacement: new URL('quasar-wrappers.ts', urls?.cli).pathname
|
|
146
|
+
// },
|
|
147
|
+
// {
|
|
148
|
+
// find: 'quasar/vue-plugin',
|
|
149
|
+
// replacement: new URL(
|
|
150
|
+
// 'src/vue-plugin.js',
|
|
151
|
+
// urls?.packages?.quasar
|
|
152
|
+
// ).pathname
|
|
153
|
+
// },
|
|
154
|
+
// {
|
|
155
|
+
// find: 'quasar/plugins',
|
|
156
|
+
// replacement: new URL('src/plugins.js', urls?.packages?.quasar)
|
|
157
|
+
// .pathname
|
|
158
|
+
// },
|
|
159
|
+
// {
|
|
160
|
+
// find: 'quasar/components',
|
|
161
|
+
// replacement: new URL(
|
|
162
|
+
// 'src/components.js',
|
|
163
|
+
// urls?.packages?.quasar
|
|
164
|
+
// ).pathname
|
|
165
|
+
// },
|
|
166
|
+
// {
|
|
167
|
+
// find: 'quasar/composables',
|
|
168
|
+
// replacement: new URL(
|
|
169
|
+
// 'src/composables.js',
|
|
170
|
+
// urls?.packages?.quasar
|
|
171
|
+
// ).pathname
|
|
172
|
+
// },
|
|
173
|
+
// {
|
|
174
|
+
// find: 'quasar/directives',
|
|
175
|
+
// replacement: new URL(
|
|
176
|
+
// 'src/directives.js',
|
|
177
|
+
// urls?.packages?.quasar
|
|
178
|
+
// ).pathname
|
|
179
|
+
// },
|
|
180
|
+
// {
|
|
181
|
+
// find: 'quasar/src/',
|
|
182
|
+
// replacement: new URL(
|
|
183
|
+
// 'node_modules/quasar/src/',
|
|
184
|
+
// config.vitrify?.urls?.app
|
|
185
|
+
// ).pathname
|
|
186
|
+
// }
|
|
187
|
+
// {
|
|
188
|
+
// find: 'quasar',
|
|
189
|
+
// replacement: new URL(
|
|
190
|
+
// 'node_modules/quasar',
|
|
191
|
+
// config.vitrify?.urls?.app
|
|
192
|
+
// )
|
|
193
|
+
// }
|
|
194
|
+
// {
|
|
195
|
+
// find: new RegExp('^quasar$'),
|
|
196
|
+
// replacement: new URL('src/index.all.js', urls?.packages?.quasar)
|
|
197
|
+
// .pathname
|
|
198
|
+
// },
|
|
199
|
+
// {
|
|
200
|
+
// find: `@quasar/extras`,
|
|
201
|
+
// replacement: new URL('.', urls?.packages?.['@quasar/extras'])
|
|
202
|
+
// .pathname
|
|
203
|
+
// }
|
|
204
|
+
// { find: new RegExp('^quasar$'), replacement: 'virtual:quasar' }
|
|
202
205
|
]
|
|
203
206
|
},
|
|
204
207
|
optimizeDeps: {
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const routesToPaths: (routes?:
|
|
1
|
+
import type { RouteRecord } from 'vue-router';
|
|
2
|
+
export declare const routesToPaths: (routes?: RouteRecord[]) => string[];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vitrify",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.8",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"author": "Stefan van Herwijnen",
|
|
6
6
|
"description": "Pre-configured Vite CLI for your framework",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"dependencies": {
|
|
59
59
|
"@fastify/middie": "^8.0.0",
|
|
60
60
|
"@fastify/static": "^6.4.0",
|
|
61
|
-
"@quasar/extras": "^1.14.
|
|
61
|
+
"@quasar/extras": "^1.14.2",
|
|
62
62
|
"@vitejs/plugin-vue": "^3.0.0-alpha.1",
|
|
63
63
|
"@vue/server-renderer": "^3.2.37",
|
|
64
64
|
"builtin-modules": "^3.3.0",
|
|
@@ -66,39 +66,39 @@
|
|
|
66
66
|
"chalk": "^5.0.1",
|
|
67
67
|
"critters": "^0.0.16",
|
|
68
68
|
"cross-env": "^7.0.3",
|
|
69
|
-
"esbuild": "^0.14.
|
|
69
|
+
"esbuild": "^0.14.48",
|
|
70
70
|
"fastify": "^4.2.0",
|
|
71
71
|
"glob": "^8.0.3",
|
|
72
|
-
"happy-dom": "^
|
|
72
|
+
"happy-dom": "^6.0.0",
|
|
73
73
|
"magic-string": "^0.26.2",
|
|
74
74
|
"merge-deep": "^3.0.3",
|
|
75
75
|
"readline": "^1.3.0",
|
|
76
76
|
"rollup-plugin-visualizer": "^5.6.0",
|
|
77
77
|
"sass": "1.53.0",
|
|
78
|
-
"ts-node": "^10.8.
|
|
79
|
-
"unplugin-vue-components": "^0.
|
|
78
|
+
"ts-node": "^10.8.2",
|
|
79
|
+
"unplugin-vue-components": "^0.21.0",
|
|
80
80
|
"vite": "^3.0.0-beta.0",
|
|
81
|
-
"vitest": "^0.
|
|
81
|
+
"vitest": "^0.17.0"
|
|
82
82
|
},
|
|
83
83
|
"devDependencies": {
|
|
84
84
|
"@types/connect": "^3.4.35",
|
|
85
85
|
"@types/glob": "^7.2.0",
|
|
86
86
|
"@types/merge-deep": "^3.0.0",
|
|
87
|
-
"@types/node": "^18.0.
|
|
87
|
+
"@types/node": "^18.0.1",
|
|
88
88
|
"@types/ws": "^8.5.3",
|
|
89
89
|
"@vue/runtime-core": "^3.2.37",
|
|
90
|
-
"quasar": "^2.7.
|
|
90
|
+
"quasar": "^2.7.5",
|
|
91
91
|
"rollup": "^2.75.7",
|
|
92
92
|
"typescript": "^4.7.4",
|
|
93
93
|
"vue": "^3.2.37",
|
|
94
|
-
"vue-router": "^4.0
|
|
94
|
+
"vue-router": "^4.1.0"
|
|
95
95
|
},
|
|
96
96
|
"peerDependencies": {
|
|
97
97
|
"@fastify/static": "^6.4.0",
|
|
98
98
|
"fastify": "^4.2.0",
|
|
99
|
-
"quasar": "^2.7.
|
|
99
|
+
"quasar": "^2.7.5",
|
|
100
100
|
"vue": "^3.2.37",
|
|
101
|
-
"vue-router": "^4.0
|
|
101
|
+
"vue-router": "^4.1.0"
|
|
102
102
|
},
|
|
103
103
|
"publishConfig": {
|
|
104
104
|
"access": "public",
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
// https://github.com/antfu/vite-ssg/blob/462722203dade87365a519d847fcd881ee16a7f4/src/node/utils.ts#L13
|
|
2
|
-
import type {
|
|
2
|
+
import type { RouteRecord } from 'vue-router'
|
|
3
3
|
|
|
4
|
-
export const routesToPaths = (routes?:
|
|
4
|
+
export const routesToPaths = (routes?: RouteRecord[]) => {
|
|
5
5
|
if (!routes) return ['/']
|
|
6
6
|
|
|
7
7
|
const paths: Set<string> = new Set()
|
|
8
8
|
|
|
9
|
-
const getPaths = (routes:
|
|
9
|
+
const getPaths = (routes: RouteRecord[], prefix = '') => {
|
|
10
10
|
// remove trailing slash
|
|
11
11
|
prefix = prefix.replace(/\/$/g, '')
|
|
12
12
|
for (const route of routes) {
|
package/src/node/index.ts
CHANGED
|
@@ -204,8 +204,8 @@ export const baseConfig = async ({
|
|
|
204
204
|
vitrifyConfig = {}
|
|
205
205
|
}
|
|
206
206
|
|
|
207
|
-
const localPackages = ['vue', 'vue-router', '@vue/server-renderer']
|
|
208
|
-
|
|
207
|
+
// const localPackages = ['vue', 'vue-router', '@vue/server-renderer']
|
|
208
|
+
const localPackages: string[] = []
|
|
209
209
|
const cliPackages = []
|
|
210
210
|
const packageUrls: Record<string, URL> =
|
|
211
211
|
vitrifyConfig.vitrify?.urls?.packages || {}
|
|
@@ -271,25 +271,25 @@ export const baseConfig = async ({
|
|
|
271
271
|
|
|
272
272
|
const plugins: UserConfig['plugins'] = [
|
|
273
273
|
vuePlugin({
|
|
274
|
-
compiler: await import('vue/compiler-sfc'),
|
|
275
|
-
template: {
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
}
|
|
274
|
+
// compiler: await import('vue/compiler-sfc'),
|
|
275
|
+
// template: {
|
|
276
|
+
// ssr: !!ssr,
|
|
277
|
+
// compilerOptions: {
|
|
278
|
+
// directiveTransforms: {
|
|
279
|
+
// 'close-popup': ssrTransformCustomDir,
|
|
280
|
+
// intersection: ssrTransformCustomDir,
|
|
281
|
+
// ripple: ssrTransformCustomDir,
|
|
282
|
+
// mutation: ssrTransformCustomDir,
|
|
283
|
+
// morph: ssrTransformCustomDir,
|
|
284
|
+
// scroll: ssrTransformCustomDir,
|
|
285
|
+
// 'scroll-fire': ssrTransformCustomDir,
|
|
286
|
+
// 'touch-hold': ssrTransformCustomDir,
|
|
287
|
+
// 'touch-pan': ssrTransformCustomDir,
|
|
288
|
+
// 'touch-repeat': ssrTransformCustomDir,
|
|
289
|
+
// 'touch-swipe': ssrTransformCustomDir
|
|
290
|
+
// }
|
|
291
|
+
// }
|
|
292
|
+
// }
|
|
293
293
|
}),
|
|
294
294
|
...frameworkPlugins,
|
|
295
295
|
{
|
|
@@ -458,7 +458,15 @@ export const baseConfig = async ({
|
|
|
458
458
|
...Object.entries(packageUrls).map(([key, value]) => ({
|
|
459
459
|
find: key,
|
|
460
460
|
replacement: value.pathname
|
|
461
|
-
}))
|
|
461
|
+
})),
|
|
462
|
+
{
|
|
463
|
+
find: new RegExp('^vue$'),
|
|
464
|
+
replacement: 'vue/dist/vue.runtime.esm-bundler.js'
|
|
465
|
+
},
|
|
466
|
+
{
|
|
467
|
+
find: new RegExp('^vue-router$'),
|
|
468
|
+
replacement: 'vue-router/dist/vue-router.esm-bundler.js'
|
|
469
|
+
}
|
|
462
470
|
// { find: 'vue', replacement: packageUrls['vue'].pathname },
|
|
463
471
|
// { find: 'vue-router', replacement: packageUrls['vue-router'].pathname },
|
|
464
472
|
// { find: 'vitrify', replacement: cliDir.pathname }
|
|
@@ -256,13 +256,13 @@ export const QuasarPlugin: VitrifyPlugin = async ({
|
|
|
256
256
|
// urls?.packages?.quasar
|
|
257
257
|
// ).pathname
|
|
258
258
|
// },
|
|
259
|
-
{
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
}
|
|
259
|
+
// {
|
|
260
|
+
// find: 'quasar/src/',
|
|
261
|
+
// replacement: new URL(
|
|
262
|
+
// 'node_modules/quasar/src/',
|
|
263
|
+
// config.vitrify?.urls?.app
|
|
264
|
+
// ).pathname
|
|
265
|
+
// }
|
|
266
266
|
// {
|
|
267
267
|
// find: 'quasar',
|
|
268
268
|
// replacement: new URL(
|