Skip to content

Commit

Permalink
Update fixtures to use the folder convention of build-combined
Browse files Browse the repository at this point in the history
  • Loading branch information
sebmarkbage committed Feb 17, 2023
1 parent 8a76bfd commit bdc966a
Show file tree
Hide file tree
Showing 38 changed files with 74 additions and 73 deletions.
6 changes: 3 additions & 3 deletions fixtures/art/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"@babel/preset-env": "^7.10.4",
"@babel/preset-react": "^7.10.4",
"babel-loader": "^8.1.0",
"react": "link:../../build/node_modules/react",
"react-art": "link:../../build/node_modules/react-art/",
"react-dom": "link:../../build/node_modules/react-dom",
"react": "link:../../build/oss-experimental/react",
"react-art": "link:../../build/oss-experimental/react-art/",
"react-dom": "link:../../build/oss-experimental/react-dom",
"webpack": "^1.14.0"
},
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions fixtures/art/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2251,15 +2251,15 @@ rc@^1.1.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

"react-art@link:../../build/node_modules/react-art":
"react-art@link:../../build/oss-experimental/react-art":
version "0.0.0"
uid ""

"react-dom@link:../../build/node_modules/react-dom":
"react-dom@link:../../build/oss-experimental/react-dom":
version "0.0.0"
uid ""

"react@link:../../build/node_modules/react":
"react@link:../../build/oss-experimental/react":
version "0.0.0"
uid ""

Expand Down
2 changes: 1 addition & 1 deletion fixtures/attribute-behavior/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"scripts": {
"prestart":
"cp ../../build/node_modules/react/umd/react.development.js public/ && cp ../../build/node_modules/react-dom/umd/react-dom.development.js public/ && cp ../../build/node_modules/react-dom/umd/react-dom-server-legacy.browser.development.js public/",
"cp ../../build/oss-experimental/react/umd/react.development.js public/ && cp ../../build/oss-experimental/react-dom/umd/react-dom.development.js public/ && cp ../../build/oss-experimental/react-dom/umd/react-dom-server-legacy.browser.development.js public/",
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
Expand Down
2 changes: 1 addition & 1 deletion fixtures/concurrent/time-slicing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"victory": "^0.25.6"
},
"scripts": {
"copy-source": "cp -r ../../../build/node_modules/* ./node_modules/",
"copy-source": "cp -r ../../../build/oss-experimental/* ./node_modules/",
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
Expand Down
2 changes: 1 addition & 1 deletion fixtures/devtools/scheduling-profiler/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const DEPENDENCIES = [
['react-dom/umd/react-dom.development.js', 'react-dom.js'],
];

const BUILD_DIRECTORY = '../../../build/node_modules/';
const BUILD_DIRECTORY = '../../../build/oss-experimental/';
const DEPENDENCIES_DIRECTORY = 'dependencies';

function initDependencies() {
Expand Down
2 changes: 1 addition & 1 deletion fixtures/eslint/proxy/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function reload() {
}
}
// Point to the built version.
build = require('../../../build/node_modules/eslint-plugin-react-hooks');
build = require('../../../build/oss-experimental/eslint-plugin-react-hooks');
}

