diff --git a/tools/amd/bower.json b/tools/amd/bower.json index 0e3451d5c4..5c56aa2f4d 100644 --- a/tools/amd/bower.json +++ b/tools/amd/bower.json @@ -16,7 +16,6 @@ "**/.*" ], "dependencies": { - "react": ">= 0.13.0", - "classnames": "^2.0.0" + "react": ">= 0.13.0" } } diff --git a/tools/amd/build.js b/tools/amd/build.js index ae47031c22..70f87c72e0 100644 --- a/tools/amd/build.js +++ b/tools/amd/build.js @@ -3,9 +3,7 @@ import path from 'path'; import fsp from 'fs-promise'; import { copy } from '../fs-utils'; import { exec } from '../exec'; -import generateFactories from '../generateFactories'; -import { repoRoot, srcRoot, bowerRoot } from '../constants'; -import { buildFolder } from '../buildBabel'; +import { repoRoot, bowerRoot } from '../constants'; const packagePath = path.join(repoRoot, 'package.json'); const bowerTemplate = path.join(__dirname, 'bower.json'); @@ -14,14 +12,6 @@ const bowerJson = path.join(bowerRoot, 'bower.json'); const readme = path.join(__dirname, 'README.md'); const license = path.join(repoRoot, 'LICENSE'); -const babelOptions = { - __reactBootstrapDeprecationWarning: true, - modules: 'amd' -}; - -const libDestination = path.join(bowerRoot, 'lib'); -const factoriesDestination = path.join(libDestination, 'factories'); - function bowerConfig() { return Promise.all([ fsp.readFile(packagePath) @@ -37,11 +27,9 @@ export default function BuildBower() { console.log('Building: '.cyan + 'bower module'.green); return exec(`rimraf ${bowerRoot}`) - .then(() => fsp.mkdirs(factoriesDestination)) + .then(() => fsp.mkdirs(bowerRoot)) .then(() => Promise.all([ bowerConfig(), - generateFactories(factoriesDestination, babelOptions), - buildFolder(srcRoot, libDestination, babelOptions), copy(readme, bowerRoot), copy(license, bowerRoot) ])) diff --git a/tools/buildBabel.js b/tools/buildBabel.js index 7811d21bb4..e2ef5c66e2 100644 --- a/tools/buildBabel.js +++ b/tools/buildBabel.js @@ -12,13 +12,7 @@ export function buildContent(content, filename, destination, babelOptions={}) { } export function buildFile(filename, destination, babelOptions={}) { - let content = fs.readFileSync(filename, {encoding: 'utf8'}); - if (babelOptions.__reactBootstrapDeprecationWarning) { - content = `console.warn('This file is deprecated, and will be removed in v0.24.0. Use react-bootstrap.js or react-bootstrap.min.js instead.'); -console.warn('You can read more about it at https://github.com/react-bootstrap/react-bootstrap/issues/693'); -${content}`; - } - + const content = fs.readFileSync(filename, {encoding: 'utf8'}); if(babelUtil.canCompile(filename)) { // Get file basename without the extension (in case not .js) let outputName = path.basename(filename, path.extname(filename));