Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow publish bundle to have React as external peer dependencies #2097

Closed
wants to merge 2 commits into from
Closed

Allow publish bundle to have React as external peer dependencies #2097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
612bab6
react and react-dom peer deps in core
talves Feb 14, 2019
275c7a6
yarn format
talves Feb 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/netlify-cms-backend-bitbucket/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"netlify-cms-lib-util": "^2.1.0",
"netlify-cms-ui-default": "^2.0.6",
"prop-types": "^15.6.2",
"react": "^16.4.1",
"react": "^16.8.1",
"react-emotion": "^9.2.6"
}
}
2 changes: 1 addition & 1 deletion packages/netlify-cms-backend-git-gateway/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"netlify-cms-lib-util": "^2.0.0",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.6.2",
"react": "^16.4.1",
"react": "^16.8.1",
"react-emotion": "^9.2.6"
}
}
2 changes: 1 addition & 1 deletion packages/netlify-cms-backend-github/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"netlify-cms-lib-util": "^2.0.0",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.6.2",
"react": "^16.4.1",
"react": "^16.8.1",
"react-emotion": "^9.2.6"
}
}
2 changes: 1 addition & 1 deletion packages/netlify-cms-backend-gitlab/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"netlify-cms-lib-util": "^2.0.0",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.6.2",
"react": "^16.4.1",
"react": "^16.8.1",
"react-emotion": "^9.2.6"
}
}
2 changes: 1 addition & 1 deletion packages/netlify-cms-backend-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"netlify-cms-lib-util": "^2.0.0",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.6.2",
"react": "^16.4.1",
"react": "^16.8.1",
"react-emotion": "^9.2.6",
"react-immutable-proptypes": "^2.1.0"
}
Expand Down
6 changes: 4 additions & 2 deletions packages/netlify-cms-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@
"netlify-cms-ui-default": "^2.3.0",
"node-polyglot": "^2.3.0",
"prop-types": "^15.5.10",
"react": "^16.8.1",
"react-dnd": "^7.0.0",
"react-dnd-html5-backend": "^7.0.0",
"react-dom": "^16.8.1",
"react-emotion": "^9.2.5",
"react-frame-component": "^4.0.2",
"react-hot-loader": "^4.0.0",
Expand Down Expand Up @@ -75,5 +73,9 @@
"to-string-loader": "^1.1.5",
"webpack": "^4.16.1",
"webpack-cli": "^3.1.0"
},
"peerDependencies": {
"react": "^16.8.1",
"react-dom": "^16.8.1"
}
}
2 changes: 1 addition & 1 deletion packages/netlify-cms-editor-component-image/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"webpack-cli": "^3.1.0"
},
"peerDependencies": {
"react": "^16.4.1"
"react": "^16.8.1"
}
}
3 changes: 2 additions & 1 deletion packages/netlify-cms-ui-default/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"emotion": "^9.2.6",
"lodash": "^4.13.1",
"prop-types": "^15.5.10",
"react": "^16.4.1",
"react": "^16.8.1",
"react-dom": "^16.8.1",
"react-emotion": "^9.2.6"
}
}
2 changes: 1 addition & 1 deletion packages/netlify-cms-widget-boolean/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"lodash": "^4.17.10",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1",
"react": "^16.8.1",
"react-immutable-proptypes": "^2.1.0"
}
}
3 changes: 2 additions & 1 deletion packages/netlify-cms-widget-date/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"moment": "^2.11.2",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1",
"react": "^16.8.1",
"react-dom": "^16.8.1",
"react-emotion": "^9.2.6"
}
}
3 changes: 2 additions & 1 deletion packages/netlify-cms-widget-datetime/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
},
"peerDependencies": {
"emotion": "^9.2.6",
"react": "^16.4.1"
"react": "^16.8.1",
"react-dom": "^16.8.1"
},
"localExternals": [
"netlify-cms-widget-date"
Expand Down
2 changes: 1 addition & 1 deletion packages/netlify-cms-widget-file/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"immutable": "^3.7.6",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1",
"react": "^16.8.1",
"react-emotion": "^9.2.6",
"react-immutable-proptypes": "^2.1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/netlify-cms-widget-image/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"immutable": "^3.7.6",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1",
"react": "^16.8.1",
"react-emotion": "^9.2.6"
},
"localExternals": [
Expand Down
3 changes: 2 additions & 1 deletion packages/netlify-cms-widget-list/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"lodash": "^4.17.10",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1",
"react": "^16.8.1",
"react-dom": "^16.8.1",
"react-emotion": "^9.2.6",
"react-immutable-proptypes": "^2.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/netlify-cms-widget-map/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"lodash": "^4.17.10",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1",
"react": "^16.8.1",
"react-immutable-proptypes": "^2.1.0"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/netlify-cms-widget-markdown/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"lodash": "^4.17.10",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1",
"react-dom": "^16.0.0",
"react": "^16.8.1",
"react-dom": "^16.8.1",
"react-emotion": "^9.2.5",
"react-immutable-proptypes": "^2.1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/netlify-cms-widget-number/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"emotion": "^9.2.6",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1"
"react": "^16.8.1"
}
}
2 changes: 1 addition & 1 deletion packages/netlify-cms-widget-object/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"lodash": "^4.17.10",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1",
"react": "^16.8.1",
"react-emotion": "^9.2.6",
"react-immutable-proptypes": "^2.1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/netlify-cms-widget-relation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"lodash": "^4.17.10",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1",
"react": "^16.8.1",
"react-emotion": "^9.2.5",
"uuid": "^3.1.0"
}
Expand Down
3 changes: 2 additions & 1 deletion packages/netlify-cms-widget-select/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"immutable": "^3.7.6",
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1",
"react": "^16.8.1",
"react-dom": "^16.8.1",
"react-immutable-proptypes": "^2.1.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/netlify-cms-widget-string/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
"peerDependencies": {
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1"
"react": "^16.8.1"
}
}
2 changes: 1 addition & 1 deletion packages/netlify-cms-widget-text/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
"peerDependencies": {
"netlify-cms-ui-default": "^2.0.0",
"prop-types": "^15.5.10",
"react": "^16.4.1"
"react": "^16.8.1"
}
}
4 changes: 3 additions & 1 deletion packages/netlify-cms/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
"netlify-cms-widget-relation": "^2.0.6",
"netlify-cms-widget-select": "^2.1.1",
"netlify-cms-widget-string": "^2.0.4",
"netlify-cms-widget-text": "^2.0.6"
"netlify-cms-widget-text": "^2.0.6",
"react": "^16.8.1",
"react-dom": "^16.8.1"
},
"devDependencies": {
"copy-webpack-plugin": "^4.5.2",
Expand Down
12 changes: 12 additions & 0 deletions packages/netlify-cms/src/index-manual.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import CMS, { init } from 'netlify-cms-core/src';
import './backends';
import './widgets';
import './editor-components';
import './media-libraries';

console.log(
`Using netlify-cms manual initialization required.
Dependencies['react', 'react-dom']`,
);

export { CMS as default, init };
19 changes: 19 additions & 0 deletions packages/netlify-cms/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,25 @@ if (isProduction) {
filename: 'dist/cms.js',
},
},