let rules = {};
Expand Down
2 changes: 1 addition & 1 deletion fixtures/expiration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"scripts": {
"prestart":
"cp ../../build/node_modules/react/umd/react.development.js public/ && cp ../../build/node_modules/react-dom/umd/react-dom.development.js public/",
"cp ../../build/oss-experimental/react/umd/react.development.js public/ && cp ../../build/oss-experimental/react-dom/umd/react-dom.development.js public/",
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
Expand Down
4 changes: 2 additions & 2 deletions fixtures/fiber-triangle/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ <h1>Fiber Example</h1>
If you checked out the source from GitHub make sure to run <code>npm run build</code>.
</p>
</div>
<script src="../../build/node_modules/react/umd/react.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
<script src="../../build/oss-experimental/react/umd/react.development.js"></script>
<script src="../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
<script type="text/babel">
var dotStyle = {
Expand Down
6 changes: 3 additions & 3 deletions fixtures/fizz-ssr-browser/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ <h1>Fizz Example</h1>
If you checked out the source from GitHub make sure to run <code>npm run build</code>.
</p>
</div>
<script src="../../build/node_modules/react/umd/react.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script>
<script src="../../build/oss-experimental/react/umd/react.development.js"></script>
<script src="../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
<script src="../../build/oss-experimental/react-dom/umd/react-dom-server.browser.development.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
<script type="text/babel">
async function render() {
Expand Down
4 changes: 2 additions & 2 deletions fixtures/fizz/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"concurrently": "^5.3.0",
"express": "^4.17.1",
"nodemon": "^2.0.6",
"react": "link:../../build/node_modules/react",
"react-dom": "link:../../build/node_modules/react-dom",
"react": "link:../../build/oss-experimental/react",
"react-dom": "link:../../build/oss-experimental/react-dom",
"react-error-boundary": "^3.1.3",
"resolve": "1.12.0",
"rimraf": "^3.0.2",
Expand Down
4 changes: 2 additions & 2 deletions fixtures/fizz/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4083,7 +4083,7 @@ rc@^1.2.8:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

"react-dom@link:../../build/node_modules/react-dom":
"react-dom@link:../../build/oss-experimental/react-dom":
version "0.0.0"

react-error-boundary@^3.1.3:
Expand All @@ -4093,7 +4093,7 @@ react-error-boundary@^3.1.3:
dependencies:
"@babel/runtime" "^7.12.5"

"react@link:../../build/node_modules/react":
"react@link:../../build/oss-experimental/react":
version "0.0.0"

read-pkg@^4.0.1:
Expand Down
10 changes: 5 additions & 5 deletions fixtures/flight-browser/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ <h1>Flight Example</h1>
If you checked out the source from GitHub make sure to run <code>npm run build</code>.
</p>
</div>
<script src="../../build/node_modules/react/umd/react.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script>
<script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-server.browser.development.js"></script>
<script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-client.browser.development.js"></script>
<script src="../../build/oss-experimental/react/umd/react.development.js"></script>
<script src="../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
<script src="../../build/oss-experimental/react-dom/umd/react-dom-server.browser.development.js"></script>
<script src="../../build/oss-experimental/react-server-dom-webpack/umd/react-server-dom-webpack-server.browser.development.js"></script>
<script src="../../build/oss-experimental/react-server-dom-webpack/umd/react-server-dom-webpack-client.browser.development.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
<script type="text/babel">
let Suspense = React.Suspense;
Expand Down
4 changes: 2 additions & 2 deletions fixtures/flight/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
"workbox-webpack-plugin": "^6.4.1"
},
"scripts": {
"prestart": "cp -r ../../build/node_modules/* ./node_modules/",
"prebuild": "cp -r ../../build/node_modules/* ./node_modules/",
"prestart": "cp -r ../../build/oss-experimental/* ./node_modules/",
"prebuild": "cp -r ../../build/oss-experimental/* ./node_modules/",
"start": "concurrently \"npm run start:server\" \"npm run start:client\"",
"start:client": "NODE_ENV=development BUILD_PATH=dist node scripts/start.js",
"start:server": "NODE_ENV=development BUILD_PATH=dist nodemon -- --experimental-loader ./loader/index.js --conditions=react-server server",
Expand Down
4 changes: 2 additions & 2 deletions fixtures/packaging/babel-standalone/dev.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<body>
<script src="../../../build/node_modules/react/umd/react.development.js"></script>
<script src="../../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
<script src="../../../build/oss-experimental/react/umd/react.development.js"></script>
<script src="../../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
<div id="container"></div>
<script type="text/babel">
Expand Down
2 changes: 1 addition & 1 deletion fixtures/packaging/browserify/dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
},
"scripts": {
"build": "rm -f output.js && browserify ./input.js -o output.js",
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/"
"prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
}
}
2 changes: 1 addition & 1 deletion fixtures/packaging/browserify/prod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"scripts": {
"build": "rm -f output.js && browserify ./input.js -g [envify --NODE_ENV 'production'] -o output.js",
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/"
"prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
},
"devDependencies": {
"envify": "^4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/packaging/brunch/dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
},
"scripts": {
"build": "rm -rf public && brunch build",
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/"
"prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
}
}
2 changes: 1 addition & 1 deletion fixtures/packaging/brunch/prod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
},
"scripts": {
"build": "rm -rf public && brunch build -p",
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/"
"prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
}
}
4 changes: 2 additions & 2 deletions fixtures/packaging/globals/dev.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<body>
<script src="../../../build/node_modules/react/umd/react.development.js"></script>
<script src="../../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
<script src="../../../build/oss-experimental/react/umd/react.development.js"></script>
<script src="../../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
<div id="container"></div>
<script>
ReactDOM.render(
Expand Down
4 changes: 2 additions & 2 deletions fixtures/packaging/globals/prod.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<body>
<script src="../../../build/node_modules/react/umd/react.production.min.js"></script>
<script src="../../../build/node_modules/react-dom/umd/react-dom.production.min.js"></script>
<script src="../../../build/oss-experimental/react/umd/react.production.min.js"></script>
<script src="../../../build/oss-experimental/react-dom/umd/react-dom.production.min.js"></script>
<div id="container"></div>
<script>
ReactDOM.render(
Expand Down
4 changes: 2 additions & 2 deletions fixtures/packaging/requirejs/dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<script>
requirejs.config({
paths: {
react: '../../../build/node_modules/react/umd/react.development',
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.development'
react: '../../../build/oss-experimental/react/umd/react.development',
'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.development'
}
});

Expand Down
4 changes: 2 additions & 2 deletions fixtures/packaging/requirejs/prod.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<script>
requirejs.config({
paths: {
react: '../../../build/node_modules/react/umd/react.production.min',
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.production.min'
react: '../../../build/oss-experimental/react/umd/react.production.min',
'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.production.min'
}
});

Expand Down
6 changes: 3 additions & 3 deletions fixtures/packaging/rjs/dev/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ module.exports = {
out: 'output.js',
optimize: 'none',
paths: {
react: '../../../../build/node_modules/react/umd/react.development',
react: '../../../../build/oss-experimental/react/umd/react.development',
'react-dom':
'../../../../build/node_modules/react-dom/umd/react-dom.development',
'../../../../build/oss-experimental/react-dom/umd/react-dom.development',
schedule:
'../../../../build/node_modules/scheduler/umd/schedule.development',
'../../../../build/oss-experimental/scheduler/umd/schedule.development',
},
};
6 changes: 3 additions & 3 deletions fixtures/packaging/rjs/prod/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ module.exports = {
out: 'output.js',
optimize: 'none',
paths: {
react: '../../../../build/node_modules/react/umd/react.production.min',
react: '../../../../build/oss-experimental/react/umd/react.production.min',
'react-dom':
'../../../../build/node_modules/react-dom/umd/react-dom.production.min',
'../../../../build/oss-experimental/react-dom/umd/react-dom.production.min',
schedule:
'../../../../build/node_modules/scheduler/umd/schedule.development',
'../../../../build/oss-experimental/scheduler/umd/schedule.development',
},
};
6 changes: 3 additions & 3 deletions fixtures/packaging/systemjs-builder/dev/config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
System.config({
paths: {
react: '../../../../build/node_modules/react/umd/react.development.js',
react: '../../../../build/oss-experimental/react/umd/react.development.js',
'react-dom':
'../../../../build/node_modules/react-dom/umd/react-dom.development.js',
'../../../../build/oss-experimental/react-dom/umd/react-dom.development.js',
schedule:
'../../../../build/node_modules/scheduler/umd/schedule.development',
'../../../../build/oss-experimental/scheduler/umd/schedule.development',
},
});
7 changes: 4 additions & 3 deletions fixtures/packaging/systemjs-builder/prod/config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
System.config({
paths: {
react: '../../../../build/node_modules/react/umd/react.production.min.js',
react:
'../../../../build/oss-experimental/react/umd/react.production.min.js',
'react-dom':
'../../../../build/node_modules/react-dom/umd/react-dom.production.min.js',
'../../../../build/oss-experimental/react-dom/umd/react-dom.production.min.js',
schedule:
'../../../../build/node_modules/scheduler/umd/schedule.development',
'../../../../build/oss-experimental/scheduler/umd/schedule.development',
},
});
4 changes: 2 additions & 2 deletions fixtures/packaging/systemjs/dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<script>
System.config({
paths: {
react: '../../../build/node_modules/react/umd/react.development.js',
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.development.js'
react: '../../../build/oss-experimental/react/umd/react.development.js',
'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.development.js'
}
});

Expand Down
4 changes: 2 additions & 2 deletions fixtures/packaging/systemjs/prod.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<script>
System.config({
paths: {
react: '../../../build/node_modules/react/umd/react.production.min.js',
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.production.min.js'
react: '../../../build/oss-experimental/react/umd/react.production.min.js',
'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.production.min.js'
}
});

Expand Down
2 changes: 1 addition & 1 deletion fixtures/packaging/webpack-alias/dev/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
filename: 'output.js',
},
resolve: {
root: path.resolve('../../../../build/node_modules'),
root: path.resolve('../../../../build/oss-experimental'),
alias: {
react: 'react/umd/react.development',
'react-dom': 'react-dom/umd/react-dom.development',
Expand Down
2 changes: 1 addition & 1 deletion fixtures/packaging/webpack-alias/prod/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
filename: 'output.js',
},
resolve: {
root: path.resolve('../../../../build/node_modules'),
root: path.resolve('../../../../build/oss-experimental'),
alias: {
react: 'react/umd/react.production.min',
'react-dom': 'react-dom/umd/react-dom.production.min',
Expand Down
2 changes: 1 addition & 1 deletion fixtures/packaging/webpack/dev/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ module.exports = {
filename: 'output.js',
},
resolve: {
root: path.resolve('../../../../build/node_modules/'),
root: path.resolve('../../../../build/oss-experimental/'),
},
};
2 changes: 1 addition & 1 deletion fixtures/packaging/webpack/prod/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = {
filename: 'output.js',
},
resolve: {
root: path.resolve('../../../../build/node_modules/'),
root: path.resolve('../../../../build/oss-experimental/'),
},
plugins: [
new webpack.DefinePlugin({
Expand Down
4 changes: 2 additions & 2 deletions fixtures/scheduler/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ <h2>Tests:</h2>
</div>
</li>
</ol>
<script src="../../build/node_modules/react/umd/react.production.min.js"></script>
<script src="../../build/node_modules/scheduler/umd/scheduler.production.min.js"></script>
<script src="../../build/oss-experimental/react/umd/react.production.min.js"></script>
<script src="../../build/oss-experimental/scheduler/umd/scheduler.production.min.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
<script type="text/babel">
const {
Expand Down
4 changes: 2 additions & 2 deletions fixtures/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"ignore-styles": "^5.0.1",
"import-export": "^1.0.1",
"node-fetch": "^1.6.3",
"react": "link:../../build/node_modules/react",
"react-dom": "link:../../build/node_modules/react-dom"
"react": "link:../../build/oss-experimental/react",
"react-dom": "link:../../build/oss-experimental/react-dom"
},
"scripts": {
"start": "concurrently \"npm run start:server\" \"npm run start:client\"",
Expand Down
4 changes: 2 additions & 2 deletions fixtures/ssr/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5490,7 +5490,7 @@ react-dev-utils@^0.5.2:
sockjs-client "1.0.1"
strip-ansi "3.0.1"

"react-dom@link:../../build/node_modules/react-dom":
"react-dom@link:../../build/oss-experimental/react-dom":
version "0.0.0"

react-scripts@0.9.5:
Expand Down Expand Up @@ -5539,7 +5539,7 @@ react-scripts@0.9.5:
optionalDependencies:
fsevents "1.0.17"

"react@link:../../build/node_modules/react":
"react@link:../../build/oss-experimental/react":
version "0.0.0"

read-pkg-up@^1.0.1:
Expand Down
Loading

0 comments on commit bdc966a

Please sign in to comment.