vitrify 0.6.3 → 0.6.6
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/app-urls.js +3 -1
- package/dist/index.js +26 -22
- package/dist/plugins/quasar.js +1 -1
- package/dist/types/app-urls.d.ts +1 -1
- package/package.json +10 -10
- package/src/node/app-urls.ts +3 -1
- package/src/node/index.ts +26 -22
- package/src/node/plugins/quasar.ts +1 -1
- package/src/vite/vue/ssr/entry-server.ts +1 -1
package/dist/app-urls.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
// import { resolve } from 'import-meta-resolve'
|
|
2
2
|
import { existsSync } from 'fs';
|
|
3
|
-
export const resolve = (packageName, base) => {
|
|
3
|
+
export const resolve = (packageName, base, counter = 0) => {
|
|
4
4
|
const packageUrl = new URL(`./node_modules/${packageName}/`, base);
|
|
5
5
|
if (existsSync(packageUrl.pathname)) {
|
|
6
6
|
return new URL('./', packageUrl);
|
|
7
7
|
}
|
|
8
|
+
if (counter < 10)
|
|
9
|
+
return resolve(packageName, new URL('../', base), counter + 1);
|
|
8
10
|
throw new Error(`Package ${packageName} not found in ${base.pathname}.`);
|
|
9
11
|
};
|
|
10
12
|
export const getPkgJsonDir = (dir) => {
|
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,11 @@ 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
|
+
}
|
|
380
384
|
// { find: 'vue', replacement: packageUrls['vue'].pathname },
|
|
381
385
|
// { find: 'vue-router', replacement: packageUrls['vue-router'].pathname },
|
|
382
386
|
// { find: 'vitrify', replacement: cliDir.pathname }
|
package/dist/plugins/quasar.js
CHANGED
|
@@ -178,7 +178,7 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
|
|
|
178
178
|
// ).pathname
|
|
179
179
|
// },
|
|
180
180
|
{
|
|
181
|
-
find: 'quasar/src',
|
|
181
|
+
find: 'quasar/src/',
|
|
182
182
|
replacement: new URL('node_modules/quasar/src/', config.vitrify?.urls?.app).pathname
|
|
183
183
|
}
|
|
184
184
|
// {
|
package/dist/types/app-urls.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export declare const resolve: (packageName: string, base: URL) => URL;
|
|
1
|
+
export declare const resolve: (packageName: string, base: URL, counter?: number) => URL;
|
|
2
2
|
export declare const getPkgJsonDir: (dir: URL) => URL;
|
|
3
3
|
export declare const getAppDir: () => URL;
|
|
4
4
|
export declare const getCliDir: () => URL;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vitrify",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.6",
|
|
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,28 +66,28 @@
|
|
|
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.4",
|
|
91
91
|
"rollup": "^2.75.7",
|
|
92
92
|
"typescript": "^4.7.4",
|
|
93
93
|
"vue": "^3.2.37",
|
|
@@ -96,7 +96,7 @@
|
|
|
96
96
|
"peerDependencies": {
|
|
97
97
|
"@fastify/static": "^6.4.0",
|
|
98
98
|
"fastify": "^4.2.0",
|
|
99
|
-
"quasar": "^2.7.
|
|
99
|
+
"quasar": "^2.7.4",
|
|
100
100
|
"vue": "^3.2.37",
|
|
101
101
|
"vue-router": "^4.0.16"
|
|
102
102
|
},
|
package/src/node/app-urls.ts
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
// import { resolve } from 'import-meta-resolve'
|
|
2
2
|
import { existsSync } from 'fs'
|
|
3
3
|
|
|
4
|
-
export const resolve = (packageName: string, base: URL) => {
|
|
4
|
+
export const resolve = (packageName: string, base: URL, counter = 0): URL => {
|
|
5
5
|
const packageUrl = new URL(`./node_modules/${packageName}/`, base)
|
|
6
6
|
if (existsSync(packageUrl.pathname)) {
|
|
7
7
|
return new URL('./', packageUrl)
|
|
8
8
|
}
|
|
9
|
+
if (counter < 10)
|
|
10
|
+
return resolve(packageName, new URL('../', base), counter + 1)
|
|
9
11
|
throw new Error(`Package ${packageName} not found in ${base.pathname}.`)
|
|
10
12
|
}
|
|
11
13
|
|
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,11 @@ 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
|
+
}
|
|
462
466
|
// { find: 'vue', replacement: packageUrls['vue'].pathname },
|
|
463
467
|
// { find: 'vue-router', replacement: packageUrls['vue-router'].pathname },
|
|
464
468
|
// { find: 'vitrify', replacement: cliDir.pathname }
|