From 7ec4b11d73500d770a9fa739738182f00dfb4d12 Mon Sep 17 00:00:00 2001 From: Matt Stypa Date: Thu, 14 Mar 2019 20:24:31 -0500 Subject: [PATCH] Ripped out the code no longer needed --- __tests__/cli.test.js | 4 +- __tests__/cli.utils.test.js | 26 ------------ defaultConfig.stub.js | 79 ------------------------------------- package.json | 3 -- src/cli/commands/init.js | 1 - src/cli/constants.js | 4 -- src/cli/utils.js | 14 ------- 7 files changed, 1 insertion(+), 130 deletions(-) delete mode 100644 defaultConfig.stub.js diff --git a/__tests__/cli.test.js b/__tests__/cli.test.js index fd6f3d626..5f9bf3b4b 100644 --- a/__tests__/cli.test.js +++ b/__tests__/cli.test.js @@ -43,9 +43,7 @@ describe('cli', () => { 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) - ) + expect(utils.writeFile.mock.calls[0][1]).toEqual(defaultConfigFixture) }) }) }) diff --git a/__tests__/cli.utils.test.js b/__tests__/cli.utils.test.js index a15f51b3e..594b86e6e 100644 --- a/__tests__/cli.utils.test.js +++ b/__tests__/cli.utils.test.js @@ -109,30 +109,4 @@ 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') - }) - }) }) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js deleted file mode 100644 index 48104ae6c..000000000 --- a/defaultConfig.stub.js +++ /dev/null @@ -1,79 +0,0 @@ -const defaultTheme = require('./defaultTheme')() - -module.exports = { - prefix: '', - important: false, - separator: ':', - theme: defaultTheme, - variants: { - appearance: ['responsive'], - backgroundAttachment: ['responsive'], - backgroundColor: ['responsive', 'hover', 'focus'], - backgroundPosition: ['responsive'], - backgroundRepeat: ['responsive'], - backgroundSize: ['responsive'], - borderCollapse: [], - borderColor: ['responsive', 'hover', 'focus'], - borderRadius: ['responsive'], - borderStyle: ['responsive'], - borderWidth: ['responsive'], - cursor: ['responsive'], - display: ['responsive'], - flexDirection: ['responsive'], - flexWrap: ['responsive'], - alignItems: ['responsive'], - alignSelf: ['responsive'], - justifyContent: ['responsive'], - alignContent: ['responsive'], - flex: ['responsive'], - flexGrow: ['responsive'], - flexShrink: ['responsive'], - float: ['responsive'], - fontFamily: ['responsive'], - fontWeight: ['responsive', 'hover', 'focus'], - height: ['responsive'], - lineHeight: ['responsive'], - listStyle: ['responsive'], - margin: ['responsive'], - maxHeight: ['responsive'], - maxWidth: ['responsive'], - minHeight: ['responsive'], - minWidth: ['responsive'], - negativeMargin: ['responsive'], - objectFit: ['responsive'], - objectPosition: ['responsive'], - opacity: ['responsive'], - outline: ['focus'], - overflow: ['responsive'], - padding: ['responsive'], - pointerEvents: ['responsive'], - position: ['responsive'], - resize: ['responsive'], - boxShadow: ['responsive', 'hover', 'focus'], - fill: [], - stroke: [], - tableLayout: ['responsive'], - textAlign: ['responsive'], - textColor: ['responsive', 'hover', 'focus'], - fontSize: ['responsive'], - fontStyle: ['responsive'], - textTransform: ['responsive'], - textDecoration: ['responsive', 'hover', 'focus'], - fontSmoothing: ['responsive'], - letterSpacing: ['responsive'], - userSelect: ['responsive'], - verticalAlign: ['responsive'], - visibility: ['responsive'], - whitespace: ['responsive'], - width: ['responsive'], - zIndex: ['responsive'], - }, - corePlugins: { - }, - plugins: [ - require('./plugins/container')({ - // center: true, - // padding: '1rem', - }), - ], -} diff --git a/package.json b/package.json index 115c92b18..ed4f6896b 100644 --- a/package.json +++ b/package.json @@ -71,9 +71,6 @@ ] }, "jest": { - "moduleNameMapper": { - "lib/plugins/container": "/src/plugins/container" - }, "setupFilesAfterEnv": [ "/jest/customMatchers.js" ], diff --git a/src/cli/commands/init.js b/src/cli/commands/init.js index 270e447f7..67cc679af 100644 --- a/src/cli/commands/init.js +++ b/src/cli/commands/init.js @@ -44,7 +44,6 @@ export function run(cliParams, cliOptions) { const stubFile = full ? constants.defaultConfigStubFile : constants.simpleConfigStubFile let stub = utils.readFile(stubFile) - stub = utils.replaceAll(stub, constants.replacements) noComments && (stub = utils.stripBlockComments(stub)) utils.writeFile(file, stub) diff --git a/src/cli/constants.js b/src/cli/constants.js index 76a27981a..f1b7da863 100644 --- a/src/cli/constants.js +++ b/src/cli/constants.js @@ -4,7 +4,3 @@ export const cli = 'tailwind' export const defaultConfigFile = 'tailwind.js' export const defaultConfigStubFile = path.resolve(__dirname, '../../stubs/defaultConfig.stub.js') export const simpleConfigStubFile = path.resolve(__dirname, '../../stubs/simpleConfig.stub.js') - -export const replacements = [ - ["require('../plugins/container')", "require('tailwindcss/plugins/container')"], -] diff --git a/src/cli/utils.js b/src/cli/utils.js index b04149ca0..ff9eec491 100644 --- a/src/cli/utils.js +++ b/src/cli/utils.js @@ -136,17 +136,3 @@ export function stripBlockComments(input) { .trim() .concat('\n') } - -/** - * Performs string replacement for multiple patterns. - * - * @param {string} input - * @param {array} replacements - * @return {string} - */ -export function replaceAll(input, replacements) { - return replacements.reduce( - (str, [pattern, replacement]) => str.split(pattern).join(replacement), - input - ) -}