fix: update to babel-plugin-macros

Author: Kent C. Dodds

README.md

@@ -10,19 +10,17 @@
 [![Code Coverage][coverage-badge]][coverage]
 [![version][version-badge]][package]
 [![downloads][downloads-badge]][npmcharts]
-[![MIT License][license-badge]][LICENSE]
+[![MIT License][license-badge]][license]
 
 [![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors)
 [![PRs Welcome][prs-badge]][prs]
 [![Code of Conduct][coc-badge]][coc]
-[![Babel Macro](https://img.shields.io/badge/babel--macro-%F0%9F%8E%A3-f5da55.svg?style=flat-square)](https://github.com/kentcdodds/babel-macros)
+[![Babel Macro](https://img.shields.io/badge/babel--macro-%F0%9F%8E%A3-f5da55.svg?style=flat-square)](https://github.com/kentcdodds/babel-plugin-macros)
 
 [![Watch on GitHub][github-watch-badge]][github-watch]
 [![Star on GitHub][github-star-badge]][github-star]
 [![Tweet][twitter-badge]][twitter]
 
-<a href="https://app.codesponsor.io/link/PKGFLnhDiFvsUA5P4kAXfiPs/kentcdodds/babel-plugin-codegen" rel="nofollow"><img src="https://app.codesponsor.io/embed/PKGFLnhDiFvsUA5P4kAXfiPs/kentcdodds/babel-plugin-codegen.svg" style="width: 888px; height: 68px;" alt="Sponsor" /></a>
-
 ## The problem
 
 The applications of this plugin are wide, so it's kinda hard to sum it up, but
@@ -45,6 +43,31 @@ comment directive) and requiring it as a module. Then it takes whatever the
 export was (which should be a string) and converts that string to an AST node
 and swaps your usage node with the new AST node.
 
+## Table of Contents
+
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+* [Installation](#installation)
+* [Usage](#usage)
+  * [Template Tag](#template-tag)
+  * [import comment](#import-comment)
+  * [codegen.require](#codegenrequire)
+  * [codegen file comment (`// @codegen`)](#codegen-file-comment--codegen)
+* [Configure with Babel](#configure-with-babel)
+  * [Via `.babelrc` (Recommended)](#via-babelrc-recommended)
+  * [Via CLI](#via-cli)
+  * [Via Node API](#via-node-api)
+* [Use with [`babel-plugin-macros`][babel-plugin-macros]](#use-with-babel-plugin-macrosbabel-plugin-macros)
+* [Caveats](#caveats)
+* [Inspiration](#inspiration)
+* [Other Solutions](#other-solutions)
+* [Contributors](#contributors)
+* [LICENSE](#license)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
 ## Installation
 
 This module is distributed via [npm][npm] which is bundled with [node][node] and
@@ -62,6 +85,7 @@ actually replacing it with code (giving you a little bit more power in exchange
 for potentially being a little more confusing).
 
 Important notes:
+
 1. All code run by `codegen` is _not_ run in a sandboxed environment
 2. All code _must_ run synchronously.
 3. All code will be transpiled via `babel-core` directly or `babel-register`
@@ -72,8 +96,6 @@ Important notes:
 4. The code that's generated may or may not be transpiled (babel plugin ordering
    is tricky business). **You should generate the code that you wish to ship.**
 
-TODO...
-
 ### Template Tag
 
 **Before**:
@@ -88,7 +110,7 @@ codegen`
 **After** (assuming `some-code.js` contains the text: `var x = 'Hello world!'`):
 
 ```javascript
-var x = 'Hello world!';
+var x = 'Hello world!'
 ```
 
 `codegen` can also handle _some_ simple dynamic values as well:
@@ -118,7 +140,7 @@ import /* codegen */ './assign-one.js'
 **After** (`assign-one.js` is: `module.exports = 'var x = 1'`):
 
 ```javascript
-var x = 1;
+var x = 1
 ```
 
 You can also provide arguments! In this case, the module you import should
@@ -133,7 +155,7 @@ import /* codegen(3) */ './assign-identity'
 **After** (`assign-identity.js` is: `module.exports = input => 'var x = ' + JSON.stringify(input) + ';'`):
 
 ```javascript
-var x = 3;
+var x = 3
 ```
 
 ### codegen.require
@@ -147,7 +169,7 @@ const x = codegen.require('./es6-identity', 3)
 **After** (`es6-identity.js` is: `export default input => 'var x = ' + JSON.stringify(input) + ';'`):
 
 ```javascript
-const x = 3;
+const x = 3
 ```
 
 ### codegen file comment (`// @codegen`)
@@ -169,9 +191,9 @@ module.exports = array
 **After**:
 
 ```javascript
-export const apple = 'apple';
-export const orange = 'orange';
-export const pear = 'pear';
+export const apple = 'apple'
+export const orange = 'orange'
+export const pear = 'pear'
 ```
 
 ## Configure with Babel
@@ -200,9 +222,9 @@ require('babel-core').transform('code', {
 })
 ```
 
-## Use with [`babel-macros`][babel-macros]
+## Use with [`babel-plugin-macros`][babel-plugin-macros]
 
-Once you've [configured `babel-macros`](https://github.com/kentcdodds/babel-macros/blob/master/other/docs/user.md)
+Once you've [configured `babel-plugin-macros`](https://github.com/kentcdodds/babel-plugin-macros/blob/master/other/docs/user.md)
 you can import/require the codegen macro at `babel-plugin-codegen/macro`.
 For example:
 
@@ -244,8 +266,11 @@ here!
 Thanks goes to these people ([emoji key][emojis]):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-| [<img src="https://avatars.githubusercontent.com/u/1500684?v=3" width="100px;"/><br /><sub>Kent C. Dodds</sub>](https://kentcdodds.com)<br />[💻](https://github.com/kentcdodds/babel-plugin-codegen/commits?author=kentcdodds) [📖](https://github.com/kentcdodds/babel-plugin-codegen/commits?author=kentcdodds) 🚇 [⚠️](https://github.com/kentcdodds/babel-plugin-codegen/commits?author=kentcdodds) |
+
+<!-- prettier-ignore -->
+| [<img src="https://avatars.githubusercontent.com/u/1500684?v=3" width="100px;"/><br /><sub><b>Kent C. Dodds</b></sub>](https://kentcdodds.com)<br />[💻](https://github.com/kentcdodds/babel-plugin-codegen/commits?author=kentcdodds "Code") [📖](https://github.com/kentcdodds/babel-plugin-codegen/commits?author=kentcdodds "Documentation") [🚇](#infra-kentcdodds "Infrastructure (Hosting, Build-Tools, etc)") [⚠️](https://github.com/kentcdodds/babel-plugin-codegen/commits?author=kentcdodds "Tests") |
 | :---: |
+
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors][all-contributors] specification.
@@ -283,4 +308,4 @@ MIT
 [glamorous]: https://github.com/paypal/glamorous
 [preval]: https://github.com/kentcdodds/babel-plugin-preval
 [codegen.macro]: https://www.npmjs.com/package/codegen.macro
-[babel-macros]: https://github.com/kentcdodds/babel-macros
+[babel-plugin-macros]: https://github.com/kentcdodds/babel-plugin-macros

package.json

@@ -17,20 +17,25 @@
     "precommit": "kcd-scripts precommit"
   },
   "files": ["dist", "macro.js"],
-  "keywords": ["babel-macros", "babel-plugin", "babel", "code generation"],
+  "keywords": [
+    "babel-plugin-macros",
+    "babel-plugin",
+    "babel",
+    "code generation"
+  ],
   "author": "Kent C. Dodds <kent@doddsfamily.us> (http://kentcdodds.com/)",
   "license": "MIT",
   "dependencies": {
     "babel-core": "^6.26.0",
-    "babel-macros": "^1.0.0",
+    "babel-plugin-macros": "^2.0.0",
     "babel-register": "^6.26.0",
     "babel-template": "^6.26.0",
-    "require-from-string": "^1.2.1"
+    "require-from-string": "^2.0.1"
   },
   "devDependencies": {
-    "ast-pretty-print": "^2.0.0",
-    "babel-plugin-tester": "^4.0.0",
-    "kcd-scripts": "^0.4.0"
+    "ast-pretty-print": "^2.0.1",
+    "babel-plugin-tester": "^5.0.0",
+    "kcd-scripts": "^0.30.4"
   },
   "eslintConfig": {
     "extends": "./node_modules/kcd-scripts/eslint.js"

src/__tests__/.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": [["env", {"targets": {"node": "8"}}]]
+}

src/__tests__/macro.js

@@ -1,6 +1,6 @@
 import path from 'path'
 import pluginTester from 'babel-plugin-tester'
-import plugin from 'babel-macros'
+import plugin from 'babel-plugin-macros'
 
 const projectRoot = path.join(__dirname, '../../')
 

src/index.js

@@ -126,8 +126,9 @@ function resolveModuleToString({args, filename, source}) {
   if (argValues.length) {
     if (typeof mod !== 'function') {
       throw new Error(
-        `\`codegen.require\`-ed module (${source.node
-          .value}) cannot accept arguments because it does not export a function. You passed the arguments: ${argValues.join(
+        `\`codegen.require\`-ed module (${
+          source.node.value
+        }) cannot accept arguments because it does not export a function. You passed the arguments: ${argValues.join(
           ', ',
         )}`,
       )
@@ -170,6 +171,7 @@ function isPrimitive(val) {
 
 /*
 eslint
-  import/no-unassigned-import:0
-  import/no-dynamic-require:0
+  complexity: ["error", 8],
+  import/no-unassigned-import: "off",
+  import/no-dynamic-require: "off",
 */

src/macro.js

@@ -1,5 +1,5 @@
 // const printAST = require('ast-pretty-print')
-const {createMacro} = require('babel-macros')
+const {createMacro} = require('babel-plugin-macros')
 const replace = require('./replace')
 
 module.exports = createMacro(codegenMacros)