feat: Paired vue-cli version

ftgibran · ftgibran · commit 0b10f89dcf4e · 2018-08-17T16:50:56.000-03:00
diff --git a/packages/@simpli/cli-scaffold/generator/index.js b/packages/@simpli/cli-scaffold/generator/index.js
@@ -63,16 +63,16 @@ module.exports = (api, options) => {
       'normalize-scss': '7.0.1',
       'register-service-worker': '1.1.1',
       'simple-line-icons': '2.4.1',
-      'simpli-ts-vue': '1.7.0',
-      'vue': '2.5.16',
+      'simpli-ts-vue': '^1.7.1',
+      'vue': '2.5.17',
       'vue-chartjs': '3.2.1',
       'vue-chartkick': '0.2.1',
       'vue-class-component': '6.2.0',
       'vue-i18n': '7.6.0',
       'vue-meta': '1.4.4',
       'vue-moment': '3.2.0',
       'vue-multiselect': '2.0.8',
-      'vue-property-decorator': '6.0.0',
+      'vue-property-decorator': '7.0.0',
       'vue-resource': '1.5.0',
       'vue-router': '3.0.1',
       'vue-snotify': '3.0.4',
@@ -81,20 +81,16 @@ module.exports = (api, options) => {
       'vuex-class': '0.3.0'
     },
     devDependencies: {
-      '@vue/cli-plugin-babel': '3.0.0-beta.7',
-      '@vue/cli-plugin-pwa': '3.0.0-beta.7',
-      '@vue/cli-plugin-typescript': '3.0.0-beta.7',
-      '@vue/cli-service': '3.0.0-beta.7',
-      'lint-staged': '7.0.0',
-      'node-sass': '4.8.2',
-      'sass-loader': '6.0.7',
-      'vue-template-compiler': '2.5.16'
+      '@vue/cli-plugin-babel': '3.0.1',
+      '@vue/cli-plugin-pwa': '3.0.1',
+      '@vue/cli-plugin-typescript': '3.0.1',
+      '@vue/cli-service': '3.0.1',
+      'lint-staged': '7.2.2',
+      'node-sass': '4.9.0',
+      'sass-loader': '7.0.1',
+      'typescript': '3.0.1',
+      'vue-template-compiler': '2.5.17'
     },
-    'browserslist': [
-      '> 1%',
-      'last 2 versions',
-      'not ie <= 8'
-    ],
     'gitHooks': {
       'pre-commit': 'lint-staged'
     },
diff --git a/packages/@simpli/cli-scaffold/generator/template/_babelrc b/packages/@simpli/cli-scaffold/generator/template/_babelrc
diff --git a/packages/@simpli/cli-scaffold/generator/template/_browserslistrc b/packages/@simpli/cli-scaffold/generator/template/_browserslistrc
@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not ie <= 8
diff --git a/packages/@simpli/cli-scaffold/generator/template/_postcssrc b/packages/@simpli/cli-scaffold/generator/template/_postcssrc
diff --git a/packages/@simpli/cli-scaffold/generator/template/babel.config.js b/packages/@simpli/cli-scaffold/generator/template/babel.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  presets: [
+    '@vue/app'
+  ]
+}
diff --git a/packages/@simpli/cli-scaffold/generator/template/postcss.config.js b/packages/@simpli/cli-scaffold/generator/template/postcss.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: {
+    autoprefixer: {}
+  }
+}
diff --git a/packages/@simpli/cli-scaffold/generator/template/public/index.html b/packages/@simpli/cli-scaffold/generator/template/public/index.html
@@ -4,10 +4,13 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="shortcut icon" href="<%%= webpackConfig.output.publicPath %%>favicon.ico">
+    <link rel="shortcut icon" href="<%%= BASE_URL %%>favicon.ico">
     <title><%- rootOptions.scaffoldSetup.appName || 'Webapp' %></title>
   </head>
   <body>
+    <noscript>
+      <strong>We're sorry but vue-sandbox doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->
   </body>
diff --git a/packages/@simpli/cli-scaffold/generator/template/public/robots.txt b/packages/@simpli/cli-scaffold/generator/template/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow:
diff --git a/packages/@simpli/cli-scaffold/generator/template/src/types/shims-tsx.d.ts b/packages/@simpli/cli-scaffold/generator/template/src/types/shims-tsx.d.ts
@@ -0,0 +1,13 @@
+import Vue, { VNode } from 'vue';
+
+declare global {
+  namespace JSX {
+    // tslint:disable no-empty-interface
+    interface Element extends VNode {}
+    // tslint:disable no-empty-interface
+    interface ElementClass extends Vue {}
+    interface IntrinsicElements {
+      [elem: string]: any;
+    }
+  }
+}
diff --git a/packages/@simpli/cli-scaffold/generator/template/src/types/shims-vue.d.ts b/packages/@simpli/cli-scaffold/generator/template/src/types/shims-vue.d.ts
diff --git a/packages/@simpli/cli-scaffold/generator/template/tsconfig.json b/packages/@simpli/cli-scaffold/generator/template/tsconfig.json
@@ -1,12 +1,13 @@
 {
   "compilerOptions": {
-    "target": "es2015",
-    "module": "es2015",
+    "target": "esnext",
+    "module": "esnext",
     "strict": true,
     "jsx": "preserve",
+    "importHelpers": true,
     "moduleResolution": "node",
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
+    "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "sourceMap": true,
     "baseUrl": ".",
@@ -17,12 +18,20 @@
       "@/*": [
         "src/*"
       ]
-    }
+    },
+    "lib": [
+      "esnext",
+      "dom",
+      "dom.iterable",
+      "scripthost"
+    ]
   },
   "include": [
     "src/**/*.ts",
+    "src/**/*.tsx",
     "src/**/*.vue",
-    "test/**/*.ts"
+    "tests/**/*.ts",
+    "tests/**/*.tsx"
   ],
   "exclude": [
     "node_modules"
diff --git a/packages/@simpli/cli-scaffold/generator/template/tslint.json b/packages/@simpli/cli-scaffold/generator/template/tslint.json
@@ -3,6 +3,11 @@
   "extends": [
     "tslint:recommended"
   ],
+  "linterOptions": {
+    "exclude": [
+      "node_modules/**"
+    ]
+  },
   "rules": {
     "quotemark": [true, "single"],
     "indent": [true, "spaces", 2],
diff --git a/packages/@simpli/cli-scaffold/generator/template/vue.config.js b/packages/@simpli/cli-scaffold/generator/template/vue.config.js
@@ -14,7 +14,9 @@ module.exports = {
   // whether to use eslint-loader for lint on save.
   // valid values: true | false | 'error'
   // when set to 'error', lint errors will cause compilation to fail.
-  lintOnSave: false,
+  lintOnSave: true,
+
+  runtimeCompiler: true,
 
   // tweak internal webpack configuration.
   // see https://github.com/vuejs/vue-cli/blob/dev/docs/webpack.md
@@ -29,17 +31,6 @@ module.exports = {
         })
     }
   },
-  configureWebpack: {
-    resolve: {
-      alias: {
-        'vue$': 'vue/dist/vue.esm.js'
-      }
-    }
-  },
-
-  // vue-loader options
-  // https://vue-loader.vuejs.org/en/options.html
-  vueLoader: {},
 
   // configure webpack-dev-server behavior
   devServer: {
@@ -52,4 +43,4 @@ module.exports = {
     proxy: null, // string | Object
     before: app => {}
   },
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+> 1%`
	`2`	`+last 2 versions`
	`3`	`+not ie <= 8`