Author: jruchaud Date: 2015-05-26 13:36:01 +0000 (Tue, 26 May 2015) New Revision: 1485 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1485 Log: Begin fix module Modified: wit/gulpfile.js wit/index.html wit/js/App.js wit/js/main.js Modified: wit/gulpfile.js =================================================================== --- wit/gulpfile.js 2015-05-26 13:22:45 UTC (rev 1484) +++ wit/gulpfile.js 2015-05-26 13:36:01 UTC (rev 1485) @@ -33,7 +33,7 @@ gulp.task("scripts", function() { return gulp.src(paths.scripts) - .pipe(sourcemaps.init()) + //.pipe(sourcemaps.init()) .pipe(babel({ blacklist: [ "es3.memberExpressionLiterals", @@ -67,8 +67,8 @@ ] })) .on("error", standardHandler) - .pipe(concat("all.min.js")) - .pipe(sourcemaps.write(".")) + //.pipe(concat("all.min.js")) + //.pipe(sourcemaps.write(".")) .pipe(gulp.dest(paths.build)); }); @@ -77,7 +77,7 @@ .pipe(less({ paths: [path.join(__dirname, "less", "includes")] })) - .pipe(gulp.dest(paths.build)); + .pipe(gulp.dest(path.join(paths.build))); }); gulp.task("watch", function() { Modified: wit/index.html =================================================================== --- wit/index.html 2015-05-26 13:22:45 UTC (rev 1484) +++ wit/index.html 2015-05-26 13:36:01 UTC (rev 1485) @@ -8,8 +8,9 @@ global.localStorage = window.localStorage; global.localStorage = window.localStorage; </script> + <!-- For React --> - <script type="text/javascript" src="build/all.min.js"></script> + <script type="text/javascript" src="build/main.js"></script> <!-- For Bootstrap --> <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> Modified: wit/js/App.js =================================================================== --- wit/js/App.js 2015-05-26 13:22:45 UTC (rev 1484) +++ wit/js/App.js 2015-05-26 13:36:01 UTC (rev 1485) @@ -1,8 +1,8 @@ "use strict"; var React = require("react"); -var Routes = require("./js/router/Routes.js"); -var Link = require("./js/router/Link.js"); +var Routes = require("./router/Routes.js"); +var Link = require("./router/Link.js"); module.exports = class extends React.Component { Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-26 13:22:45 UTC (rev 1484) +++ wit/js/main.js 2015-05-26 13:36:01 UTC (rev 1485) @@ -28,7 +28,7 @@ // React conf // var React = require("react"); -var App = require("./App.js"); +var App = require("./build/App.js"); React.render(<App/>, document.body); var popups = [];