Merge pull request #56 from wmde/config-cs

Configuration code style
wmde · Nov 20, 2018 · 9becdd3 · 9becdd3
2 parents bb53b5f + efecc92
commit 9becdd3
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 132 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  presets: [
-    '@vue/app'
-  ]
-}
+	presets: [
+		'@vue/app',
+	],
+};
diff --git a/jest.config.js b/jest.config.js
@@ -1,31 +1,31 @@
 module.exports = {
-  globals: {
-    'ts-jest': {
-      tsConfigFile: './tsconfig.all.json',
-    },
-  },
-  moduleFileExtensions: [
-    'js',
-    'jsx',
-    'json',
-    'vue',
-    'ts',
-    'tsx'
-  ],
-  transform: {
-    '^.+\\.vue$': 'vue-jest',
-    '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
-    '^.+\\.tsx?$': 'ts-jest'
-  },
-  moduleNameMapper: {
-    '^@/(.*)$': '<rootDir>/src/$1'
-  },
-  setupTestFrameworkScriptFile: '<rootDir>/tests/config/setup.ts',
-  snapshotSerializers: [
-    'jest-serializer-vue'
-  ],
-  testMatch: [
-    '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
-  ],
-  testURL: 'http://localhost/'
+	globals: {
+		'ts-jest': {
+			tsConfigFile: './tsconfig.all.json',
+		},
+	},
+	moduleFileExtensions: [
+		'js',
+		'jsx',
+		'json',
+		'vue',
+		'ts',
+		'tsx',
+	],
+	transform: {
+		'^.+\\.vue$': 'vue-jest',
+		'.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
+		'^.+\\.tsx?$': 'ts-jest',
+	},
+	moduleNameMapper: {
+		'^@/(.*)$': '<rootDir>/src/$1',
+	},
+	setupTestFrameworkScriptFile: '<rootDir>/tests/config/setup.ts',
+	snapshotSerializers: [
+		'jest-serializer-vue',
+	],
+	testMatch: [
+		'**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)',
+	],
+	testURL: 'http://localhost/',
 };
diff --git a/jsduck.json b/jsduck.json
@@ -1,10 +1,10 @@
 {
-	"--title": "Wikibase Termbox - Documentation",
-	"--output": "docs",
-	"--processes": "0",
-	"--warnings-exit-nonzero": true,
-	"--builtin-classes": true,
-	"--warnings": ["-all"],
-	"--": [
-	]
+  "--title": "Wikibase Termbox - Documentation",
+  "--output": "docs",
+  "--processes": "0",
+  "--warnings-exit-nonzero": true,
+  "--builtin-classes": true,
+  "--warnings": ["-all"],
+  "--": [
+  ]
 }
diff --git a/postcss.config.js b/postcss.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  plugins: {
-    autoprefixer: {}
-  }
-}
+	plugins: {
+		autoprefixer: {},
+	},
+};
diff --git a/tsconfig.all.json b/tsconfig.all.json
@@ -5,31 +5,33 @@
     "module": "esnext",
     "sourceMap": true,
     "typeRoots": [
-		"./src/types",
-		"./src/types/client",
-		"./src/types/server",
-		"./node_modules/@types"
+      "./src/types",
+      "./src/types/client",
+      "./src/types/server",
+      "./node_modules/@types"
     ],
     "types": [
-		"webpack-env",
-		"jest",
-		"node"
+      "webpack-env",
+      "jest",
+      "node"
     ],
     "lib": [
       "esnext",
       "es5",
       "dom",
       "dom.iterable",
       "scripthost"
-    ]
+    ],
+    "allowJs": true
   },
   "include": [
-	  "src/**/*.ts",
-	  "src/**/*.tsx",
-	  "src/**/*.vue",
-	  "tests/**/*.ts",
-	  "tests/**/*.ts",
-	  "tests/**/*.tsx"
+    "./*.js",
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
+    "tests/**/*.ts",
+    "tests/**/*.ts",
+    "tests/**/*.tsx"
   ],
   "exclude": [
     "node_modules"

diff --git a/tsconfig.json b/tsconfig.json
@@ -5,14 +5,14 @@
     "module": "esnext",
     "sourceMap": true,
     "typeRoots": [
-		"./src/types",
-		"./src/types/client",
-		"./node_modules/@types"
+      "./src/types",
+      "./src/types/client",
+      "./node_modules/@types"
     ],
     "types": [
-		"webpack-env",
-		"jest",
-		"node"
+      "webpack-env",
+      "jest",
+      "node"
     ],
     "lib": [
       "esnext",
@@ -22,11 +22,11 @@
     ]
   },
   "exclude": [
-	  "node_modules",
-	  "src/types/**/*",
-	  "src/mock-data/**/*",
-	  "src/mockup-entry.ts",
-	  "src/server/**/*",
-	  "src/server-entry.ts"
+    "node_modules",
+    "src/types/**/*",
+    "src/mock-data/**/*",
+    "src/mockup-entry.ts",
+    "src/server/**/*",
+    "src/server-entry.ts"
   ]
 }
