vuejs · nelsonpecora · Aug 13, 2018 · Aug 13, 2018 · Aug 30, 2018 · Aug 30, 2018
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -19,7 +19,7 @@ var insertCSSPath = normalize.lib('insert-css')
 
 var hasBabel = true
 try {
-  require('babel-core')
+  require('@babel/core')
 } catch (e) {
   hasBabel = false
 }
@@ -86,8 +86,8 @@ compiler.compile = function (content, filePath, cb) {
   ].concat(parts.styles.map(function (style) {
     return processStyle(style, filePath, id, resolvedParts)
   })))
-  .then(mergeParts)
-  .catch(cb)
+    .then(mergeParts)
+    .catch(cb)
 
   function mergeParts () {
     // check whether script/template has changed

diff --git a/lib/compilers/babel.js b/lib/compilers/babel.js
@@ -5,8 +5,7 @@ var assign = require('object-assign')
 var ensureRequire = require('../ensure-require')
 
 var defaultBabelOptions = {
-  presets: ['es2015'],
-  plugins: ['transform-runtime']
+  presets: ['@babel/preset-env']
 }
 
 var babelRcPath = path.resolve(process.cwd(), '.babelrc')
@@ -27,7 +26,7 @@ function getBabelRc () {
 module.exports = function (raw, cb, compiler, filePath) {
   if ((compiler.options.babel || babelOptions) === defaultBabelOptions) {
     try {
-      ensureRequire('babel', ['babel-preset-es2015', 'babel-runtime', 'babel-plugin-transform-runtime'])
+      ensureRequire('babel', ['@babel/preset-env'])
     } catch (e) {
       console.error(e.message)
       console.error(
@@ -39,7 +38,7 @@ module.exports = function (raw, cb, compiler, filePath) {
   }
 
   try {
-    var babel = require('babel-core')
+    var babel = require('@babel/core')
     var options = assign({
       comments: false,
       filename: filePath,

diff --git a/lib/normalize.js b/lib/normalize.js
@@ -6,7 +6,7 @@ exports.lib = function (file) {
   if (IS_TEST) {
     return path.resolve(__dirname, file)
   } else {
-    return 'vueify/lib/' + file
+    return '@nymag/vueify/lib/' + file
   }
 }
 
@@ -15,7 +15,7 @@ exports.dep = function (dep) {
     return dep
   } else if (fs.existsSync(path.resolve(__dirname, '../node_modules', dep))) {
     // npm 2 or npm linked
-    return 'vueify/node_modules/' + dep
+    return '@nymag/vueify/node_modules/' + dep
   } else {
     // npm 3
     return dep

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
@@ -24,7 +24,7 @@ var addId = postcss.plugin('add-id', function () {
             attribute: currentId
           }))
         })
-      }).process(node.selector).result
+      }).processSync(node)
     })
   }
 })
@@ -46,13 +46,14 @@ module.exports = function (id, css, scoped, options) {
     return Promise.resolve(val)
   } else {
     var plugins = []
-    var opts = {}
+    var opts = { from: 'source' }
 
     if (options.postcss instanceof Array) {
       plugins = options.postcss.slice()
     } else if (options.postcss instanceof Object) {
       plugins = options.postcss.plugins || []
       opts = options.postcss.options
+      opts.from = opts.from || 'source'
     }
 
     // scoped css rewrite
@@ -81,4 +82,3 @@ module.exports = function (id, css, scoped, options) {
       })
   }
 }
-