Skip to content

Commit ebccfb2

Browse files
author
Julia Bakerink
committed
Fixed syntax bugs in export project in Typescript functionality
1 parent 5d2434e commit ebccfb2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+15
-884
lines changed

src/components/file_system_interface/ExportProject.vue

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,22 @@ export default {
6363
* @argument: this.componentMap['App'].children
6464
*/
6565
createRouterImports(appChildren) {
66-
let str = "import { createRouter, createWebHistory } from 'vue-router'\n";
66+
let str = "import { createRouter, createWebHistory } from 'vue-router';\n";
6767
appChildren.forEach((child) => {
68-
str += `import ${child} from './views/${child}.vue'\n`;
68+
str += `import ${child} from './views/${child}.vue';\n`;
6969
});
7070
return str;
7171
},
7272
/**
7373
* @description creates the `export default` code in <script>
7474
*/
7575
createExport(appChildren) {
76-
let str =
77-
"export default createRouter({\n\thistory: createWebHistory(),\n\tbase: process.env.BASE_URL,\n\troutes: [\n";
76+
let str;
77+
if (this.exportAsTypescript === 'on') {
78+
str = "export default createRouter({\n\thistory: createWebHistory(process.env.BASE_URL),\n\troutes: [\n";
79+
} else {
80+
str = "export default createRouter({\n\thistory: createWebHistory(),\n\tbase: process.env.BASE_URL,\n\troutes: [\n";
81+
}
7882
appChildren.forEach((child) => {
7983
if (child === "HomeView") {
8084
str += `\t\t{\n\t\t\tpath: '/',\n\t\t\tname:'${child}',\n\t\t\tcomponent:${child}\n\t\t},\n`;
@@ -339,11 +343,11 @@ export default {
339343
},
340344
// creates main.js boilerplate
341345
createMainFile(location) {
342-
let str = `import { createApp } from 'vue'`;
343-
str += `\nimport App from './App.vue'`;
344-
str += `\nimport router from './router'`;
346+
let str = `import { createApp } from 'vue';`;
347+
str += `\nimport App from './App.vue';`;
348+
str += `\nimport router from './router';`;
345349
// str += `\n\n import './index.css'`
346-
str += `\n\n const app = createApp(App)`;
350+
str += `\n\n const app = createApp(App);`;
347351
// str += `\n\trouter,
348352
str += `\napp.use(router);`;
349353
str += `\n app.mount('#app');`;
@@ -370,14 +374,7 @@ export default {
370374
},
371375
createTSConfig(location) {
372376
if (this.exportAsTypescript === "on") {
373-
let str = `{\n\t"extends": "@vue/tsconfig/tsconfig.web.json",
374-
"include": ["src/**/*", "src/**/*.vue"],
375-
"compilerOptions": {
376-
"baseUrl": ".",
377-
"paths": {
378-
"@/*": ["./src/*"]
379-
}
380-
},\n}`;
377+
let str = `{\n\t"extends": "@vue/tsconfig/tsconfig.web.json",\n\t"include": ["src/**/*", "src/**/*.vue"],\n\t"compilerOptions": {\n\t\t"baseUrl": ".",\n\t\t"paths": {\n\t\t\t"@/*": ["./src/*"]\n\t\t}\n\t}\n}`;
381378
fs.writeFileSync(path.join(location, "tsconfig.json"), str);
382379
} else {
383380
return;
@@ -406,9 +403,9 @@ export default {
406403
str += `\n\t\t"babel-eslint": "^10.0.1",`;
407404
str += `\n\t\t"eslint": "^6.7.2",`;
408405
str += `\n\t\t"eslint-plugin-vue": "^7.0.0-0",`;
409-
str += `\n\t\t"@vue/compiler-sfc": "^3.0.0-0",`;
406+
str += `\n\t\t"@vue/compiler-sfc": "^3.0.0-0"`;
410407
if (this.exportAsTypescript === "on") {
411-
str += `\n\t\t"@vue/tsconfig": "^0.1.3",`;
408+
str += `,\n\t\t"@vue/tsconfig": "^0.1.3",`;
412409
str += `\n\t\t"typescript": "~4.5.5",`;
413410
str += `\n\t\t"vue-tsc": "^0.31.4",`;
414411
str += `\n\t\t"@babel/preset-typescript": "^7.16.7"`; // not sure we need this?

testExportProject/babel.config.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

testExportProject/package.json

Lines changed: 0 additions & 48 deletions
This file was deleted.

testExportProject/public/index.html

Lines changed: 0 additions & 21 deletions
This file was deleted.

testExportProject/src/App.vue

Lines changed: 0 additions & 20 deletions
This file was deleted.

testExportProject/src/components/Child1.vue

Lines changed: 0 additions & 33 deletions
This file was deleted.

testExportProject/src/components/Child2.vue

Lines changed: 0 additions & 17 deletions
This file was deleted.

testExportProject/src/components/Test.vue

Lines changed: 0 additions & 21 deletions
This file was deleted.

testExportProject/src/components/routeDiv.vue

Lines changed: 0 additions & 17 deletions
This file was deleted.

testExportProject/src/main.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)