Skip to content

Commit

Permalink
feat(nuxt): tmp downgrade versions
Browse files Browse the repository at this point in the history
  • Loading branch information
mandarini committed Oct 31, 2023
1 parent bf17720 commit 5bfa7d7
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 38 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
"ng-packagr": "~16.2.0",
"node-fetch": "^2.6.7",
"npm-package-arg": "11.0.1",
"nuxi": "^3.9.1",
"nuxi": "3.6.5",
"nx": "17.0.0-rc.2",
"octokit": "^2.0.14",
"open": "^8.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"migrations": "./migrations.json"
},
"dependencies": {
"nuxi": "^3.9.1",
"nuxi": "3.6.5",
"tslib": "^2.3.0",
"@nx/devkit": "file:../devkit",
"@nx/js": "file:../js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ exports[`app generated files content - as-provided should configure tsconfig and
"serve": {
"executor": "@nx/nuxt:serve",
"options": {
"outputPath": "dist/my-app",
"port": 4200
}
},
Expand Down Expand Up @@ -86,9 +87,6 @@ exports[`app generated files content - as-provided should configure tsconfig and
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.app.json"
},
{
"path": "./tsconfig.spec.json"
}
Expand Down Expand Up @@ -117,7 +115,6 @@ exports[`app generated files content - as-provided should create all new files i
"my-app/src/public/favicon.ico",
"my-app/src/server/api/greet.ts",
"my-app/src/server/tsconfig.json",
"my-app/tsconfig.app.json",
"my-app/tsconfig.json",
".gitignore",
".eslintrc.json",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ exports[`init should add nuxt dependencies 1`] = `
{
"dependencies": {},
"devDependencies": {
"@nuxt/devtools": "1.0.0-beta.0",
"@nuxt/devtools": "^0.8.0",
"@nx/js": "0.0.1",
"@nx/nuxt": "0.0.1",
"@swc-node/register": "~1.6.7",
"@swc/core": "~1.3.85",
"h3": "^1.8.2",
"nuxt": "^3.7.4",
"nuxt": "3.6.5",
"prettier": "^2.6.2",
"typescript": "~5.1.3",
"vue": "^3.3.4",
Expand Down
24 changes: 2 additions & 22 deletions packages/nuxt/src/utils/create-ts-config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Tree, offsetFromRoot, writeJson } from '@nx/devkit';
import { Tree, writeJson } from '@nx/devkit';
import * as shared from '@nx/js/src/utils/typescript/create-ts-config';

export function createTsConfig(
Expand All @@ -11,16 +11,11 @@ export function createTsConfig(
},
relativePathToRootTsConfig: string
) {
createAppTsConfig(host, options.projectRoot, options.outputPath);
const json = {
compilerOptions: {},
files: [],
include: [],
references: [
{
path: './tsconfig.app.json',
},
],
references: [],
} as any;

if (options.unitTestRunner !== 'none') {
Expand All @@ -43,18 +38,3 @@ export function createTsConfig(

writeJson(host, `${options.projectRoot}/tsconfig.json`, json);
}

function createAppTsConfig(
host: Tree,
projectRoot: string,
outputPath: string
) {
const json = {
extends: `${offsetFromRoot(projectRoot)}${outputPath}/.nuxt/tsconfig.json`,
compilerOptions: {
composite: true,
noEmit: false,
},
};
writeJson(host, `${projectRoot}/tsconfig.app.json`, json);
}
5 changes: 3 additions & 2 deletions packages/nuxt/src/utils/versions.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
export const nxVersion = require('../../package.json').version;

// nuxt deps
export const nuxtDevtoolsVersion = '1.0.0-beta.0';
export const nuxtVersion = '^3.7.4';
export const h3Version = '^1.8.2';
export const nuxtVersion = '3.6.5';
export const nuxtKitVersion = '3.6.5';
export const nuxtDevtoolsVersion = '^0.8.0';

// linting deps
export const nuxtEslintConfigVersion = '0.2.0';
13 changes: 7 additions & 6 deletions pnpm-lock.yaml

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

0 comments on commit 5bfa7d7

Please sign in to comment.