Revert "Automatically add featureFlags.future flags to the configur…

…ation files whenever the `init` command is ran (#2379)" This reverts commit f72158c.
tailwindlabs · Oct 16, 2020 · 0b34db5 · 0b34db5
1 parent d367ca2
commit 0b34db5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 30 deletions.
diff --git a/__tests__/cli.test.js b/__tests__/cli.test.js
@@ -4,11 +4,12 @@ import cli from '../src/cli/main'
 import * as constants from '../src/constants'
 import * as utils from '../src/cli/utils'
 import runInTempDirectory from '../jest/runInTempDirectory'
-import featureFlags from '../src/featureFlags'
 
 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)
   const defaultPostCssConfigFixture = utils.readFile(constants.defaultPostCssConfigStubFile)
 
   beforeEach(() => {
@@ -20,15 +21,15 @@ describe('cli', () => {
     it('creates a Tailwind config file', () => {
       return runInTempDirectory(() => {
         return cli(['init']).then(() => {
-          expect(utils.exists(constants.defaultConfigFile)).toEqual(true)
+          expect(utils.readFile(constants.defaultConfigFile)).toEqual(simpleConfigFixture)
         })
       })
     })
 
     it('creates a Tailwind config file and a postcss.config.js file', () => {
       return runInTempDirectory(() => {
         return cli(['init', '-p']).then(() => {
-          expect(utils.exists(constants.defaultConfigFile)).toEqual(true)
+          expect(utils.readFile(constants.defaultConfigFile)).toEqual(simpleConfigFixture)
           expect(utils.readFile(constants.defaultPostCssConfigFile)).toEqual(
             defaultPostCssConfigFixture
           )
@@ -39,7 +40,7 @@ describe('cli', () => {
     it('creates a full Tailwind config file', () => {
       return runInTempDirectory(() => {
         return cli(['init', '--full']).then(() => {
-          expect(utils.exists(constants.defaultConfigFile)).toEqual(true)
+          expect(utils.readFile(constants.defaultConfigFile)).toEqual(defaultConfigFixture)
         })
       })
     })
@@ -93,15 +94,5 @@ describe('cli', () => {
         expect(process.stdout.write.mock.calls[0][0]).not.toContain('-ms-input-placeholder')
       })
     })
-
-    it('creates a Tailwind config file with future flags', () => {
-      return runInTempDirectory(() => {
-        return cli(['init']).then(() => {
-          featureFlags.future.forEach(flag => {
-            expect(utils.readFile(constants.defaultConfigFile)).toContain(`${flag}: true`)
-          })
-        })
-      })
-    })
   })
 })
diff --git a/src/cli/commands/init.js b/src/cli/commands/init.js
@@ -35,26 +35,15 @@ export function run(cliParams, cliOptions) {
   return new Promise(resolve => {
     utils.header()
 
+    const full = cliOptions.full
     const file = cliParams[0] || constants.defaultConfigFile
     const simplePath = utils.getSimplePath(file)
 
     utils.exists(file) && utils.die(colors.file(simplePath), 'already exists.')
 
-    const stubFile = cliOptions.full
-      ? constants.defaultConfigStubFile
-      : constants.simpleConfigStubFile
+    const stubFile = full ? constants.defaultConfigStubFile : constants.simpleConfigStubFile
 
-    const config = require(stubFile)
-    const { future: flags } = require('../../featureFlags').default
-
-    flags.forEach(flag => {
-      config.future[`// ${flag}`] = true
-    })
-
-    utils.writeFile(
-      file,
-      `module.exports = ${JSON.stringify(config, null, 2).replace(/"([^-_\d"]+)":/g, '$1:')}\n`
-    )
+    utils.copyFile(stubFile, file)
 
     utils.log()
     utils.log(emoji.yes, 'Created Tailwind config file:', colors.file(simplePath))

diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js
@@ -1,5 +1,8 @@
 module.exports = {
-  future: {},
+  future: {
+    // removeDeprecatedGapUtilities: true,
+    // purgeLayersByDefault: true,
+  },
   purge: [],
   target: 'relaxed',
   prefix: '',

diff --git a/stubs/simpleConfig.stub.js b/stubs/simpleConfig.stub.js
@@ -1,5 +1,8 @@
 module.exports = {
-  future: {},
+  future: {
+    // removeDeprecatedGapUtilities: true,
+    // purgeLayersByDefault: true,
+  },
   purge: [],
   theme: {
     extend: {},