Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 35 additions & 11 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,37 @@
{
"globals": {
"__webpack_modules__": true
},
"parser": "babel-eslint",
"env": {
"browser": true,
"es6": true
},
"extends": "airbnb",
"rules": {
}
"globals": {
"window": true,
"__webpack_modules__": true,
"__webpack_require__": true,
"__LOADABLE_LOADED_CHUNKS__": true
},
"parser": "babel-eslint",
"env": {
"browser": true,
"es6": true,
"node": true
},
"plugins": [
"prettier"
],
"extends": [
"airbnb",
"plugin:prettier/recommended"
],
"rules": {
"no-console": "off",
"no-shadow": "warn",
"no-param-reassign": "warn",
"no-plusplus": "off",
"global-require": "off",
"import/no-extraneous-dependencies": "off",
"no-nested-ternary": "off",
"prefer-destructuring": "warn",
"consistent-return": "warn",
"eqeqeq": "warn",
"no-new-func": "warn",
"no-underscore-dangle": "off",
"no-multi-assign": "off",
"react/jsx-filename-extension": "off"
}
}
4 changes: 2 additions & 2 deletions travis.yml → .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- stage: Build
name: Travis Status
script: npx travis-github-status
# name: Linting
# script: npm run lint
name: Linting
script: npm run lint
after_success:
- npm run semantic-release
8 changes: 4 additions & 4 deletions manual/Website1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@babel/preset-react": "^7.0.0",
"babel-core": "^7.0.0-bridge.0",
"babel-loader": "^8.0.5",
"eslint-loader": "^2.1.2",
"eslint-loader": "^3.0.3",
"react-hot-loader": "^4.8.3",
"webpack": "^4.29.6",
"webpack-cli": "^3.3.0",
Expand All @@ -36,16 +36,16 @@
"@babel/plugin-proposal-class-properties": "^7.4.4",
"clean-webpack-plugin": "^3.0.0",
"crc-32": "^1.2.0",
"cross-env": "^5.2.0",
"cross-env": "^6.0.3",
"html-webpack-plugin": "^4.0.0-beta.8",
"mini-css-extract-plugin": "^0.6.0",
"mini-css-extract-plugin": "^0.9.0",
"moment": "^2.24.0",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"react": "file:../../node_modules/react",
"react-dom": "file:../../node_modules/react-dom",
"regenerator-runtime": "^0.13.2",
"scriptjs": "^2.5.9",
"webpack-external-import": "0.0.1-beta.23",
"webpack-external-import": "0.3.0-beta.0",
"webpack-merge": "^4.2.1"
}
}
2,217 changes: 952 additions & 1,265 deletions manual/Website1/yarn.lock

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions manual/Website2/src/components/Title/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import React from 'react';
import 'react-select';
import React from "react";
import "react-select";

export const Title = ({ title }) => (
<h1>
TITLE COMPONENT:
{title}
</h1>
);
export const Title = ({ title }) => {
window.wasExternalFunctionCalled = true;
console.log("TitleComponent interleaving successful");
return (
<h1>
TITLE COMPONENT:
{title}
</h1>
);
};

/* externalize:TitleComponent */
Loading