Merge pull request #766 from MattStypa/next-cli

Updated CLI init command

Author: adamwathan

.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

@@ -1,12 +1,14 @@
 import path from 'path'
 
 import cli from '../src/cli/main'
-import * as constants from '../src/cli/constants'
+import * as constants from '../src/constants'
 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,18 @@ 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(defaultConfigFixture)
+      })
+    })
   })
 
   describe('build', () => {

__tests__/cli.utils.test.js

@@ -1,10 +1,6 @@
-import path from 'path'
-
 import * as utils from '../src/cli/utils'
 
 describe('cli utils', () => {
-  const fixture = utils.readFile(path.resolve(__dirname, 'fixtures/cli-utils.js'))
-
   describe('parseCliParams', () => {
     it('parses CLI parameters', () => {
       const result = utils.parseCliParams(['a', 'b', '-c', 'd'])
@@ -60,53 +56,4 @@ describe('cli utils', () => {
       expect(result).toEqual({ test: ['c', 'd', 'h'] })
     })
   })
-
-  describe('stripBlockComments', () => {
-    it('does not strip code', () => {
-      const result = utils.stripBlockComments(fixture)
-
-      expect(result).toEqual(expect.stringContaining('__code_no_comment__'))
-      expect(result).toEqual(expect.stringContaining('__code_comment_line__'))
-      expect(result).toEqual(expect.stringContaining('__code_comment_block__'))
-      expect(result).toEqual(expect.stringContaining('__code_comment_line_important__'))
-      expect(result).toEqual(expect.stringContaining('__code_comment_block_important__'))
-    })
-
-    it('strips block comments', () => {
-      const result = utils.stripBlockComments(fixture)
-
-      expect(result).not.toEqual(expect.stringContaining('__comment_block__'))
-      expect(result).not.toEqual(expect.stringContaining('__comment_block_multiline__'))
-      expect(result).not.toEqual(expect.stringContaining('__comment_block_code__'))
-    })
-
-    it('strips docblock comments', () => {
-      const result = utils.stripBlockComments(fixture)
-
-      expect(result).not.toEqual(expect.stringContaining('__comment_docblock__'))
-    })
-
-    it('does not strip line comments', () => {
-      const result = utils.stripBlockComments(fixture)
-
-      expect(result).toEqual(expect.stringContaining('__comment_line__'))
-      expect(result).toEqual(expect.stringContaining('__comment_line_important__'))
-      expect(result).toEqual(expect.stringContaining('__comment_line_code__'))
-      expect(result).toEqual(expect.stringContaining('__comment_line_important_code__'))
-    })
-
-    it('does not strip important block comments', () => {
-      const result = utils.stripBlockComments(fixture)
-
-      expect(result).toEqual(expect.stringContaining('__comment_block_important__'))
-      expect(result).toEqual(expect.stringContaining('__comment_block_multiline_important__'))
-      expect(result).toEqual(expect.stringContaining('__comment_block_important_code__'))
-    })
-
-    it('does not strip important docblock comments', () => {
-      const result = utils.stripBlockComments(fixture)
-
-      expect(result).toEqual(expect.stringContaining('__comment_docblock_important__'))
-    })
-  })
 })

__tests__/customConfig.test.js

@@ -3,6 +3,7 @@ import path from 'path'
 import rimraf from 'rimraf'
 import postcss from 'postcss'
 import tailwind from '../src/index'
+import { defaultConfigFile } from '../src/constants'
 
 function inTempDirectory(callback) {
   return new Promise(resolve => {
@@ -82,7 +83,7 @@ test('custom config can be passed as an object', () => {
 test('tailwind.config.js is picked up by default', () => {
   return inTempDirectory(() => {
     fs.writeFileSync(
-      path.resolve('./tailwind.config.js'),
+      path.resolve(defaultConfigFile),
       `module.exports = {
         theme: {
           screens: {

__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__/fixtures/cli-utils.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__/responsiveAtRule.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__/sanity.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, {

__tests__/variantsAtRule.test.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)