diff --git a/bi-directional/app1/webpack.config.js b/bi-directional/app1/webpack.config.js index ab7c483d408..0a7e5345f27 100644 --- a/bi-directional/app1/webpack.config.js +++ b/bi-directional/app1/webpack.config.js @@ -17,6 +17,7 @@ module.exports = { { test: /\.jsx?$/, loader: "babel-loader", + exclude: /node_modules/, options: { presets: ["@babel/preset-react"], }, diff --git a/bi-directional/app2/webpack.config.js b/bi-directional/app2/webpack.config.js index 7c382870dcd..3aae00b7b66 100644 --- a/bi-directional/app2/webpack.config.js +++ b/bi-directional/app2/webpack.config.js @@ -20,6 +20,7 @@ module.exports = { { test: /\.jsx?$/, loader: "babel-loader", + exclude: /node_modules/, options: { presets: ["@babel/preset-react"], }, diff --git a/comprehensive-demo/app-01/webpack.config.js b/comprehensive-demo/app-01/webpack.config.js index 0b5c19ee77b..aa179fdd197 100644 --- a/comprehensive-demo/app-01/webpack.config.js +++ b/comprehensive-demo/app-01/webpack.config.js @@ -25,6 +25,7 @@ module.exports = { { test: /\.jsx?$/, loader: require.resolve("babel-loader"), + exclude: /node_modules/, options: { presets: [require.resolve("@babel/preset-react")], }, diff --git a/comprehensive-demo/app-02/webpack.config.js b/comprehensive-demo/app-02/webpack.config.js index 9e5a70a9684..a1c02abfe0d 100644 --- a/comprehensive-demo/app-02/webpack.config.js +++ b/comprehensive-demo/app-02/webpack.config.js @@ -25,6 +25,7 @@ module.exports = { { test: /\.jsx?$/, loader: require.resolve("babel-loader"), + exclude: /node_modules/, options: { presets: [require.resolve("@babel/preset-react")], }, diff --git a/comprehensive-demo/app-03/webpack.config.js b/comprehensive-demo/app-03/webpack.config.js index a8ef657ad57..660d931ede5 100644 --- a/comprehensive-demo/app-03/webpack.config.js +++ b/comprehensive-demo/app-03/webpack.config.js @@ -25,6 +25,7 @@ module.exports = { { test: /\.jsx?$/, loader: require.resolve("babel-loader"), + exclude: /node_modules/, options: { presets: [require.resolve("@babel/preset-react")], }, diff --git a/dynamic-system-host/app1/webpack.config.js b/dynamic-system-host/app1/webpack.config.js index f7641a1f367..bcb566cfe43 100644 --- a/dynamic-system-host/app1/webpack.config.js +++ b/dynamic-system-host/app1/webpack.config.js @@ -17,6 +17,7 @@ module.exports = { { test: /\.jsx?$/, loader: "babel-loader", + exclude: /node_modules/, options: { presets: ["@babel/preset-react"], }, diff --git a/dynamic-system-host/app2/webpack.config.js b/dynamic-system-host/app2/webpack.config.js index 0795297bc58..49466fae44a 100644 --- a/dynamic-system-host/app2/webpack.config.js +++ b/dynamic-system-host/app2/webpack.config.js @@ -17,6 +17,7 @@ module.exports = { { test: /\.jsx?$/, loader: "babel-loader", + exclude: /node_modules/, options: { presets: ["@babel/preset-react"], }, diff --git a/dynamic-system-host/app3/webpack.config.js b/dynamic-system-host/app3/webpack.config.js index f45c262b693..f260c5f4a8a 100644 --- a/dynamic-system-host/app3/webpack.config.js +++ b/dynamic-system-host/app3/webpack.config.js @@ -17,6 +17,7 @@ module.exports = { { test: /\.jsx?$/, loader: "babel-loader", + exclude: /node_modules/, options: { presets: ["@babel/preset-react"], }, diff --git a/nested/app1/webpack.config.js b/nested/app1/webpack.config.js index 07979b3bf40..54068c970e6 100644 --- a/nested/app1/webpack.config.js +++ b/nested/app1/webpack.config.js @@ -17,6 +17,7 @@ module.exports = { { test: /\.jsx?$/, loader: "babel-loader", + exclude: /node_modules/, options: { presets: ["@babel/preset-react"], }, diff --git a/nested/app2/webpack.config.js b/nested/app2/webpack.config.js index afed5bec229..f20958ab73d 100644 --- a/nested/app2/webpack.config.js +++ b/nested/app2/webpack.config.js @@ -17,6 +17,7 @@ module.exports = { { test: /\.jsx?$/, loader: "babel-loader", + exclude: /node_modules/, options: { presets: ["@babel/preset-react"], }, diff --git a/nested/app3/webpack.config.js b/nested/app3/webpack.config.js index 81249cfba6c..832f06a9bca 100644 --- a/nested/app3/webpack.config.js +++ b/nested/app3/webpack.config.js @@ -17,6 +17,7 @@ module.exports = { { test: /\.jsx?$/, loader: "babel-loader", + exclude: /node_modules/, options: { presets: ["@babel/preset-react"], }, diff --git a/no-import-bootstrap/README.md b/no-import-bootstrap/README.md deleted file mode 100644 index ee141c578d7..00000000000 --- a/no-import-bootstrap/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# Basic One-Way Example - -This example demos a basic host application loading remote component. - -- `app1` is the host application. -- `app2` standalone application which exposes `Button` component. - -# Running Demo - -Run `yarn start`. This will build and serve both `app1` and `app2` on ports 3001 and 3002 respectively. - -- [localhost:3001](http://localhost:3001/) (HOST) -- [localhost:3002](http://localhost:3002/) (STANDALONE REMOTE) diff --git a/no-import-bootstrap/app1/VirtualBootstrapPlugin.js b/no-import-bootstrap/app1/VirtualBootstrapPlugin.js deleted file mode 100644 index 69f9742fb4e..00000000000 --- a/no-import-bootstrap/app1/VirtualBootstrapPlugin.js +++ /dev/null @@ -1,26 +0,0 @@ -const path = require("path"); -const fs = require("fs"); -const VirtualModulesPlugin = require("webpack-virtual-modules"); - -class VirtualBootstrapPlugin extends VirtualModulesPlugin { - constructor(modules = {}) { - super(modules); - } - - apply(compiler) { - const entry = compiler.options.entry.main.import[0]; - const resolvedEntryFile = require.resolve(entry); - const originalEntrySource = fs.readFileSync(resolvedEntryFile, { - encoding: "utf8", - }); - const onlyPath = path.dirname(resolvedEntryFile); - - Object.assign(this._staticModules, { - [entry]: 'import("./bootstrap.js")', - [path.join(onlyPath, "bootstrap.js")]: originalEntrySource, - }); - super.apply(compiler); - } -} - -module.exports = VirtualBootstrapPlugin; diff --git a/no-import-bootstrap/app1/package.json b/no-import-bootstrap/app1/package.json deleted file mode 100644 index bd515912e73..00000000000 --- a/no-import-bootstrap/app1/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "@no-import-bootstrap/app1", - "version": "0.0.0", - "private": true, - "devDependencies": { - "@babel/core": "7.9.6", - "@babel/preset-react": "7.9.4", - "babel-loader": "8.1.0", - "html-webpack-plugin": "git://github.com/ScriptedAlchemy/html-webpack-plugin#master", - "serve": "11.3.0", - "webpack": "git://github.com/webpack/webpack.git#dev-1", - "webpack-cli": "3.3.11", - "webpack-dev-server": "3.10.3", - "webpack-virtual-modules": "0.2.2" - }, - "scripts": { - "start": "webpack-dev-server", - "build": "webpack --mode production", - "serve": "serve dist -p 3001" - }, - "dependencies": { - "react": "^16.13.0", - "react-dom": "^16.13.0" - } -} diff --git a/no-import-bootstrap/app1/public/index.html b/no-import-bootstrap/app1/public/index.html deleted file mode 100644 index 1511cd8d858..00000000000 --- a/no-import-bootstrap/app1/public/index.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - -
- - diff --git a/no-import-bootstrap/app1/src/App.js b/no-import-bootstrap/app1/src/App.js deleted file mode 100644 index 5ea55bd0888..00000000000 --- a/no-import-bootstrap/app1/src/App.js +++ /dev/null @@ -1,13 +0,0 @@ -import React from "react"; -const RemoteButton = React.lazy(() => import("app2/Button")); -const App = () => ( -
-

Basic Host-Remote

-

App 1

- - - -
-); - -export default App; diff --git a/no-import-bootstrap/app1/src/index.js b/no-import-bootstrap/app1/src/index.js deleted file mode 100644 index 9873e9e71a6..00000000000 --- a/no-import-bootstrap/app1/src/index.js +++ /dev/null @@ -1,5 +0,0 @@ -import App from "./App"; -import React from "react"; -import ReactDOM from "react-dom"; - -ReactDOM.render(, document.getElementById("root")); diff --git a/no-import-bootstrap/app1/webpack.config.js b/no-import-bootstrap/app1/webpack.config.js deleted file mode 100644 index a8dfd6f8b44..00000000000 --- a/no-import-bootstrap/app1/webpack.config.js +++ /dev/null @@ -1,42 +0,0 @@ -const HtmlWebpackPlugin = require("html-webpack-plugin"); -const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin"); -const VirtualBootstrapPlugin = require("./VirtualBootstrapPlugin"); -const path = require("path"); - -module.exports = { - entry: "./src/index", - mode: "development", - devServer: { - contentBase: path.join(__dirname, "dist"), - port: 3001, - }, - output: { - publicPath: "http://localhost:3001/", - }, - module: { - rules: [ - { - test: /\.jsx?$/, - loader: "babel-loader", - exclude: /node_modules/, - options: { - presets: ["@babel/preset-react"], - }, - }, - ], - }, - plugins: [ - new ModuleFederationPlugin({ - name: "app1", - library: { type: "var", name: "app1" }, - remotes: { - app2: "app2", - }, - shared: ["react", "react-dom"], - }), - new VirtualBootstrapPlugin(), - new HtmlWebpackPlugin({ - template: "./public/index.html", - }), - ], -}; diff --git a/no-import-bootstrap/app2/VirtualBootstrapPlugin.js b/no-import-bootstrap/app2/VirtualBootstrapPlugin.js deleted file mode 100644 index 69f9742fb4e..00000000000 --- a/no-import-bootstrap/app2/VirtualBootstrapPlugin.js +++ /dev/null @@ -1,26 +0,0 @@ -const path = require("path"); -const fs = require("fs"); -const VirtualModulesPlugin = require("webpack-virtual-modules"); - -class VirtualBootstrapPlugin extends VirtualModulesPlugin { - constructor(modules = {}) { - super(modules); - } - - apply(compiler) { - const entry = compiler.options.entry.main.import[0]; - const resolvedEntryFile = require.resolve(entry); - const originalEntrySource = fs.readFileSync(resolvedEntryFile, { - encoding: "utf8", - }); - const onlyPath = path.dirname(resolvedEntryFile); - - Object.assign(this._staticModules, { - [entry]: 'import("./bootstrap.js")', - [path.join(onlyPath, "bootstrap.js")]: originalEntrySource, - }); - super.apply(compiler); - } -} - -module.exports = VirtualBootstrapPlugin; diff --git a/no-import-bootstrap/app2/package.json b/no-import-bootstrap/app2/package.json deleted file mode 100644 index efb30e3e880..00000000000 --- a/no-import-bootstrap/app2/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "@no-import-bootstrap/app2", - "version": "0.0.0", - "private": true, - "devDependencies": { - "@babel/core": "7.9.6", - "@babel/preset-react": "7.9.4", - "babel-loader": "8.1.0", - "html-webpack-plugin": "git://github.com/ScriptedAlchemy/html-webpack-plugin#master", - "serve": "11.3.0", - "webpack": "git://github.com/webpack/webpack.git#dev-1", - "webpack-cli": "3.3.11", - "webpack-dev-server": "3.10.3", - "webpack-virtual-modules": "0.2.2" - }, - "scripts": { - "start": "webpack-dev-server", - "build": "webpack --mode production", - "serve": "serve dist -p 3002" - }, - "dependencies": { - "react": "^16.13.0", - "react-dom": "^16.13.0" - } -} diff --git a/no-import-bootstrap/app2/public/index.html b/no-import-bootstrap/app2/public/index.html deleted file mode 100644 index 350e8ecc749..00000000000 --- a/no-import-bootstrap/app2/public/index.html +++ /dev/null @@ -1,5 +0,0 @@ - - -
- - diff --git a/no-import-bootstrap/app2/src/App.js b/no-import-bootstrap/app2/src/App.js deleted file mode 100644 index b549d3ac1cd..00000000000 --- a/no-import-bootstrap/app2/src/App.js +++ /dev/null @@ -1,12 +0,0 @@ -import LocalButton from "./Button"; -import React from "react"; - -const App = () => ( -
-

Basic Host-Remote

-

App 2

- -
-); - -export default App; diff --git a/no-import-bootstrap/app2/src/Button.js b/no-import-bootstrap/app2/src/Button.js deleted file mode 100644 index f2914e0fa01..00000000000 --- a/no-import-bootstrap/app2/src/Button.js +++ /dev/null @@ -1,5 +0,0 @@ -import React from "react"; - -const Button = () => ; - -export default Button; diff --git a/no-import-bootstrap/app2/src/index.js b/no-import-bootstrap/app2/src/index.js deleted file mode 100644 index 9873e9e71a6..00000000000 --- a/no-import-bootstrap/app2/src/index.js +++ /dev/null @@ -1,5 +0,0 @@ -import App from "./App"; -import React from "react"; -import ReactDOM from "react-dom"; - -ReactDOM.render(, document.getElementById("root")); diff --git a/no-import-bootstrap/app2/webpack.config.js b/no-import-bootstrap/app2/webpack.config.js deleted file mode 100644 index f1c385eb94b..00000000000 --- a/no-import-bootstrap/app2/webpack.config.js +++ /dev/null @@ -1,43 +0,0 @@ -const HtmlWebpackPlugin = require("html-webpack-plugin"); -const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin"); -const path = require("path"); -const VirtualBootstrapPlugin = require("./VirtualBootstrapPlugin"); - -module.exports = { - entry: "./src/index", - mode: "development", - devServer: { - contentBase: path.join(__dirname, "dist"), - port: 3002, - }, - output: { - publicPath: "http://localhost:3002/", - }, - module: { - rules: [ - { - test: /\.jsx?$/, - loader: "babel-loader", - exclude: /node_modules/, - options: { - presets: ["@babel/preset-react"], - }, - }, - ], - }, - plugins: [ - new ModuleFederationPlugin({ - name: "app2", - library: { type: "var", name: "app2" }, - filename: "remoteEntry.js", - exposes: { - Button: "./src/Button", - }, - shared: ["react", "react-dom"], - }), - new VirtualBootstrapPlugin(), - new HtmlWebpackPlugin({ - template: "./public/index.html", - }), - ], -}; diff --git a/no-import-bootstrap/package.json b/no-import-bootstrap/package.json deleted file mode 100644 index 63c049d9f99..00000000000 --- a/no-import-bootstrap/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "private": true, - "scripts": { - "start": "lerna run --scope @no-import-bootstrap/* --parallel start", - "build": "lerna run --scope @no-import-bootstrap/* build", - "serve": "lerna run --scope @no-import-bootstrap/* --parallel serve" - } -} diff --git a/package.json b/package.json index eaff8e7817a..16a359a5d04 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,7 @@ "typescript/*", "nested/*", "version-discrepancy/*", - "redux-reducer-injection/*", - "no-import-bootstrap/*" + "redux-reducer-injection/*" ], "nohoist": [ "**/svelte", diff --git a/redux-reducer-injection/packages/app1/package.json b/redux-reducer-injection/app1/package.json similarity index 94% rename from redux-reducer-injection/packages/app1/package.json rename to redux-reducer-injection/app1/package.json index bf922523298..d0e95abab16 100644 --- a/redux-reducer-injection/packages/app1/package.json +++ b/redux-reducer-injection/app1/package.json @@ -1,5 +1,5 @@ { - "name": "app1", + "name": "@redux-reducer-injection/app1", "version": "0.0.0", "private": true, "dependencies": { diff --git a/redux-reducer-injection/packages/app1/public/index.html b/redux-reducer-injection/app1/public/index.html similarity index 100% rename from redux-reducer-injection/packages/app1/public/index.html rename to redux-reducer-injection/app1/public/index.html diff --git a/redux-reducer-injection/packages/app1/src/App.js b/redux-reducer-injection/app1/src/index.js similarity index 100% rename from redux-reducer-injection/packages/app1/src/App.js rename to redux-reducer-injection/app1/src/index.js diff --git a/redux-reducer-injection/packages/app1/src/store.js b/redux-reducer-injection/app1/src/store.js similarity index 100% rename from redux-reducer-injection/packages/app1/src/store.js rename to redux-reducer-injection/app1/src/store.js diff --git a/redux-reducer-injection/packages/app1/webpack.config.js b/redux-reducer-injection/app1/webpack.config.js similarity index 96% rename from redux-reducer-injection/packages/app1/webpack.config.js rename to redux-reducer-injection/app1/webpack.config.js index cd2f618cf63..50874bec755 100644 --- a/redux-reducer-injection/packages/app1/webpack.config.js +++ b/redux-reducer-injection/app1/webpack.config.js @@ -25,6 +25,7 @@ module.exports = { { test: /\.jsx?$/, loader: require.resolve('babel-loader'), + exclude: /node_modules/, options: { presets: [require.resolve('@babel/preset-react')], }, diff --git a/redux-reducer-injection/packages/app2/package.json b/redux-reducer-injection/app2/package.json similarity index 93% rename from redux-reducer-injection/packages/app2/package.json rename to redux-reducer-injection/app2/package.json index d0bec09297d..34848f98f75 100644 --- a/redux-reducer-injection/packages/app2/package.json +++ b/redux-reducer-injection/app2/package.json @@ -1,5 +1,5 @@ { - "name": "app2", + "name": "@redux-reducer-injection/app2", "version": "0.0.0", "private": true, "dependencies": { diff --git a/redux-reducer-injection/packages/app2/public/index.html b/redux-reducer-injection/app2/public/index.html similarity index 83% rename from redux-reducer-injection/packages/app2/public/index.html rename to redux-reducer-injection/app2/public/index.html index c46a045993b..053c832958e 100644 --- a/redux-reducer-injection/packages/app2/public/index.html +++ b/redux-reducer-injection/app2/public/index.html @@ -1,7 +1,6 @@ - - +
diff --git a/redux-reducer-injection/packages/app2/src/RemoteApp.js b/redux-reducer-injection/app2/src/RemoteApp.js similarity index 97% rename from redux-reducer-injection/packages/app2/src/RemoteApp.js rename to redux-reducer-injection/app2/src/RemoteApp.js index 785c8728192..f5b9afda070 100644 --- a/redux-reducer-injection/packages/app2/src/RemoteApp.js +++ b/redux-reducer-injection/app2/src/RemoteApp.js @@ -41,7 +41,7 @@ const RemoteAppWrapper = (props) => { }, []); return ( - + ); diff --git a/redux-reducer-injection/app2/src/index.js b/redux-reducer-injection/app2/src/index.js new file mode 100644 index 00000000000..2393ec95c96 --- /dev/null +++ b/redux-reducer-injection/app2/src/index.js @@ -0,0 +1 @@ +alert('this is only a remote'); diff --git a/redux-reducer-injection/packages/app2/src/reducer.js b/redux-reducer-injection/app2/src/reducer.js similarity index 100% rename from redux-reducer-injection/packages/app2/src/reducer.js rename to redux-reducer-injection/app2/src/reducer.js diff --git a/redux-reducer-injection/packages/app2/webpack.config.js b/redux-reducer-injection/app2/webpack.config.js similarity index 96% rename from redux-reducer-injection/packages/app2/webpack.config.js rename to redux-reducer-injection/app2/webpack.config.js index 10da96e2752..2abece6bd7b 100644 --- a/redux-reducer-injection/packages/app2/webpack.config.js +++ b/redux-reducer-injection/app2/webpack.config.js @@ -21,6 +21,7 @@ module.exports = { { test: /\.jsx?$/, loader: require.resolve('babel-loader'), + exclude: /node_modules/, options: { presets: [require.resolve('@babel/preset-react')], }, diff --git a/redux-reducer-injection/package.json b/redux-reducer-injection/package.json index a469b9d4c61..8bb39e7ff1a 100644 --- a/redux-reducer-injection/package.json +++ b/redux-reducer-injection/package.json @@ -1,17 +1,9 @@ { - "name": "webpack-module-federation-hooks", "private": true, - "workspaces": [ - "packages/*" - ], "scripts": { - "start": "concurrently \"wsrun --parallel start\" \"wsrun --parallel serve\"", - "clean": "concurrently \"wsrun --parallel start\" \"wsrun --parallel clean\"" - }, - "devDependencies": { - "wsrun": "5.2.0" - }, - "dependencies": { - "concurrently": "^5.1.0" + "start": "concurrently \"lerna run --scope @redux-reducer-injection/* --parallel start\" \"yarn serve\"", + "build": "lerna run --scope @redux-reducer-injection/* build", + "serve": "lerna run --scope @redux-reducer-injection/* --parallel serve", + "clean": "lerna run --scope @redux-reducer-injection/* --parallel clean" } } diff --git a/redux-reducer-injection/packages/app1/src/index.js b/redux-reducer-injection/packages/app1/src/index.js deleted file mode 100644 index 0189803552e..00000000000 --- a/redux-reducer-injection/packages/app1/src/index.js +++ /dev/null @@ -1 +0,0 @@ -import('./App'); diff --git a/redux-reducer-injection/packages/app2/src/index.js b/redux-reducer-injection/packages/app2/src/index.js deleted file mode 100644 index 14ab0897eb6..00000000000 --- a/redux-reducer-injection/packages/app2/src/index.js +++ /dev/null @@ -1 +0,0 @@ -import('./RemoteApp'); diff --git a/self-healing/app1/src/bootstrap.js b/self-healing/app1/src/bootstrap.js deleted file mode 100644 index 9873e9e71a6..00000000000 --- a/self-healing/app1/src/bootstrap.js +++ /dev/null @@ -1,5 +0,0 @@ -import App from "./App"; -import React from "react"; -import ReactDOM from "react-dom"; - -ReactDOM.render(, document.getElementById("root")); diff --git a/self-healing/app1/src/index.js b/self-healing/app1/src/index.js index 50599f7ad8e..9873e9e71a6 100644 --- a/self-healing/app1/src/index.js +++ b/self-healing/app1/src/index.js @@ -1 +1,5 @@ -import("./bootstrap"); +import App from "./App"; +import React from "react"; +import ReactDOM from "react-dom"; + +ReactDOM.render(, document.getElementById("root")); diff --git a/self-healing/app1/webpack.config.js b/self-healing/app1/webpack.config.js index c5c3a7fdb2e..7efd2b2c605 100644 --- a/self-healing/app1/webpack.config.js +++ b/self-healing/app1/webpack.config.js @@ -17,6 +17,7 @@ module.exports = { { test: /\.jsx?$/, loader: "babel-loader", + exclude: /node_modules/, options: { presets: ["@babel/preset-react"], }, diff --git a/self-healing/app2/src/bootstrap.js b/self-healing/app2/src/bootstrap.js deleted file mode 100644 index 9873e9e71a6..00000000000 --- a/self-healing/app2/src/bootstrap.js +++ /dev/null @@ -1,5 +0,0 @@ -import App from "./App"; -import React from "react"; -import ReactDOM from "react-dom"; - -ReactDOM.render(, document.getElementById("root")); diff --git a/self-healing/app2/src/index.js b/self-healing/app2/src/index.js index 50599f7ad8e..9873e9e71a6 100644 --- a/self-healing/app2/src/index.js +++ b/self-healing/app2/src/index.js @@ -1 +1,5 @@ -import("./bootstrap"); +import App from "./App"; +import React from "react"; +import ReactDOM from "react-dom"; + +ReactDOM.render(, document.getElementById("root")); diff --git a/self-healing/app2/webpack.config.js b/self-healing/app2/webpack.config.js index 76ac37d9810..7654c7d6134 100644 --- a/self-healing/app2/webpack.config.js +++ b/self-healing/app2/webpack.config.js @@ -17,6 +17,7 @@ module.exports = { { test: /\.jsx?$/, loader: "babel-loader", + exclude: /node_modules/, options: { presets: ["@babel/preset-react"], }, diff --git a/shared-context/app1/src/bootstrap.js b/shared-context/app1/src/bootstrap.js deleted file mode 100644 index 9873e9e71a6..00000000000 --- a/shared-context/app1/src/bootstrap.js +++ /dev/null @@ -1,5 +0,0 @@ -import App from "./App"; -import React from "react"; -import ReactDOM from "react-dom"; - -ReactDOM.render(, document.getElementById("root")); diff --git a/shared-context/app1/src/index.js b/shared-context/app1/src/index.js index 50599f7ad8e..9873e9e71a6 100644 --- a/shared-context/app1/src/index.js +++ b/shared-context/app1/src/index.js @@ -1 +1,5 @@ -import("./bootstrap"); +import App from "./App"; +import React from "react"; +import ReactDOM from "react-dom"; + +ReactDOM.render(, document.getElementById("root")); diff --git a/shared-context/app1/webpack.config.js b/shared-context/app1/webpack.config.js index 8f6fb8af5c8..9bb8bd408a3 100644 --- a/shared-context/app1/webpack.config.js +++ b/shared-context/app1/webpack.config.js @@ -17,6 +17,7 @@ module.exports = { { test: /\.jsx?$/, loader: "babel-loader", + exclude: /node_modules/, options: { presets: ["@babel/preset-react"], }, diff --git a/shared-context/app2/src/bootstrap.js b/shared-context/app2/src/bootstrap.js deleted file mode 100644 index 9873e9e71a6..00000000000 --- a/shared-context/app2/src/bootstrap.js +++ /dev/null @@ -1,5 +0,0 @@ -import App from "./App"; -import React from "react"; -import ReactDOM from "react-dom"; - -ReactDOM.render(, document.getElementById("root")); diff --git a/shared-context/app2/src/index.js b/shared-context/app2/src/index.js index 50599f7ad8e..9873e9e71a6 100644 --- a/shared-context/app2/src/index.js +++ b/shared-context/app2/src/index.js @@ -1 +1,5 @@ -import("./bootstrap"); +import App from "./App"; +import React from "react"; +import ReactDOM from "react-dom"; + +ReactDOM.render(, document.getElementById("root")); diff --git a/shared-context/app2/webpack.config.js b/shared-context/app2/webpack.config.js index 648b752c523..f05da9e4610 100644 --- a/shared-context/app2/webpack.config.js +++ b/shared-context/app2/webpack.config.js @@ -17,6 +17,7 @@ module.exports = { { test: /\.jsx?$/, loader: "babel-loader", + exclude: /node_modules/, options: { presets: ["@babel/preset-react"], }, diff --git a/yarn.lock b/yarn.lock index 9e9e3f0a9c6..e84f686b892 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12736,13 +12736,6 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.3: source-list-map "^2.0.0" source-map "~0.6.1" -webpack-virtual-modules@0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz#20863dc3cb6bb2104729fff951fbe14b18bd0299" - integrity sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA== - dependencies: - debug "^3.0.0" - "webpack@git://github.com/webpack/webpack.git#dev-1": version "5.0.0-beta.15" resolved "git://github.com/webpack/webpack.git#083eb02f2e7dda525263539af84fb4255618c931"