Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed pathing to use build rather than build/rollup

Browse Source
This commit is contained in:
Dominic Gannaway
2017-03-23 16:46:04 +00:00
parent dd0ae1a233
commit 47e805711d
20 changed files with 65 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fixtures/packaging/browserify/dev/package.json
+1 -1
View File
@@ -5,6 +5,6 @@
"browserify": "^13.3.0"
},
"scripts": {
"build": "rm -f output.js && NODE_PATH=../../../../build/rollup/packages browserify ./input.js -o output.js"
"build": "rm -f output.js && NODE_PATH=../../../../build/packages browserify ./input.js -o output.js"
}
}
fixtures/packaging/browserify/prod/package.json
+1 -1
View File
@@ -5,7 +5,7 @@
"browserify": "^13.3.0"
},
"scripts": {
"build": "rm -f output.js && NODE_PATH=../../../../build/rollup/packages browserify ./input.js -g [envify --NODE_ENV 'production'] -o output.js"
"build": "rm -f output.js && NODE_PATH=../../../../build/packages browserify ./input.js -g [envify --NODE_ENV 'production'] -o output.js"
},
"devDependencies": {
"envify": "^4.0.0"
fixtures/packaging/brunch/dev/package.json
+1 -1
View File
@@ -5,6 +5,6 @@
"javascript-brunch": "^2.0.0"
},
"scripts": {
"build": "rm -rf public && ln -fs ../../../../../build/rollup/packages/react node_modules/react && ln -fs ../../../../../build/rollup/packages/react-dom node_modules/react-dom && brunch build"
"build": "rm -rf public && ln -fs ../../../../../build/packages/react node_modules/react && ln -fs ../../../../../build/packages/react-dom node_modules/react-dom && brunch build"
}
}
fixtures/packaging/brunch/prod/package.json
+1 -1
View File
@@ -5,6 +5,6 @@
"javascript-brunch": "^2.0.0"
},
"scripts": {
"build": "rm -rf public && ln -fs ../../../../../build/rollup/packages/react node_modules/react && ln -fs ../../../../../build/rollup/packages/react-dom node_modules/react-dom && brunch build -p"
"build": "rm -rf public && ln -fs ../../../../../build/packages/react node_modules/react && ln -fs ../../../../../build/packages/react-dom node_modules/react-dom && brunch build -p"
}
}
fixtures/packaging/globals/dev.html
+2 -2
View File
@@ -1,7 +1,7 @@
<html>
<body>
<script src="../../../build/rollup/dist/react.dev.js"></script>
<script src="../../../build/rollup/dist/react-dom.dev.js"></script>
<script src="../../../build/dist/react.dev.js"></script>
<script src="../../../build/dist/react-dom.dev.js"></script>
<div id="container"></div>
<script>
ReactDOM.render(
fixtures/packaging/globals/prod.html
+2 -2
View File
@@ -1,7 +1,7 @@
<html>
<body>
<script src="../../../build/rollup/dist/react.prod.min.js"></script>
<script src="../../../build/rollup/dist/react-dom.prod.min.js"></script>
<script src="../../../build/dist/react.prod.min.js"></script>
<script src="../../../build/dist/react-dom.prod.min.js"></script>
<div id="container"></div>
<script>
ReactDOM.render(
fixtures/packaging/requirejs/dev.html
+2 -2
View File
@@ -5,8 +5,8 @@
<script>
requirejs.config({
paths: {
react: '../../../build/rollup/dist/react.dev',
'react-dom': '../../../build/rollup/dist/react-dom.dev'
react: '../../../build/dist/react.dev',
'react-dom': '../../../build/dist/react-dom.dev'
}
});
fixtures/packaging/requirejs/prod.html
+2 -2
View File
@@ -5,8 +5,8 @@
<script>
requirejs.config({
paths: {
react: '../../../build/rollup/dist/react.prod.min',
'react-dom': '../../../build/rollup/dist/react-dom.prod.min'
react: '../../../build/dist/react.prod.min',
'react-dom': '../../../build/dist/react-dom.prod.min'
}
});
fixtures/packaging/rjs/dev/config.js
+2 -2
View File
@@ -4,7 +4,7 @@ module.exports = {
out: 'output.js',
optimize: 'none',
paths: {
react: '../../../../build/rollup/dist/react.dev',
'react-dom': '../../../../build/rollup/dist/react-dom.dev',
react: '../../../../build/dist/react.dev',
'react-dom': '../../../../build/dist/react-dom.dev',
},
};
fixtures/packaging/rjs/prod/config.js
+2 -2
View File
@@ -4,7 +4,7 @@ module.exports = {
out: 'output.js',
optimize: 'none',
paths: {
react: '../../../../build/rollup/dist/react.prod.min',
'react-dom': '../../../../build/rollup/dist/react-dom.prod.min',
react: '../../../../build/dist/react.prod.min',
'react-dom': '../../../../build/dist/react-dom.prod.min',
},
};
fixtures/packaging/systemjs-builder/dev/config.js
+2 -2
View File
@@ -1,6 +1,6 @@
System.config({
paths: {
react: '../../../../build/rollup/dist/react.dev.js',
'react-dom': '../../../../build/rollup/dist/react-dom.dev.js',
react: '../../../../build/dist/react.dev.js',
'react-dom': '../../../../build/dist/react-dom.dev.js',
},
});
fixtures/packaging/systemjs-builder/prod/config.js
+2 -2
View File
@@ -1,6 +1,6 @@
System.config({
paths: {
react: '../../../../build/rollup/dist/react.prod.min.js',
'react-dom': '../../../../build/rollup/dist/react-dom.prod.min.js',
react: '../../../../build/dist/react.prod.min.js',
'react-dom': '../../../../build/dist/react-dom.prod.min.js',
},
});
fixtures/packaging/systemjs/dev.html
+2 -2
View File
@@ -5,8 +5,8 @@
<script>
System.config({
paths: {
react: '../../../build/rollup/dist/react.dev.js',
'react-dom': '../../../build/rollup/dist/react-dom.dev.js'
react: '../../../build/dist/react.dev.js',
'react-dom': '../../../build/dist/react-dom.dev.js'
}
});
fixtures/packaging/systemjs/prod.html
+2 -2
View File
@@ -5,8 +5,8 @@
<script>
System.config({
paths: {
react: '../../../build/rollup/dist/react.prod.min.js',
'react-dom': '../../../build/rollup/dist/react-dom.prod.min.js'
react: '../../../build/dist/react.prod.min.js',
'react-dom': '../../../build/dist/react-dom.prod.min.js'
}
});
fixtures/packaging/webpack-alias/dev/config.js
+3 -3
View File
@@ -6,10 +6,10 @@ module.exports = {
filename: 'output.js',
},
resolve: {
root: path.resolve('../../../../build/rollup/packages'),
root: path.resolve('../../../../build/packages'),
alias: {
'react': 'react/react.dev',
'react-dom': 'react-dom/react-dom.dev',
'react': 'react/dist/react.dev',
'react-dom': 'react-dom/dist/react-dom.dev',
},
},
};
fixtures/packaging/webpack-alias/prod/config.js
+3 -3
View File
@@ -6,10 +6,10 @@ module.exports = {
filename: 'output.js',
},
resolve: {
root: path.resolve('../../../../build/rollup/packages'),
root: path.resolve('../../../../build/packages'),
alias: {
'react': 'react/react.prod.min',
'react-dom': 'react-dom/react-dom.prod.min',
'react': 'react/dist/react.prod.min',
'react-dom': 'react-dom/dist/react-dom.prod.min',
},
},
};
fixtures/packaging/webpack/dev/config.js
+1 -1
View File
@@ -6,6 +6,6 @@ module.exports = {
filename: 'output.js',
},
resolve: {
root: path.resolve('../../../../build/rollup/packages/'),
root: path.resolve('../../../../build/packages/'),
},
};
fixtures/packaging/webpack/prod/config.js
+1 -1
View File
@@ -7,7 +7,7 @@ module.exports = {
filename: 'output.js',
},
resolve: {
root: path.resolve('../../../../build/rollup/packages/'),
root: path.resolve('../../../../build/packages/'),
},
plugins: [
new webpack.DefinePlugin({
scripts/rollup/build.js
+24 -16
View File
@@ -196,7 +196,7 @@ function getCommonJsConfig(bundleType) {
function copyNodePackageTemplate(packageName) {
const from = resolve(`./packages/${packageName}`);
const to = resolve(`./build/rollup/packages/${packageName}`);
const to = resolve(`./build/packages/${packageName}`);
// if the package directory already exists, we skip copying to it
if (!existsSync(to) && existsSync(from)) {
@@ -214,15 +214,23 @@ function copyNodePackageTemplate(packageName) {
}
function copyBundleIntoNodePackage(packageName, filename, bundleType) {
let from = resolve(`./build/rollup/${filename}`);
if (bundleType === bundleTypes.UMD_DEV || bundleType === bundleTypes.UMD_PROD) {
from = resolve(`./build/rollup/dist/${filename}`);
}
const packageDirectory = resolve(`./build/rollup/packages/${packageName}`);
const to = `${packageDirectory}/${filename}`;
const packageDirectory = resolve(`./build/packages/${packageName}`);
if (existsSync(packageDirectory)) {
if (existsSync(packageDirectory)) {
let from = resolve(`./build/${filename}`);
let to = `${packageDirectory}/${filename}`;
// for UMD bundles we have to move the files into a dist directory
// within the package directory. we also need to set the from
// to be the root build from directory
if (bundleType === bundleTypes.UMD_DEV || bundleType === bundleTypes.UMD_PROD) {
const distDirectory = `${packageDirectory}/dist`;
// create a dist directory if not created
if (!existsSync(distDirectory)) {
mkdirSync(distDirectory);
}
from = resolve(`./build/dist/${filename}`);
to = `${packageDirectory}/dist/${filename}`;
}
return new Promise((res, rej) => {
ncp(from, to, error => {
if (error) {
@@ -328,16 +336,16 @@ function createBundle({
});
}
// clear the build folder
rimraf(join('build', 'rollup'), async () => {
// TODO: this line can go away once we remove rollup folder
mkdirSync(resolve(`./build/rollup`));
// clear the build directory
rimraf('./build', async () => {
// create a new build directory
mkdirSync(resolve('build'));
// create the packages folder for NODE+UMD bundles
mkdirSync(resolve(`./build/rollup/packages/`));
mkdirSync(resolve(join('build', 'packages')));
// create the dist folder for UMD bundles
mkdirSync(resolve(`./build/rollup/dist/`));
mkdirSync(resolve(join('build', 'dist')));
// create the facebookWWW folder for FB bundles
mkdirSync(resolve(`./build/rollup/${facebookWWW}/`));
mkdirSync(resolve(join('build', facebookWWW)));
// rather than run concurently, opt to run them serially
// this helps improve console/warning/error output
scripts/rollup/bundles.js
+9 -9
View File
@@ -31,7 +31,7 @@ const bundles = [
babelOpts: babelOptsReact,
bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB],
config: {
destDir: 'build/rollup/',
destDir: 'build/',
moduleName: 'React',
sourceMap: false,
},
@@ -59,7 +59,7 @@ const bundles = [
babelOpts: babelOptsReact,
bundleTypes: [FB],
config: {
destDir: 'build/rollup/',
destDir: 'build/',
globals: {
'react': 'React',
},
@@ -87,7 +87,7 @@ const bundles = [
babelOpts: babelOptsReact,
bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB],
config: {
destDir: 'build/rollup/',
destDir: 'build/',
globals: {
'react': 'React',
},
@@ -116,7 +116,7 @@ const bundles = [
// TODO: deal with the Node version of react-dom-server package
bundleTypes: [UMD_DEV, UMD_PROD, FB],
config: {
destDir: 'build/rollup/',
destDir: 'build/',
globals: {
'react': 'React',
},
@@ -150,7 +150,7 @@ const bundles = [
// builds sync up to the building of the package directories
bundleTypes: [FB],
config: {
destDir: 'build/rollup/',
destDir: 'build/',
globals: {
'react': 'React',
},
@@ -184,7 +184,7 @@ const bundles = [
// builds sync up to the building of the package directories
bundleTypes: [UMD_DEV, UMD_PROD, FB],
config: {
destDir: 'build/rollup/',
destDir: 'build/',
globals: {
'react': 'React',
},
@@ -217,7 +217,7 @@ const bundles = [
babelOpts: babelOptsReact,
bundleTypes: [RN],
config: {
destDir: 'build/rollup/',
destDir: 'build/',
moduleName: 'ReactNative',
sourceMap: false,
},
@@ -248,7 +248,7 @@ const bundles = [
babelOpts: babelOptsReact,
bundleTypes: [NODE_DEV, FB],
config: {
destDir: 'build/rollup/',
destDir: 'build/',
moduleName: 'ReactTestRenderer',
sourceMap: false,
},
@@ -272,7 +272,7 @@ const bundles = [
babelOpts: babelOptsReact,
bundleTypes: [FB],
config: {
destDir: 'build/rollup/',
destDir: 'build/',
moduleName: 'ReactTestRenderer',
sourceMap: false,
},