Skip to content
This repository was archived by the owner on Sep 30, 2019. It is now read-only.

Commit

Permalink
Switch to english everywhere, add sub-sub-project
Browse files Browse the repository at this point in the history
  • Loading branch information
juhoojala committed Jan 14, 2016
1 parent 260d7b6 commit da24540
Show file tree
Hide file tree
Showing 13 changed files with 56 additions and 76 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Thumbs.db

# npm
/node_modules/*
!/node_modules/testi-projekti
!/node_modules/sub-project

npm-debug.log

Expand Down
1 change: 1 addition & 0 deletions node_modules/sub-project/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions node_modules/sub-project/node_modules/sub-sub-project/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions node_modules/sub-project/node_modules/sub-sub-project/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions node_modules/sub-project/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion node_modules/testi-projekti/.gitignore

This file was deleted.

24 changes: 0 additions & 24 deletions node_modules/testi-projekti/package.json

This file was deleted.

45 changes: 0 additions & 45 deletions node_modules/testi-projekti/webpack.config.js

This file was deleted.

6 changes: 3 additions & 3 deletions src/components/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import CompositionOverridesDemo from './4-CompositionOverrides/CompositionOverri
import ScopedAnimationsDemo from './5-ScopedAnimations/ScopedAnimationsDemo';

var url = require("file-loader!./camel.jpg");
var Testi = require('testi-projekti');

var Testi = require('sub-project');


export default class App extends Component {
Expand All @@ -20,8 +21,7 @@ export default class App extends Component {
<Logo />

<div>
Kameli javascriptistä omasta projektista jep

Camel from root project via javascript
<div>
<img src={url} style={{width: 500}} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = {
test: /\.js$/,
loaders: ['react-hot', 'babel-loader'],
//exclude: ['node_modules'],
include: [path.resolve(__dirname, "src"), path.resolve(__dirname, 'node_modules/testi-projekti')]
include: [path.resolve(__dirname, "src"), path.resolve(__dirname, 'node_modules/sub-project')]
},
{
test: /\.css$/,
Expand Down

0 comments on commit da24540

Please sign in to comment.