/**
* Output the same script with react, react-dom as external peers.
*/
{
...baseConfig,
entry: [path.join(__dirname, 'src/index-manual.js'), baseConfig.entry],
output: {
...baseConfig.output,
filename: 'dist/netlify-cms-manual-init.js',
},
externals: (context, request, cb) => {
const localExternals = pkg.localExternals || [];
const peerDeps = ['react', 'react-dom'];
const externals = isProduction ? peerDeps : [...localExternals, ...peerDeps];
const isPeerDep = dep => new RegExp(`^${dep}($|/)`).test(request);
return externals.some(isPeerDep) ? cb(null, request) : cb();
},
},
];
} else {
module.exports = baseConfig;
Expand Down
24 changes: 12 additions & 12 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9754,14 +9754,14 @@ react-dnd@^7.0.0:
shallowequal "^1.1.0"

react-dom@^16.8.1:
version "16.8.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.1.tgz#ec860f98853d09d39bafd3a6f1e12389d283dbb4"
integrity sha512-N74IZUrPt6UiDjXaO7UbDDFXeUXnVhZzeRLy/6iqqN1ipfjrhR60Bp5NuBK+rv3GMdqdIuwIl22u1SYwf330bg==
version "16.8.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.2.tgz#7c8a69545dd554d45d66442230ba04a6a0a3c3d3"
integrity sha512-cPGfgFfwi+VCZjk73buu14pYkYBR1b/SRMSYqkLDdhSEHnSwcuYTPu6/Bh6ZphJFIk80XLvbSe2azfcRzNF+Xg==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.13.1"
scheduler "^0.13.2"

react-emotion@^9.2.5:
version "9.2.6"
Expand Down Expand Up @@ -10027,14 +10027,14 @@ react-waypoint@^8.1.0:
react-is "^16.6.3"

react@^16.8.1:
version "16.8.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.8.1.tgz#ae11831f6cb2a05d58603a976afc8a558e852c4a"
integrity sha512-wLw5CFGPdo7p/AgteFz7GblI2JPOos0+biSoxf1FPsGxWQZdN/pj6oToJs1crn61DL3Ln7mN86uZ4j74p31ELQ==
version "16.8.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.8.2.tgz#83064596feaa98d9c2857c4deae1848b542c9c0c"
integrity sha512-aB2ctx9uQ9vo09HVknqv3DGRpI7OIGJhCx3Bt0QqoRluEjHSaObJl+nG12GDdYH6sTgE7YiPJ6ZUyMx9kICdXw==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.13.1"
scheduler "^0.13.2"

read-cmd-shim@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -10754,10 +10754,10 @@ sax@^1.2.4, sax@~1.2.4:
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==

scheduler@^0.13.1:
version "0.13.1"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.1.tgz#1a217df1bfaabaf4f1b92a9127d5d732d85a9591"
integrity sha512-VJKOkiKIN2/6NOoexuypwSrybx13MY7NSy9RNt8wPvZDMRT1CW6qlpF5jXRToXNHz3uWzbm2elNpZfXfGPqP9A==
scheduler@^0.13.2:
version "0.13.2"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.2.tgz#969eaee2764a51d2e97b20a60963b2546beff8fa"
integrity sha512-qK5P8tHS7vdEMCW5IPyt8v9MJOHqTrOUgPXib7tqm9vh834ibBX5BNhwkplX/0iOzHW5sXyluehYfS9yrkz9+w==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
Expand Down