refactor: group files into directories

Author: yyx990803

Diff for: lib/customBlocks.js renamed to lib/codegen/customBlocks.js

@@ -5,10 +5,10 @@ const qs = require('querystring')
 const plugin = require('./plugin')
 const selectBlock = require('./select')
 const loaderUtils = require('loader-utils')
-const { attrsToQuery } = require('./utils')
-const genStylesCode = require('./styles')
-const { genHotReloadCode } = require('./hotReload')
-const genCustomBlocksCode = require('./customBlocks')
+const { attrsToQuery } = require('./codegen/utils')
+const genStylesCode = require('./codegen/styleInjection')
+const { genHotReloadCode } = require('./codegen/hotReload')
+const genCustomBlocksCode = require('./codegen/customBlocks')
 const componentNormalizerPath = require.resolve('./runtime/componentNormalizer')
 
 module.exports = function (source) {

Diff for: lib/hotReload.js renamed to lib/codegen/hotReload.js

@@ -1,7 +1,7 @@
 const qs = require('querystring')
 const loaderUtils = require('loader-utils')
 const templateLoaderPath = require.resolve('./templateLoader')
-const stylePostLoaderPath = require.resolve('./style-post-loader')
+const stylePostLoaderPath = require.resolve('./stylePostLoader')
 
 module.exports = code => code
 

Diff for: lib/styles.js renamed to lib/codegen/styleInjection.js

@@ -0,0 +1,23 @@
+const qs = require('querystring')
+const { compileStyle } = require('vue-component-compiler')
+
+// This is a post loader that handles scoped CSS transforms.
+// Injected right before css-loader by the global pitcher (../pitch.js)
+// for any <style scoped> selection requests initiated from within vue files.
+module.exports = function (source, inMap) {
+  const query = qs.parse(this.resourceQuery.slice(1))
+  const { code, map, errors } = compileStyle({
+    source,
+    filename: this.resourcePath,
+    id: `data-v-${query.id}`,
+    map: inMap,
+    scoped: !!query.scoped,
+    trim: true
+  })
+
+  if (errors.length) {
+    this.callback(errors[0])
+  } else {
+    this.callback(null, code, map)
+  }
+}

Diff for: lib/utils.js renamed to lib/codegen/utils.js

@@ -1,8 +1,8 @@
 const qs = require('querystring')
 const loaderUtils = require('loader-utils')
 const compiler = require('vue-template-compiler')
-const { genTemplateHotReloadCode } = require('./hotReload')
 const { compileTemplate } = require('vue-component-compiler')
+const { genTemplateHotReloadCode } = require('../codegen/hotReload')
 
 // Loader that compiles raw template into JavaScript functions.
 // This is injected by the global pitcher (../pitch) for template
@@ -27,19 +27,16 @@ module.exports = function (source) {
     comments: query.comments
   })
 
-  const preprocessOptions = Object.assign({
-    filename: this.resourcePath
-  }, options.template)
-
   // for vue-component-compiler
   const finalOptions = {
     source,
+    filename: this.resourcePath,
     // allow using custom compiler via options
     compiler: options.compiler || compiler,
     compilerOptions,
     // handle possible lang="xxx"
     preprocessLang: query.lang,
-    preprocessOptions,
+    preprocessOptions: options.template,
     // allow customizing behavior of vue-template-es2015-compiler
     transpileOptions: options.transpileOptions,
     transformAssetUrls: options.transformAssetUrls || true,

Diff for: lib/index.js

@@ -69,7 +69,7 @@ module.exports = class VueLoaderPlugin {
     const normalizedRules = rawNormalizedRules.filter(r => r !== normalizedVueRule)
 
     const customFallbackRule = {
-      loader: require.resolve('./noop'),
+      loader: require.resolve('./loaders/noop'),
       resourceQuery: /type=custom/
     }
 
@@ -91,7 +91,7 @@ module.exports = class VueLoaderPlugin {
     // inject global pitcher (responsible for injecting template compiler
     // loader & CSS post loader)
     rawRules.unshift({
-      loader: require.resolve('./pitch')
+      loader: require.resolve('./loaders/pitch')
     })
   }
 }

Diff for: lib/noop.js renamed to lib/loaders/noop.js

@@ -35,8 +35,6 @@
   "dependencies": {
     "hash-sum": "^1.0.2",
     "loader-utils": "^1.1.0",
-    "postcss": "^6.0.20",
-    "postcss-selector-parser": "^3.1.1",
     "vue-component-compiler": "vuejs/vue-component-compiler#master",
     "vue-hot-reload-api": "^2.3.0",
     "vue-style-loader": "^4.1.0"