diff --git a/tsconfig.server.json b/tsconfig.server.json
@@ -6,26 +6,26 @@
     "module": "commonjs",
     "sourceMap": true,
     "typeRoots": [
-		"./src/types",
-		"./src/types/server",
-		"./node_modules/@types"
+      "./src/types",
+      "./src/types/server",
+      "./node_modules/@types"
     ],
     "types": [
-		"webpack-env",
-		"jest",
-		"node",
-		"express"
+      "webpack-env",
+      "jest",
+      "node",
+      "express"
     ],
     "lib": [
-		"esnext"
+      "esnext"
     ]
   },
   "exclude": [
-	  "node_modules",
-	  "src/types/client/**/*",
-	  "src/mock-data/**/*",
-	  "src/mockup-entry.ts",
-	  "src/client/**/*",
-	  "src/client-entry.ts"
-	]
+    "node_modules",
+    "src/types/client/**/*",
+    "src/mock-data/**/*",
+    "src/mockup-entry.ts",
+    "src/client/**/*",
+    "src/client-entry.ts"
+  ]
 }
diff --git a/tslint.json b/tslint.json
@@ -15,5 +15,10 @@
     "interface-name": false,
     "ordered-imports": false,
     "object-literal-sort-keys": false
+  },
+  "jsRules": {
+    "quotemark": [ true, "single" ],
+    "indent": [ true, "tabs" ],
+    "object-literal-sort-keys": false
   }
 }
diff --git a/vue.config.js b/vue.config.js
@@ -1,53 +1,53 @@
-const VueSSRServerPlugin = require('vue-server-renderer/server-plugin')
-const VueSSRClientPlugin = require('vue-server-renderer/client-plugin')
+const VueSSRServerPlugin = require( 'vue-server-renderer/server-plugin' );
+const VueSSRClientPlugin = require( 'vue-server-renderer/client-plugin' );
 
-const TARGET_NODE = process.env.WEBPACK_TARGET === 'node'
-const DEV_MODE = process.env.WEBPACK_TARGET === 'dev'
-const filePrefix = 'wikibase.termbox.'
+const TARGET_NODE = process.env.WEBPACK_TARGET === 'node';
+const DEV_MODE = process.env.WEBPACK_TARGET === 'dev';
+const filePrefix = 'wikibase.termbox.';
 
 const target = TARGET_NODE
-  ? 'server'
-  : 'client'
+	? 'server'
+	: 'client';
 
 module.exports = {
-  outputDir: TARGET_NODE ? 'serverDist' : 'dist',
-  configureWebpack: () => ({
-	entry: DEV_MODE ? [ './src/mockup-entry.ts', `./src/${target}-entry.ts` ] : `./src/${target}-entry.ts`,
-    target: TARGET_NODE ? 'node' : 'web',
-    node: TARGET_NODE ? undefined : false,
-    plugins: [
-      TARGET_NODE
-        ? new VueSSRServerPlugin()
-        : new VueSSRClientPlugin()
-    ],
-    output: {
-      libraryTarget: TARGET_NODE
-        ? 'commonjs2'
-        : undefined,
-      filename: `${filePrefix}[name].js`
-    },
-    optimization: {
-      splitChunks: undefined
-    }
-  }),
-  chainWebpack: config => {
-    config.optimization.delete('splitChunks')
+	outputDir: TARGET_NODE ? 'serverDist' : 'dist',
+	configureWebpack: () => ( {
+		entry: DEV_MODE ? [ './src/mockup-entry.ts', `./src/${target}-entry.ts` ] : `./src/${target}-entry.ts`,
+		target: TARGET_NODE ? 'node' : 'web',
+		node: TARGET_NODE ? undefined : false,
+		plugins: [
+			TARGET_NODE
+				? new VueSSRServerPlugin()
+				: new VueSSRClientPlugin(),
+		],
+		output: {
+			libraryTarget: TARGET_NODE
+				? 'commonjs2'
+				: undefined,
+			filename: `${filePrefix}[name].js`,
+		},
+		optimization: {
+			splitChunks: undefined,
+		},
+	} ),
+	chainWebpack: config => {
+		config.optimization.delete( 'splitChunks' );
 
-    if ( process.env.NODE_ENV === 'production' ) {
-      config.plugin('extract-css')
-        .tap(([options, ...args]) => [
-            Object.assign({}, options, { filename: `${filePrefix}[name].css` }),
-            ...args
-        ])
-    }
+		if ( process.env.NODE_ENV === 'production' ) {
+			config.plugin( 'extract-css' )
+				.tap( ( [ options, ...args ] ) => [
+					Object.assign( {}, options, { filename: `${filePrefix}[name].css` } ),
+					...args,
+				] );
+		}
 
-    config.module
-      .rule('vue')
-      .use('vue-loader')
-      .tap(options =>
-        Object.assign(options, {
-          optimizeSSR: false
-        })
-      )
-  }
-}
+		config.module
+			.rule( 'vue' )
+			.use( 'vue-loader' )
+			.tap( options =>
+				Object.assign( options, {
+					optimizeSSR: false,
+				} ),
+			);
+	},
+};