diff --git a/atmosphere-packages/webpack-dev-middleware/.versions b/atmosphere-packages/webpack-dev-middleware/.versions index 8dc6922..1dbf283 100644 --- a/atmosphere-packages/webpack-dev-middleware/.versions +++ b/atmosphere-packages/webpack-dev-middleware/.versions @@ -1,4 +1,4 @@ -ardatan:webpack-dev-middleware@0.0.3 +ardatan:webpack-dev-middleware@0.0.3_1 babel-compiler@7.0.6 babel-runtime@1.2.2 base64@1.0.11 diff --git a/atmosphere-packages/webpack-dev-middleware/dev-server.js b/atmosphere-packages/webpack-dev-middleware/dev-server.js index 5eaee6b..bc1c51b 100644 --- a/atmosphere-packages/webpack-dev-middleware/dev-server.js +++ b/atmosphere-packages/webpack-dev-middleware/dev-server.js @@ -108,10 +108,14 @@ function webpackHotServerMiddleware(multiCompiler) { const buffer = outputFs.readFileSync(filename); Meteor.server.method_handlers = {}; Meteor.server.publish_handlers = {}; - const requireFromString =Npm.require(path.join(projectPath, 'node_modules/require-from-string')); - interopRequireDefault( - requireFromString(buffer.toString(),filename) - ); + try{ + const requireFromString =Npm.require(path.join(projectPath, 'node_modules/require-from-string')); + interopRequireDefault( + requireFromString(buffer.toString(),filename) + ); + }catch(e){ + console.log(e) + } }; if (multiCompiler.hooks) { diff --git a/atmosphere-packages/webpack-dev-middleware/package.js b/atmosphere-packages/webpack-dev-middleware/package.js index a030aa4..cfda068 100644 --- a/atmosphere-packages/webpack-dev-middleware/package.js +++ b/atmosphere-packages/webpack-dev-middleware/package.js @@ -1,7 +1,7 @@ Package.describe({ name: 'ardatan:webpack-dev-middleware', debugOnly: true, - version: '0.0.3', + version: '0.0.3_1', summary: 'Webpack Dev Middleware for Meteor', git: 'https://github.com/ardatan/meteor-webpack', documentation: '../../README.md' diff --git a/atmosphere-packages/webpack/.versions b/atmosphere-packages/webpack/.versions index e286b17..de9bf86 100644 --- a/atmosphere-packages/webpack/.versions +++ b/atmosphere-packages/webpack/.versions @@ -1,2 +1,2 @@ -ardatan:webpack@0.0.3 +ardatan:webpack@0.0.3_1 meteor@1.8.6 diff --git a/atmosphere-packages/webpack/package.js b/atmosphere-packages/webpack/package.js index 5afcbc0..ce26af8 100644 --- a/atmosphere-packages/webpack/package.js +++ b/atmosphere-packages/webpack/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ardatan:webpack', - version: '0.0.3', + version: '0.0.3_1', summary: 'Webpack Integration for Meteor', git: 'https://github.com/ardatan/meteor-webpack', documentation: '../../README.md' diff --git a/atmosphere-packages/webpack/plugin.js b/atmosphere-packages/webpack/plugin.js index 84e4eae..19fda30 100644 --- a/atmosphere-packages/webpack/plugin.js +++ b/atmosphere-packages/webpack/plugin.js @@ -17,7 +17,7 @@ Plugin.registerCompiler({ const compilerCacheHashMap = {}; return { - constructNewCompilerForTarget(targetPlatform, targetFile) { + constructNewCompilerForTarget(compilerCache, targetPlatform, targetFile) { let allWebpackConfigs = requireFromString(targetFile.getContentsAsString()); if (!(allWebpackConfigs instanceof Array)) { @@ -78,7 +78,7 @@ Plugin.registerCompiler({ const targetPlatform = targetFile.getArch().includes('web') ? 'web' : 'node'; if (typeof compilerCache[targetPlatform] === 'undefined') { - this.constructNewCompilerForTarget(targetPlatform, targetFile) + this.constructNewCompilerForTarget(compilerCache, targetPlatform, targetFile) } if (compilerCache[targetPlatform] == null) { diff --git a/examples/angular/.meteor/versions b/examples/angular/.meteor/versions index 6c038f9..1e19a77 100644 --- a/examples/angular/.meteor/versions +++ b/examples/angular/.meteor/versions @@ -1,8 +1,8 @@ allow-deny@1.1.0 -ardatan:webpack@0.0.2 -ardatan:webpack-dev-middleware@0.0.2 +ardatan:webpack@0.0.3_1 +ardatan:webpack-dev-middleware@0.0.3_1 autoupdate@1.4.0 -babel-compiler@7.0.7 +babel-compiler@7.0.8 babel-runtime@1.2.2 base64@1.0.11 binary-heap@1.0.10 @@ -15,7 +15,7 @@ ddp-common@1.4.0 ddp-server@2.1.2 diff-sequence@1.1.0 dynamic-import@0.3.0 -ecmascript@0.10.7 +ecmascript@0.10.8 ecmascript-runtime@0.5.0 ecmascript-runtime-client@0.6.2 ecmascript-runtime-server@0.5.0 @@ -23,7 +23,7 @@ ejson@1.1.0 es5-shim@4.7.3 geojson-utils@1.0.10 hot-code-push@1.0.4 -http@1.4.0 +http@1.4.1 id-map@1.1.0 launch-screen@1.1.1 livedata@1.0.18 diff --git a/examples/angular/webpack.config.js b/examples/angular/webpack.config.js index f512f6d..18fc4ef 100644 --- a/examples/angular/webpack.config.js +++ b/examples/angular/webpack.config.js @@ -72,6 +72,9 @@ const serverConfig = { ], output: { filename: 'bundle.js' + }, + devServer: { + hot: true } } module.exports = [clientConfig, serverConfig]; \ No newline at end of file diff --git a/examples/react/.meteor/versions b/examples/react/.meteor/versions index 42ff0ec..e8b6462 100644 --- a/examples/react/.meteor/versions +++ b/examples/react/.meteor/versions @@ -1,93 +1,93 @@ -accounts-base@1.4.2 -accounts-password@1.5.1 -accounts-ui@1.3.0 -accounts-ui-unstyled@1.4.1 -allow-deny@1.1.0 -ardatan:webpack@0.0.2 -ardatan:webpack-dev-middleware@0.0.2 -autoupdate@1.4.0 -babel-compiler@7.0.7 -babel-runtime@1.2.2 -base64@1.0.11 -binary-heap@1.0.10 -blaze@2.3.2 -blaze-tools@1.0.10 -boilerplate-generator@1.4.0 -caching-compiler@1.1.11 -caching-html-compiler@1.1.2 -callback-hook@1.1.0 -check@1.3.1 -ddp@1.4.0 -ddp-client@2.3.2 -ddp-common@1.4.0 -ddp-rate-limiter@1.0.7 -ddp-server@2.1.2 -deps@1.0.12 -diff-sequence@1.1.0 -dynamic-import@0.3.0 -ecmascript@0.10.7 -ecmascript-runtime@0.5.0 -ecmascript-runtime-client@0.6.2 -ecmascript-runtime-server@0.5.0 -ejson@1.1.0 -email@1.2.3 -es5-shim@4.7.3 -geojson-utils@1.0.10 -hot-code-push@1.0.4 -html-tools@1.0.11 -htmljs@1.0.11 -http@1.4.0 -id-map@1.1.0 -jquery@1.11.11 -launch-screen@1.1.1 -less@2.7.12 -livedata@1.0.18 -localstorage@1.2.0 -logging@1.1.20 -meteor@1.8.6 -meteor-base@1.3.0 -minifier-css@1.3.1 -minifier-js@2.3.4 -minimongo@1.4.4 -mobile-experience@1.0.5 -mobile-status-bar@1.0.14 -modules@0.11.6 -modules-runtime@0.9.2 -mongo@1.4.7 -mongo-dev-server@1.1.0 -mongo-id@1.0.7 -npm-bcrypt@0.9.3 -npm-mongo@2.2.34 -observe-sequence@1.0.16 -ordered-dict@1.1.0 -promise@0.10.2 -random@1.1.0 -rate-limit@1.0.9 -react-meteor-data@0.2.16 -reactive-dict@1.2.0 -reactive-var@1.0.11 -reload@1.2.0 -retry@1.1.0 -routepolicy@1.0.13 -server-render@0.3.0 -service-configuration@1.0.11 -session@1.1.7 -sha@1.0.9 -shell-server@0.3.1 -shim-common@0.1.0 -socket-stream-client@0.1.0 -spacebars@1.0.15 -spacebars-compiler@1.1.3 -srp@1.0.10 -standard-minifier-css@1.4.1 -standard-minifier-js@2.3.3 -templating@1.3.2 -templating-compiler@1.3.3 -templating-runtime@1.3.2 -templating-tools@1.1.2 -tmeasday:check-npm-versions@0.3.2 -tracker@1.1.3 -underscore@1.0.10 -url@1.2.0 -webapp@1.5.0 -webapp-hashing@1.0.9 +accounts-base@1.4.2 +accounts-password@1.5.1 +accounts-ui@1.3.0 +accounts-ui-unstyled@1.4.1 +allow-deny@1.1.0 +ardatan:webpack@0.0.3_1 +ardatan:webpack-dev-middleware@0.0.3_1 +autoupdate@1.4.0 +babel-compiler@7.0.8 +babel-runtime@1.2.2 +base64@1.0.11 +binary-heap@1.0.10 +blaze@2.3.2 +blaze-tools@1.0.10 +boilerplate-generator@1.4.0 +caching-compiler@1.1.11 +caching-html-compiler@1.1.2 +callback-hook@1.1.0 +check@1.3.1 +ddp@1.4.0 +ddp-client@2.3.2 +ddp-common@1.4.0 +ddp-rate-limiter@1.0.7 +ddp-server@2.1.2 +deps@1.0.12 +diff-sequence@1.1.0 +dynamic-import@0.3.0 +ecmascript@0.10.8 +ecmascript-runtime@0.5.0 +ecmascript-runtime-client@0.6.2 +ecmascript-runtime-server@0.5.0 +ejson@1.1.0 +email@1.2.3 +es5-shim@4.7.3 +geojson-utils@1.0.10 +hot-code-push@1.0.4 +html-tools@1.0.11 +htmljs@1.0.11 +http@1.4.1 +id-map@1.1.0 +jquery@1.11.11 +launch-screen@1.1.1 +less@2.7.12 +livedata@1.0.18 +localstorage@1.2.0 +logging@1.1.20 +meteor@1.8.6 +meteor-base@1.3.0 +minifier-css@1.3.1 +minifier-js@2.3.4 +minimongo@1.4.4 +mobile-experience@1.0.5 +mobile-status-bar@1.0.14 +modules@0.11.6 +modules-runtime@0.9.2 +mongo@1.4.7 +mongo-dev-server@1.1.0 +mongo-id@1.0.7 +npm-bcrypt@0.9.3 +npm-mongo@2.2.34 +observe-sequence@1.0.16 +ordered-dict@1.1.0 +promise@0.10.2 +random@1.1.0 +rate-limit@1.0.9 +react-meteor-data@0.2.16 +reactive-dict@1.2.0 +reactive-var@1.0.11 +reload@1.2.0 +retry@1.1.0 +routepolicy@1.0.13 +server-render@0.3.0 +service-configuration@1.0.11 +session@1.1.7 +sha@1.0.9 +shell-server@0.3.1 +shim-common@0.1.0 +socket-stream-client@0.1.0 +spacebars@1.0.15 +spacebars-compiler@1.1.3 +srp@1.0.10 +standard-minifier-css@1.4.1 +standard-minifier-js@2.3.3 +templating@1.3.2 +templating-compiler@1.3.3 +templating-runtime@1.3.2 +templating-tools@1.1.2 +tmeasday:check-npm-versions@0.3.2 +tracker@1.1.3 +underscore@1.0.10 +url@1.2.0 +webapp@1.5.0 +webapp-hashing@1.0.9 diff --git a/examples/react/.meteorignore b/examples/react/.meteorignore new file mode 100644 index 0000000..a725ff3 --- /dev/null +++ b/examples/react/.meteorignore @@ -0,0 +1,2 @@ +client/ +server/ \ No newline at end of file diff --git a/examples/react/webpack.config.js b/examples/react/webpack.config.js index c8cf764..ddb3d95 100644 --- a/examples/react/webpack.config.js +++ b/examples/react/webpack.config.js @@ -39,7 +39,10 @@ const serverConfig = { entry: [ './server/main.js' ], - target: 'node' + target: 'node', + devServer: { + hot: true + } }; module.exports = [clientConfig, serverConfig]; \ No newline at end of file diff --git a/examples/vanilla/.meteor/release b/examples/vanilla/.meteor/release index d502dc0..011385b 100644 --- a/examples/vanilla/.meteor/release +++ b/examples/vanilla/.meteor/release @@ -1 +1 @@ -METEOR@1.6.1 +METEOR@1.6.1.1 diff --git a/examples/vanilla/.meteor/versions b/examples/vanilla/.meteor/versions index b1518a7..158a95d 100644 --- a/examples/vanilla/.meteor/versions +++ b/examples/vanilla/.meteor/versions @@ -1,8 +1,8 @@ allow-deny@1.1.0 -ardatan:webpack@0.0.2 -ardatan:webpack-dev-middleware@0.0.2 +ardatan:webpack@0.0.3_1 +ardatan:webpack-dev-middleware@0.0.3_1 autoupdate@1.4.0 -babel-compiler@7.0.6 +babel-compiler@7.0.8 babel-runtime@1.2.2 base64@1.0.11 binary-heap@1.0.10 @@ -15,7 +15,7 @@ ddp-common@1.4.0 ddp-server@2.1.2 diff-sequence@1.1.0 dynamic-import@0.3.0 -ecmascript@0.10.6 +ecmascript@0.10.8 ecmascript-runtime@0.5.0 ecmascript-runtime-client@0.6.2 ecmascript-runtime-server@0.5.0 @@ -23,7 +23,7 @@ ejson@1.1.0 es5-shim@4.7.3 geojson-utils@1.0.10 hot-code-push@1.0.4 -http@1.4.0 +http@1.4.1 id-map@1.1.0 launch-screen@1.1.1 livedata@1.0.18 @@ -35,9 +35,9 @@ minifier-js@2.3.4 minimongo@1.4.4 mobile-experience@1.0.5 mobile-status-bar@1.0.14 -modules@0.11.5 +modules@0.11.6 modules-runtime@0.9.2 -mongo@1.4.5 +mongo@1.4.7 mongo-dev-server@1.1.0 mongo-id@1.0.7 npm-mongo@2.2.34 diff --git a/examples/vue/.meteor/release b/examples/vue/.meteor/release index d502dc0..011385b 100644 --- a/examples/vue/.meteor/release +++ b/examples/vue/.meteor/release @@ -1 +1 @@ -METEOR@1.6.1 +METEOR@1.6.1.1 diff --git a/examples/vue/.meteor/versions b/examples/vue/.meteor/versions index e4833f8..7d191f6 100644 --- a/examples/vue/.meteor/versions +++ b/examples/vue/.meteor/versions @@ -1,91 +1,91 @@ -accounts-base@1.4.2 -accounts-password@1.5.1 -accounts-ui@1.3.0 -accounts-ui-unstyled@1.4.0 -allow-deny@1.1.0 -ardatan:webpack@0.0.1_1 -ardatan:webpack-dev-middleware@0.0.1 -autoupdate@1.4.0 -babel-compiler@7.0.6 -babel-runtime@1.2.2 -base64@1.0.11 -binary-heap@1.0.10 -blaze@2.3.2 -blaze-tools@1.0.10 -boilerplate-generator@1.4.0 -caching-compiler@1.1.11 -caching-html-compiler@1.1.2 -callback-hook@1.1.0 -check@1.3.1 -ddp@1.4.0 -ddp-client@2.3.2 -ddp-common@1.4.0 -ddp-rate-limiter@1.0.7 -ddp-server@2.1.2 -deps@1.0.12 -diff-sequence@1.1.0 -dynamic-import@0.3.0 -ecmascript@0.10.6 -ecmascript-runtime@0.5.0 -ecmascript-runtime-client@0.6.2 -ecmascript-runtime-server@0.5.0 -ejson@1.1.0 -email@1.2.3 -es5-shim@4.7.3 -geojson-utils@1.0.10 -hot-code-push@1.0.4 -html-tools@1.0.11 -htmljs@1.0.11 -http@1.4.0 -id-map@1.1.0 -jquery@1.11.11 -launch-screen@1.1.1 -less@2.7.12 -livedata@1.0.18 -localstorage@1.2.0 -logging@1.1.20 -meteor@1.8.6 -meteor-base@1.3.0 -minifier-css@1.3.1 -minifier-js@2.3.4 -minimongo@1.4.4 -mobile-experience@1.0.5 -mobile-status-bar@1.0.14 -modules@0.11.5 -modules-runtime@0.9.2 -mongo@1.4.5 -mongo-dev-server@1.1.0 -mongo-id@1.0.7 -npm-bcrypt@0.9.3 -npm-mongo@2.2.34 -observe-sequence@1.0.16 -ordered-dict@1.1.0 -promise@0.10.2 -random@1.1.0 -rate-limit@1.0.9 -reactive-dict@1.2.0 -reactive-var@1.0.11 -reload@1.2.0 -retry@1.1.0 -routepolicy@1.0.13 -server-render@0.3.0 -service-configuration@1.0.11 -session@1.1.7 -sha@1.0.9 -shell-server@0.3.1 -shim-common@0.1.0 -socket-stream-client@0.1.0 -spacebars@1.0.15 -spacebars-compiler@1.1.3 -srp@1.0.10 -standard-minifier-css@1.4.1 -standard-minifier-js@2.3.3 -templating@1.3.2 -templating-compiler@1.3.3 -templating-runtime@1.3.2 -templating-tools@1.1.2 -tracker@1.1.3 -underscore@1.0.10 -url@1.2.0 -webapp@1.5.0 -webapp-hashing@1.0.9 +accounts-base@1.4.2 +accounts-password@1.5.1 +accounts-ui@1.3.0 +accounts-ui-unstyled@1.4.1 +allow-deny@1.1.0 +ardatan:webpack@0.0.3_1 +ardatan:webpack-dev-middleware@0.0.3_1 +autoupdate@1.4.0 +babel-compiler@7.0.8 +babel-runtime@1.2.2 +base64@1.0.11 +binary-heap@1.0.10 +blaze@2.3.2 +blaze-tools@1.0.10 +boilerplate-generator@1.4.0 +caching-compiler@1.1.11 +caching-html-compiler@1.1.2 +callback-hook@1.1.0 +check@1.3.1 +ddp@1.4.0 +ddp-client@2.3.2 +ddp-common@1.4.0 +ddp-rate-limiter@1.0.7 +ddp-server@2.1.2 +deps@1.0.12 +diff-sequence@1.1.0 +dynamic-import@0.3.0 +ecmascript@0.10.8 +ecmascript-runtime@0.5.0 +ecmascript-runtime-client@0.6.2 +ecmascript-runtime-server@0.5.0 +ejson@1.1.0 +email@1.2.3 +es5-shim@4.7.3 +geojson-utils@1.0.10 +hot-code-push@1.0.4 +html-tools@1.0.11 +htmljs@1.0.11 +http@1.4.1 +id-map@1.1.0 +jquery@1.11.11 +launch-screen@1.1.1 +less@2.7.12 +livedata@1.0.18 +localstorage@1.2.0 +logging@1.1.20 +meteor@1.8.6 +meteor-base@1.3.0 +minifier-css@1.3.1 +minifier-js@2.3.4 +minimongo@1.4.4 +mobile-experience@1.0.5 +mobile-status-bar@1.0.14 +modules@0.11.6 +modules-runtime@0.9.2 +mongo@1.4.7 +mongo-dev-server@1.1.0 +mongo-id@1.0.7 +npm-bcrypt@0.9.3 +npm-mongo@2.2.34 +observe-sequence@1.0.16 +ordered-dict@1.1.0 +promise@0.10.2 +random@1.1.0 +rate-limit@1.0.9 +reactive-dict@1.2.0 +reactive-var@1.0.11 +reload@1.2.0 +retry@1.1.0 +routepolicy@1.0.13 +server-render@0.3.0 +service-configuration@1.0.11 +session@1.1.7 +sha@1.0.9 +shell-server@0.3.1 +shim-common@0.1.0 +socket-stream-client@0.1.0 +spacebars@1.0.15 +spacebars-compiler@1.1.3 +srp@1.0.10 +standard-minifier-css@1.4.1 +standard-minifier-js@2.3.3 +templating@1.3.2 +templating-compiler@1.3.3 +templating-runtime@1.3.2 +templating-tools@1.1.2 +tracker@1.1.3 +underscore@1.0.10 +url@1.2.0 +webapp@1.5.0 +webapp-hashing@1.0.9 diff --git a/examples/vue/.meteorignore b/examples/vue/.meteorignore new file mode 100644 index 0000000..a725ff3 --- /dev/null +++ b/examples/vue/.meteorignore @@ -0,0 +1,2 @@ +client/ +server/ \ No newline at end of file diff --git a/examples/vue/webpack.config.js b/examples/vue/webpack.config.js index 3dad268..7ec33e0 100644 --- a/examples/vue/webpack.config.js +++ b/examples/vue/webpack.config.js @@ -66,7 +66,10 @@ const clientConfig = { const serverConfig = { entry: './server/main.js', - target: 'node' + target: 'node', + devServer: { + hot: true + }, }; module.exports = [clientConfig, serverConfig]; \ No newline at end of file diff --git a/publish.sh b/publish.sh new file mode 100644 index 0000000..83f2743 --- /dev/null +++ b/publish.sh @@ -0,0 +1,6 @@ +(cd atmosphere-packages/webpack && meteor publish) +(cd atmosphere-packages/webpack-dev-middleware && meteor publish) +(cd examples/angular && meteor update --allow-incompatible-update --all-packages) +(cd examples/react && meteor update --allow-incompatible-update --all-packages) +(cd examples/vanilla && meteor update --allow-incompatible-update --all-packages) +(cd examples/vue && meteor update --allow-incompatible-update --all-packages) \ No newline at end of file