Skip to content

Commit

Permalink
Merge pull request #11 from miyaoka/fix/content-loading
Browse files Browse the repository at this point in the history
Resolve calling content method
  • Loading branch information
miyaoka committed Feb 21, 2017
2 parents bd9863f + c794382 commit f437ff2
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "japari-pedia",
"version": "1.1.1",
"version": "1.1.2",
"description": "Welcome to youkoso japari-park!",
"keywords": [
"chrome-extension",
Expand Down
File renamed without changes.
7 changes: 3 additions & 4 deletions src/chrome_extension/content/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import enabler from './enabler'
import content from './content'

enabler(() => {
require('./content')
})
console.log('content')
content()
5 changes: 5 additions & 0 deletions src/chrome_extension/content/prod.loader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import enabler from './enabler'

enabler(() => {
require('./content').default()
})
4 changes: 2 additions & 2 deletions webpack/dev.config.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ const contentPath = path.join(__dirname, '../src', 'chrome_extension', 'content'

const devConf = {
entry: {
content: path.join(contentPath, 'content.js'),
content_loader: path.join(contentPath, 'loader.js'),
content: path.join(contentPath),
content_loader: path.join(contentPath, 'dev.loader'),
},
devServer: {
contentBase: 'build',
Expand Down
2 changes: 1 addition & 1 deletion webpack/prod.config.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ manifest()

const prodConf = {
entry: {
content: path.join(__dirname, '../src', 'chrome_extension', 'content'),
content: path.join(__dirname, '../src', 'chrome_extension', 'content', 'prod.loader'),
},
plugins: [
new UglifyJSPlugin(),
Expand Down

0 comments on commit f437ff2

Please sign in to comment.