Skip to content

Commit

Permalink
Copy external dependencies to a vendor dir
Browse files Browse the repository at this point in the history
  • Loading branch information
@bergie
bergie committed Mar 5, 2018
1 parent c137dcc commit 5c1eca8
Show file tree
Hide file tree
Showing 6 changed files with 152 additions and 44 deletions.
8 changes: 4 additions & 4 deletions css/noflo-ui.css
View file
Expand Up @@ -164,10 +164,10 @@ h1, h2, h3 {
}
@font-face {
font-family: 'FontAwesomeSVG';
src: url('../node_modules/font-awesome/fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg'),
url('../node_modules/font-awesome/fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'),
url('../node_modules/font-awesome/fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'),
url('../node_modules/font-awesome/fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype');
src: url('../browser/vendor/font-awesome/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg'),
url('../browser/vendor/font-awesome/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'),
url('../browser/vendor/font-awesome/fontawesome-webfont.woff?v=4.0.3') format('woff'),
url('../browser/vendor/font-awesome/fontawesome-webfont.ttf?v=4.0.3') format('truetype');
font-weight: normal;
font-style: normal;
}
Expand Down
2 changes: 1 addition & 1 deletion elements/the-graph.html
View file
Expand Up @@ -161,7 +161,7 @@
// Initializes the autolayouter
this.autolayouter = klayNoflo.init({
onSuccess: this.applyAutolayout.bind(this),
workerScript: '../node_modules/klayjs/klay.js'
workerScript: 'browser/vendor/klayjs/klay.js'
});
this.themeChanged();
},
Expand Down
41 changes: 20 additions & 21 deletions externals.conf.js
View file
@@ -1,23 +1,22 @@
module.exports = [
'node_modules/@polymer/polymer/*.js',
'node_modules/codemirror/lib/codemirror.js',
'node_modules/codemirror/mode/xml/xml.js',
'node_modules/codemirror/mode/javascript/javascript.js',
'node_modules/codemirror/mode/css/css.js',
'node_modules/codemirror/mode/vbscript/vbscript.js',
'node_modules/codemirror/mode/coffeescript/coffeescript.js',
'node_modules/codemirror/mode/clike/clike.js',
'node_modules/codemirror/mode/htmlmixed/htmlmixed.js',
'node_modules/codemirror/mode/smalltalk/smalltalk.js',
'node_modules/codemirror/mode/yaml/yaml.js',
'node_modules/codemirror/mode/python/python.js',
'node_modules/font-awesome/**/*.woff',
'node_modules/font-awesome/**/*.ttf',
'node_modules/font-awesome/**/*.svg',
'node_modules/hammerjs/hammer.min.js',
'node_modules/hammerjs/hammer.min.js.map',
'node_modules/klayjs/klay.js',
'node_modules/klayjs-noflo/klay-noflo.js',
'node_modules/observe-js/src/observe.js',
'node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js',
'browser/vendor/codemirror/lib/codemirror.js',
'browser/vendor/codemirror/mode/xml/xml.js',
'browser/vendor/codemirror/mode/javascript/javascript.js',
'browser/vendor/codemirror/mode/css/css.js',
'browser/vendor/codemirror/mode/vbscript/vbscript.js',
'browser/vendor/codemirror/mode/coffeescript/coffeescript.js',
'browser/vendor/codemirror/mode/clike/clike.js',
'browser/vendor/codemirror/mode/htmlmixed/htmlmixed.js',
'browser/vendor/codemirror/mode/smalltalk/smalltalk.js',
'browser/vendor/codemirror/mode/yaml/yaml.js',
'browser/vendor/codemirror/mode/python/python.js',
'browser/vendor/font-awesome/*.woff',
'browser/vendor/font-awesome/*.ttf',
'browser/vendor/font-awesome/*.svg',
'browser/vendor/hammerjs/hammer.min.js',
'browser/vendor/hammerjs/hammer.min.js.map',
'browser/vendor/klayjs/klay.js',
'browser/vendor/klayjs-noflo/klay-noflo.js',
'browser/vendor/observe-js/observe.js',
'browser/vendor/webcomponentsjs/webcomponents-lite.js',
];
36 changes: 18 additions & 18 deletions index.dist.html
View file
Expand Up @@ -21,31 +21,31 @@
<link rel="shortcut icon" href="$NOFLO_THEME.ico" />
<!-- $NOFLO_APP_ANALYTICS -->

