Merge pull request #17 from continuumsecurity/dev

Fix problems with build aui missing files.
iriusrisk · Dec 24, 2018 · 9ba7a26 · 9ba7a26
2 parents c07a381 + 7c706e7
commit 9ba7a26
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 38 deletions.
diff --git a/build/aui/aui-min.js b/build/aui/aui-min.js
diff --git a/demos/surface/layout.soy b/demos/surface/layout.soy
@@ -15,7 +15,7 @@
         <title>{$title}</title>
         <link rel="stylesheet" href="../../build/aui-css/css/bootstrap.css">
         <link rel="stylesheet" href="assets/main.css">
-        <script src="../../build/aui/aui.js"></script>
+        <script src="../../build/aui/minify.js"></script>
     </head>
     <body>
     <div class="container-fluid">

diff --git a/tasks/build.js b/tasks/build.js
@@ -41,14 +41,14 @@ gulp.task('build-publish', function(callback) {
 });
 
 gulp.task('aui-postbuild', function (callback) {
-    run('aui-minify', 'aui-assets', 'aui-lang', 'clean-aui', callback)
+    run('build-minify', 'build-assets', 'build-lang', 'clean-prebuild', callback)
 });
 
 function build(cwd, callback) {
     var args = [];
     var cmd = 'shifter';
 
-    args.push('--build-dir=' + path.join(ROOT, 'aui'));
+    args.push('--build-dir=' + path.join(ROOT, 'prebuild'));
     args.push('--no-cache');
     args.push('--no-coverage');
     args.push('--no-lint');
@@ -90,7 +90,7 @@ gulp.task('build-base-debug', function(callback) {
 });
 
 gulp.task('build-loader-debug', function(callback) {
-    run('loader-prebuild', 'aliases', 'build-base-debug', 'loader-postbuild', callback);
+    run('loader-prebuild', 'aliases', 'build-base-debug', 'loader-postbuild-debug', callback);
 });
 
 gulp.task('build-publish-debug', function(callback) {

diff --git a/tasks/clean.js b/tasks/clean.js
@@ -17,8 +17,8 @@ gulp.task('clean-build', function(callback) {
     del(['build'], callback);
 });
 
-gulp.task('clean-aui', function (callback) {
-    del(['aui'], callback);
+gulp.task('clean-prebuild', function (callback) {
+    del(['prebuild'], callback);
 });
 
 gulp.task('clean-npm', function(callback) {

diff --git a/tasks/init.js b/tasks/init.js
@@ -38,8 +38,9 @@ gulp.task('init-npm', function(callback) {
 });
 
 gulp.task('init-yui', function() {
-    run('yui-minify', 'yui-assets', 'yui-lang')
-});
+    return gulp.src('bower_components/yui3/build/**', { cwd: ROOT })
+        .pipe(replace('@VERSION@', alloy.yuiversion, {skipBinary: true}))
+        .pipe(gulp.dest('prebuild', { cwd: ROOT }));});
 
 gulp.task('init-yui-debug', function() {
     return gulp.src('bower_components/yui3/build/**', { cwd: ROOT })

diff --git a/tasks/loader.js b/tasks/loader.js
@@ -28,6 +28,13 @@ gulp.task('loader-prebuild', function(callback) {
 });
 
 gulp.task('loader-postbuild', function() {
+    return gulp.src('prebuild/aui/*.js', { cwd: ROOT })
+        .pipe(replace(/\(yui\(/g, '(aui|yui('))
+        .pipe(insert.append('YUI.Env.core.push.apply(YUI.Env.core, ["aui-base-core"]);'))
+        .pipe(gulp.dest('prebuild/aui/', { cwd: ROOT }));
+});
+
+gulp.task('loader-postbuild-debug', function() {
     return gulp.src('build/aui/*.js', { cwd: ROOT })
         .pipe(replace(/\(yui\(/g, '(aui|yui('))
         .pipe(insert.append('YUI.Env.core.push.apply(YUI.Env.core, ["aui-base-core"]);'))

diff --git a/tasks/aui.js → tasks/minify.js b/tasks/aui.js → tasks/minify.js
@@ -5,20 +5,20 @@ var replace = require('gulp-replace');
 
 var ROOT = path.join(__dirname, '..');
 
-gulp.task('aui-minify', function () {
-    return gulp.src('aui/**/*+(-min.js|-min.css)', { cwd: ROOT })
+gulp.task('build-minify', function () {
+    return gulp.src('prebuild/**/*+(-min.js|-min.css)', { cwd: ROOT })
         .pipe(replace('@VERSION@', alloy.yuiversion, {skipBinary: true}))
         .pipe(gulp.dest('build', { cwd: ROOT }));
 });
 
-gulp.task('aui-assets', function () {
-    return gulp.src('aui/**/assets/**', { cwd: ROOT })
+gulp.task('build-assets', function () {
+    return gulp.src('prebuild/**/assets/**', { cwd: ROOT })
         .pipe(replace('@VERSION@', alloy.yuiversion, {skipBinary: true}))
         .pipe(gulp.dest('build', { cwd: ROOT }));
 });
 
-gulp.task('aui-lang', function () {
-    return gulp.src('aui/**/lang/**', { cwd: ROOT })
+gulp.task('build-lang', function () {
+    return gulp.src('prebuild/**/lang/**', { cwd: ROOT })
         .pipe(replace('@VERSION@', alloy.yuiversion, {skipBinary: true}))
         .pipe(gulp.dest('build', { cwd: ROOT }));
 });
diff --git a/tasks/yui.js b/tasks/yui.js