Skip to content

Commit

Permalink
try to fix ci tests
Browse files Browse the repository at this point in the history
  • Loading branch information
victorgarciaesgi committed Jan 15, 2024
1 parent fcc52d3 commit bce6f7d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
7 changes: 4 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/core/config/moduleOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ class ModuleOptionsStore {
if (options.rootDir != null) this.rootDir = options.rootDir;
if (options.srcDir != null) this.srcDir = options.srcDir;
if (options.buildDir != null) this.buildDir = options.buildDir;

this.pagesDir = path.join(this.srcDir, 'pages');

if (options.i18n != null) this.i18n = options.i18n;
if (options.i18nOptions != null) {
this.i18nOptions = defu(options.i18nOptions, {
Expand Down Expand Up @@ -72,11 +74,14 @@ class ModuleOptionsStore {
this.ignoreRoutes.push('[...slug].vue');
}

// Ignore route related
const catchAllRegex = /\[...*].*/;
const relativeRoot = path.relative(process.cwd(), this.pagesDir);

const dynamicGlobs = this.ignoreRoutes
.filter((f) => isDynamicPattern(f) && !catchAllRegex.test(f))
.map((file) => path.join(relativeRoot, file));

const normalGlobs = this.ignoreRoutes.filter(
(f) => !(isDynamicPattern(f) && !catchAllRegex.test(f))
);
Expand Down
4 changes: 3 additions & 1 deletion test/fixtures/sample-project/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
"preview": "nuxt preview",
"typecheck": "nuxi typecheck"
},
"dependencies": {
"nuxt-typed-router": "workspace:*"
},
"devDependencies": {
"@nuxtjs/i18n": "8.0.0",
"nuxt": "3.9.0",
"nuxt-typed-router": "workspace:*",
"vue": "3.4.5",
"vue-tsc": "1.8.27"
}
Expand Down

0 comments on commit bce6f7d

Please sign in to comment.