Skip to content

Commit 0b34db5

Browse files
committed
Revert "Automatically add featureFlags.future flags to the configuration files whenever the init command is ran (#2379)"
This reverts commit f72158c.
1 parent d367ca2 commit 0b34db5

File tree

4 files changed

+16
-30
lines changed

4 files changed

+16
-30
lines changed

__tests__/cli.test.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import cli from '../src/cli/main'
44
import * as constants from '../src/constants'
55
import * as utils from '../src/cli/utils'
66
import runInTempDirectory from '../jest/runInTempDirectory'
7-
import featureFlags from '../src/featureFlags'
87

98
describe('cli', () => {
109
const inputCssPath = path.resolve(__dirname, 'fixtures/tailwind-input.css')
1110
const customConfigPath = path.resolve(__dirname, 'fixtures/custom-config.js')
11+
const defaultConfigFixture = utils.readFile(constants.defaultConfigStubFile)
12+
const simpleConfigFixture = utils.readFile(constants.simpleConfigStubFile)
1213
const defaultPostCssConfigFixture = utils.readFile(constants.defaultPostCssConfigStubFile)
1314

1415
beforeEach(() => {
@@ -20,15 +21,15 @@ describe('cli', () => {
2021
it('creates a Tailwind config file', () => {
2122
return runInTempDirectory(() => {
2223
return cli(['init']).then(() => {
23-
expect(utils.exists(constants.defaultConfigFile)).toEqual(true)
24+
expect(utils.readFile(constants.defaultConfigFile)).toEqual(simpleConfigFixture)
2425
})
2526
})
2627
})
2728

2829
it('creates a Tailwind config file and a postcss.config.js file', () => {
2930
return runInTempDirectory(() => {
3031
return cli(['init', '-p']).then(() => {
31-
expect(utils.exists(constants.defaultConfigFile)).toEqual(true)
32+
expect(utils.readFile(constants.defaultConfigFile)).toEqual(simpleConfigFixture)
3233
expect(utils.readFile(constants.defaultPostCssConfigFile)).toEqual(
3334
defaultPostCssConfigFixture
3435
)
@@ -39,7 +40,7 @@ describe('cli', () => {
3940
it('creates a full Tailwind config file', () => {
4041
return runInTempDirectory(() => {
4142
return cli(['init', '--full']).then(() => {
42-
expect(utils.exists(constants.defaultConfigFile)).toEqual(true)
43+
expect(utils.readFile(constants.defaultConfigFile)).toEqual(defaultConfigFixture)
4344
})
4445
})
4546
})
@@ -93,15 +94,5 @@ describe('cli', () => {
9394
expect(process.stdout.write.mock.calls[0][0]).not.toContain('-ms-input-placeholder')
9495
})
9596
})
96-
97-
it('creates a Tailwind config file with future flags', () => {
98-
return runInTempDirectory(() => {
99-
return cli(['init']).then(() => {
100-
featureFlags.future.forEach(flag => {
101-
expect(utils.readFile(constants.defaultConfigFile)).toContain(`${flag}: true`)
102-
})
103-
})
104-
})
105-
})
10697
})
10798
})

src/cli/commands/init.js

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,15 @@ export function run(cliParams, cliOptions) {
3535
return new Promise(resolve => {
3636
utils.header()
3737

38+
const full = cliOptions.full
3839
const file = cliParams[0] || constants.defaultConfigFile
3940
const simplePath = utils.getSimplePath(file)
4041

4142
utils.exists(file) && utils.die(colors.file(simplePath), 'already exists.')
4243

43-
const stubFile = cliOptions.full
44-
? constants.defaultConfigStubFile
45-
: constants.simpleConfigStubFile
44+
const stubFile = full ? constants.defaultConfigStubFile : constants.simpleConfigStubFile
4645

47-
const config = require(stubFile)
48-
const { future: flags } = require('../../featureFlags').default
49-
50-
flags.forEach(flag => {
51-
config.future[`// ${flag}`] = true
52-
})
53-
54-
utils.writeFile(
55-
file,
56-
`module.exports = ${JSON.stringify(config, null, 2).replace(/"([^-_\d"]+)":/g, '$1:')}\n`
57-
)
46+
utils.copyFile(stubFile, file)
5847

5948
utils.log()
6049
utils.log(emoji.yes, 'Created Tailwind config file:', colors.file(simplePath))

stubs/defaultConfig.stub.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
module.exports = {
2-
future: {},
2+
future: {
3+
// removeDeprecatedGapUtilities: true,
4+
// purgeLayersByDefault: true,
5+
},
36
purge: [],
47
target: 'relaxed',
58
prefix: '',

stubs/simpleConfig.stub.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
module.exports = {
2-
future: {},
2+
future: {
3+
// removeDeprecatedGapUtilities: true,
4+
// purgeLayersByDefault: true,
5+
},
36
purge: [],
47
theme: {
58
extend: {},

0 commit comments

Comments
 (0)