From 849f6b4bda01988c8713e5254d605fb00dcdbb46 Mon Sep 17 00:00:00 2001 From: Kevin Marrec Date: Tue, 7 Jul 2020 10:28:49 +0200 Subject: [PATCH 1/2] fix(template): fix typescript template generation --- packages/cna-template/template/nuxt/package.js | 1 + packages/cna-template/template/nuxt/package.json | 5 +++-- packages/cna-template/template/tsconfig.json | 12 ++++++------ .../create-nuxt-app/test/snapshots/index.test.js.md | 5 +++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/packages/cna-template/template/nuxt/package.js b/packages/cna-template/template/nuxt/package.js index 4a976fec4..a7f36e1cd 100644 --- a/packages/cna-template/template/nuxt/package.js +++ b/packages/cna-template/template/nuxt/package.js @@ -72,6 +72,7 @@ module.exports = { const typescript = language.includes('ts') if (!typescript) { + delete pkg.devDependencies['@nuxt/types'] delete pkg.devDependencies['@nuxt/typescript-build'] delete pkg.dependencies['@nuxt/typescript-runtime'] } diff --git a/packages/cna-template/template/nuxt/package.json b/packages/cna-template/template/nuxt/package.json index bb8d66c67..e81437607 100644 --- a/packages/cna-template/template/nuxt/package.json +++ b/packages/cna-template/template/nuxt/package.json @@ -18,14 +18,15 @@ } }, "dependencies": { - "@nuxt/typescript-runtime": "^0.4.10", + "@nuxt/typescript-runtime": "^1.0.0", "@nuxtjs/axios": "^5.11.0", "@nuxtjs/pwa": "^3.0.0-beta.20", "@nuxt/content": "^1.3.2", "nuxt": "^2.13.0" }, "devDependencies": { - "@nuxt/typescript-build": "^1.0.3", + "@nuxt/types": "^2.13.0", + "@nuxt/typescript-build": "^2.0.0", "@nuxtjs/eslint-config-typescript": "^2.0.0", "@nuxtjs/eslint-config": "^3.0.0", "@nuxtjs/eslint-module": "^2.0.0", diff --git a/packages/cna-template/template/tsconfig.json b/packages/cna-template/template/tsconfig.json index 3537b803c..65f9bbc0d 100644 --- a/packages/cna-template/template/tsconfig.json +++ b/packages/cna-template/template/tsconfig.json @@ -1,12 +1,12 @@ { "compilerOptions": { - "target": "es2018", - "module": "esnext", - "moduleResolution": "node", + "target": "ES2018", + "module": "ESNext", + "moduleResolution": "Node", "lib": [ - "esnext", - "esnext.asynciterable", - "dom" + "ESNext", + "ESNext.AsyncIterable", + "DOM" ], "esModuleInterop": true, "allowJs": true, diff --git a/packages/create-nuxt-app/test/snapshots/index.test.js.md b/packages/create-nuxt-app/test/snapshots/index.test.js.md index 9d0da14d9..937467e28 100644 --- a/packages/create-nuxt-app/test/snapshots/index.test.js.md +++ b/packages/create-nuxt-app/test/snapshots/index.test.js.md @@ -1022,11 +1022,12 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@nuxt/typescript-runtime': '^0.4.10', + '@nuxt/typescript-runtime': '^1.0.0', nuxt: '^2.13.0', }, devDependencies: { - '@nuxt/typescript-build': '^1.0.3', + '@nuxt/types': '^2.13.0', + '@nuxt/typescript-build': '^2.0.0', }, private: true, scripts: { From 98a665d8212303ace761ed4f1c029766b2a609cc Mon Sep 17 00:00:00 2001 From: Kevin Marrec Date: Tue, 7 Jul 2020 10:32:51 +0200 Subject: [PATCH 2/2] fix tests --- .../test/snapshots/index.test.js.snap | Bin 7430 -> 7309 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/create-nuxt-app/test/snapshots/index.test.js.snap b/packages/create-nuxt-app/test/snapshots/index.test.js.snap index 90464bbb5b780c94fae745fbb152758d760f953e..f33f352835ab1b6b83caa7b9e1a4112351839844 100644 GIT binary patch literal 7309 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 Pc*2MGkaJi^qrCVJiMD&?