Merging in changes from upstream

Author: MattStypa

.eslintignore

@@ -1,4 +1,4 @@
 /lib
 /docs
 /__tests__/fixtures/cli-utils.js
-defaultConfig.stub.js
+/stubs/*

__tests__/applyAtRule.test.js

@@ -3,7 +3,7 @@ import substituteClassApplyAtRules from '../src/lib/substituteClassApplyAtRules'
 import processPlugins from '../src/util/processPlugins'
 import resolveConfig from '../src/util/resolveConfig'
 import corePlugins from '../src/corePlugins'
-import defaultConfig from '../defaultConfig.stub.js'
+import defaultConfig from '../stubs/defaultConfig.stub.js'
 
 const resolvedDefaultConfig = resolveConfig([defaultConfig])
 

__tests__/cli.test.js

@@ -7,6 +7,8 @@ import * as utils from '../src/cli/utils'
 describe('cli', () => {
   const inputCssPath = path.resolve(__dirname, 'fixtures/tailwind-input.css')
   const customConfigPath = path.resolve(__dirname, 'fixtures/custom-config.js')
+  const defaultConfigFixture = utils.readFile(constants.defaultConfigStubFile)
+  const simpleConfigFixture = utils.readFile(constants.simpleConfigStubFile)
 
   beforeEach(() => {
     console.log = jest.fn()
@@ -32,6 +34,20 @@ describe('cli', () => {
         expect(utils.writeFile.mock.calls[0][1]).not.toContain('/**')
       })
     })
+
+    it('creates a simple Tailwind config file', () => {
+      return cli(['init']).then(() => {
+        expect(utils.writeFile.mock.calls[0][1]).toEqual(simpleConfigFixture)
+      })
+    })
+
+    it('creates a full Tailwind config file', () => {
+      return cli(['init', '--full']).then(() => {
+        expect(utils.writeFile.mock.calls[0][1]).toEqual(
+          utils.replaceAll(defaultConfigFixture, constants.replacements)
+        )
+      })
+    })
   })
 
   describe('build', () => {

__tests__/cli.utils.test.js

@@ -109,4 +109,30 @@ describe('cli utils', () => {
       expect(result).toEqual(expect.stringContaining('__comment_docblock_important__'))
     })
   })
+
+  describe('replaceAll', () => {
+    it('replaces strings', () => {
+      const result = utils.replaceAll('test', [['test', 'pass']])
+
+      expect(result).toEqual('pass')
+    })
+
+    it('replaces regex patterns', () => {
+      const result = utils.replaceAll('TEST', [[/test/i, 'pass']])
+
+      expect(result).toEqual('pass')
+    })
+
+    it('replaces all matches', () => {
+      const result = utils.replaceAll('test test', [['test', 'pass']])
+
+      expect(result).toEqual('pass pass')
+    })
+
+    it('replaces all multiple patterns', () => {
+      const result = utils.replaceAll('hello world', [['hello', 'greetings'], ['world', 'earth']])
+
+      expect(result).toEqual('greetings earth')
+    })
+  })
 })

__tests__/defaultConfig.test.js

@@ -1,5 +1,11 @@
 import config from '../defaultConfig.js'
+import configStub from '../stubs/defaultConfig.stub.js'
 
 test('the default config matches the stub', () => {
-  expect(config()).toEqual(require('../defaultConfig.stub.js'))
+  expect(config).toEqual(configStub)
+})
+
+test('modifying the default config does not affect the stub', () => {
+  config.theme = {}
+  expect(config).not.toEqual(configStub)
 })

__tests__/defaultTheme.test.js

@@ -0,0 +1,11 @@
+import theme from '../defaultTheme.js'
+import configStub from '../stubs/defaultConfig.stub.js'
+
+test('the default theme matches the stub', () => {
+  expect(theme).toEqual(configStub.theme)
+})
+
+test('modifying the default theme does not affect the stub', () => {
+  theme.colors = {}
+  expect(theme).not.toEqual(configStub.theme)
+})

__tests__/responsiveAtRule.test.js

@@ -1,6 +1,6 @@
 import postcss from 'postcss'
 import plugin from '../src/lib/substituteResponsiveAtRules'
-import config from '../defaultConfig.stub.js'
+import config from '../stubs/defaultConfig.stub.js'
 
 function run(input, opts = config) {
   return postcss([plugin(opts)]).process(input, { from: undefined })

__tests__/sanity.test.js

@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import postcss from 'postcss'
 import tailwind from '../src/index'
-import config from '../defaultConfig.js'
+import config from '../stubs/defaultConfig.stub.js'
 
 it('generates the right CSS', () => {
   const inputPath = path.resolve(`${__dirname}/fixtures/tailwind-input.css`)

__tests__/variantsAtRule.test.js

@@ -1,7 +1,7 @@
 import postcss from 'postcss'
 import plugin from '../src/lib/substituteVariantsAtRules'
-import config from '../defaultConfig.stub.js'
 import processPlugins from '../src/util/processPlugins'
+import config from '../stubs/defaultConfig.stub.js'
 
 function run(input, opts = config) {
   return postcss([plugin(opts, processPlugins(opts.plugins, opts))]).process(input, {

defaultConfig.js

@@ -1,3 +1,4 @@
-module.exports = function() {
-  return require('lodash').cloneDeep(require('./defaultConfig.stub.js'))
-}
+const cloneDeep = require('lodash/cloneDeep')
+const defaultConfig = require('./stubs/defaultConfig.stub.js')
+
+module.exports = cloneDeep(defaultConfig)