<script src="node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<link rel="import" href="node_modules/@polymer/polymer/polymer.html">
<script src="browser/vendor/webcomponentsjs/webcomponents-lite.js"></script>
<link rel="import" href="browser/vendor/polymer/polymer.html">

<script src="node_modules/klayjs-noflo/klay-noflo.js"></script>
<script src="node_modules/hammerjs/hammer.min.js"></script>
<script src="node_modules/observe-js/src/observe.js"></script>
<script src="browser/vendor/klayjs-noflo/klay-noflo.js"></script>
<script src="browser/vendor/hammerjs/hammer.min.js"></script>
<script src="browser/vendor/observe-js/observe.js"></script>

<script src="./browser/noflo-ui.min.js"></script>
<script src="browser/noflo-ui.min.js"></script>

<script src="node_modules/codemirror/lib/codemirror.js"></script>
<script src="node_modules/codemirror/mode/xml/xml.js"></script>
<script src="node_modules/codemirror/mode/javascript/javascript.js"></script>
<script src="node_modules/codemirror/mode/css/css.js"></script>
<script src="node_modules/codemirror/mode/vbscript/vbscript.js"></script>
<script src="node_modules/codemirror/mode/coffeescript/coffeescript.js"></script>
<script src="node_modules/codemirror/mode/clike/clike.js"></script>
<script src="node_modules/codemirror/mode/htmlmixed/htmlmixed.js"></script>
<script src="node_modules/codemirror/mode/smalltalk/smalltalk.js"></script>
<script src="node_modules/codemirror/mode/yaml/yaml.js"></script>
<script src="node_modules/codemirror/mode/python/python.js"></script>
<script src="browser/vendor/codemirror/lib/codemirror.js"></script>
<script src="browser/vendor/codemirror/mode/xml.js"></script>
<script src="browser/vendor/codemirror/mode/javascript.js"></script>
<script src="browser/vendor/codemirror/mode/css.js"></script>
<script src="browser/vendor/codemirror/mode/vbscript.js"></script>
<script src="browser/vendor/codemirror/mode/coffeescript.js"></script>
<script src="browser/vendor/codemirror/mode/clike.js"></script>
<script src="browser/vendor/codemirror/mode/htmlmixed.js"></script>
<script src="browser/vendor/codemirror/mode/smalltalk.js"></script>
<script src="browser/vendor/codemirror/mode/yaml.js"></script>
<script src="browser/vendor/codemirror/mode/python.js"></script>

<link rel="stylesheet" href="css/noflo-ui.css">

<link rel="import" href="elements/noflo-ui.html">
<link rel="import" href="node_modules/noflo-polymer/noflo-polymer/noflo-polymer.html">
<link rel="import" href="browser/vendor/noflo-polymer/noflo-polymer.html">
<noflo-polymer name="noflo-ui" inports="updated width height" outports="event"></noflo-polymer>
</head>
<body class="$NOFLO_THEME loading">
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Expand Up @@ -52,6 +52,7 @@
"coffee-loader": "^0.9.0",
"coffeelint": "^2.0.7",
"coffeescript": "^2.0.2",
"copy-webpack-plugin": "^4.5.0",
"fbp-loader": "^0.1.2",
"grunt": "^1.0.1",
"grunt-contrib-clean": "^1.0.0",
Expand Down
108 changes: 108 additions & 0 deletions webpack.config.js
View file
@@ -1,3 +1,5 @@
const CopyWebpackPlugin = require('copy-webpack-plugin');

module.exports = {
entry: './app/main.js',
output: {
Expand Down Expand Up @@ -76,6 +78,112 @@ module.exports = {
resolve: {
extensions: [".coffee", ".js"],
},
plugins: [
new CopyWebpackPlugin([
{
from: 'node_modules/@polymer/polymer/*.html',
to: 'browser/vendor/polymer',
flatten: true,
},
{
from: 'node_modules/@polymer/polymer/lib/elements/*.html',
to: 'browser/vendor/polymer/lib/elements',
flatten: true,
},
{
from: 'node_modules/@polymer/polymer/lib/legacy/*.html',
to: 'browser/vendor/polymer/lib/legacy',
flatten: true,
},
{
from: 'node_modules/@polymer/polymer/lib/mixins/*.html',
to: 'browser/vendor/polymer/lib/mixins',
flatten: true,
},
{
from: 'node_modules/@polymer/polymer/lib/utils/*.html',
to: 'browser/vendor/polymer/lib/utils',
flatten: true,
},
{
from: 'node_modules/noflo-polymer/noflo-polymer/noflo-polymer.html',
to: 'browser/vendor/noflo-polymer/noflo-polymer.html',
},
{
from: 'node_modules/codemirror/lib/codemirror.js',
to: 'browser/vendor/codemirror/lib/codemirror.js',
},
{
from: 'node_modules/codemirror/mode/xml/xml.js',
to: 'browser/vendor/codemirror/mode/xml.js',
},
{
from: 'node_modules/codemirror/mode/javascript/javascript.js',
to: 'browser/vendor/codemirror/mode/javascript.js',
},
{
from: 'node_modules/codemirror/mode/css/css.js',
to: 'browser/vendor/codemirror/mode/css.js',
},
{
from: 'node_modules/codemirror/mode/vbscript/vbscript.js',
to: 'browser/vendor/codemirror/mode/vbscript.js',
},
{
from: 'node_modules/codemirror/mode/coffeescript/coffeescript.js',
to: 'browser/vendor/codemirror/mode/coffeescript.js',
},
{
from: 'node_modules/codemirror/mode/clike/clike.js',
to: 'browser/vendor/codemirror/mode/clike.js',
},
{
from: 'node_modules/codemirror/mode/htmlmixed/htmlmixed.js',
to: 'browser/vendor/codemirror/mode/htmlmixed.js',
},
{
from: 'node_modules/codemirror/mode/smalltalk/smalltalk.js',
to: 'browser/vendor/codemirror/mode/smalltalk.js',
},
{
from: 'node_modules/codemirror/mode/yaml/yaml.js',
to: 'browser/vendor/codemirror/mode/yaml.js',
},
{
from: 'node_modules/codemirror/mode/python/python.js',
to: 'browser/vendor/codemirror/mode/python.js',
},
{
from: 'node_modules/font-awesome/fonts/*',
to: 'browser/vendor/font-awesome',
flatten: true,
},
{
from: 'node_modules/hammerjs/hammer.min.js',
to: 'browser/vendor/hammerjs/hammer.min.js',
},
{
from: 'node_modules/hammerjs/hammer.min.js.map',
to: 'browser/vendor/hammerjs/hammer.min.js.map',
},
{
from: 'node_modules/klayjs/klay.js',
to: 'browser/vendor/klayjs/klay.js',
},
{
from: 'node_modules/klayjs-noflo/klay-noflo.js',
to: 'browser/vendor/klayjs-noflo/klay-noflo.js',
},
{
from: 'node_modules/observe-js/src/observe.js',
to: 'browser/vendor/observe-js/observe.js',
},
{
from: 'node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js',
to: 'browser/vendor/webcomponentsjs/webcomponents-lite.js',
},
]),
],
node: {
child_process: 'empty',
fs: 'empty',
Expand Down

0 comments on commit 5c1eca8

Please sign in to comment.