fix(less): update less file references

Ensure less files deployed with NPM and Bower can be compiled individually BREAKING CHANGE: feature less files have been moved to the root of the less folder.
angular-ui · Dec 21, 2018 · 47c1239 · 47c1239
1 parent c13c931
commit 47c1239
Show file tree

Hide file tree

Showing 19 changed files with 69 additions and 17 deletions.
diff --git a/grunt/aliases.js b/grunt/aliases.js
@@ -11,6 +11,7 @@ module.exports = function (grunt, options) {
 
     // Build with no testing
     'build': ['ngtemplates', 'concat', 'uglify', 'less', 'uidocs-generator', 'copy:font_dist', 'copy:site', 'copy:less_customizer',],
+    'build:less_dist': ['copy:less_dist', 'replace:less_dist'],
 
     // Auto-test tasks for development
     'autotest:unit': ['karmangular:start'],
@@ -48,10 +49,10 @@ module.exports = function (grunt, options) {
   var currentTag = semver.clean( util.getCurrentTag() );
 
   if (currentTag) {
-    baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
+    baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'build:less_dist', 'cut-release', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
   }
   else {
-    baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release'];
+    baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'build:less_dist', 'cut-release'];
   }
 
   return baseTasks;

diff --git a/grunt/replace.js b/grunt/replace.js
@@ -0,0 +1,19 @@
+module.exports = {
+    less_dist: {
+        options: {
+            patterns: [
+                {
+                    match: /..\/..\/..\/core\/src\/less\//g,
+                    replace: './'
+                }
+            ]
+        },
+        files: [
+            {
+                expand: true,
+                src: '<%= dist %>/release/less/*.less',
+                dest: './'
+            }
+        ]
+    }
+};
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -55,6 +55,7 @@
     "grunt-karma": "~2.0.0",
     "grunt-newer": "^1.3.0",
     "grunt-protractor-runner": "^5.0.0",
+    "grunt-replace": "^1.0.1",
     "grunt-shell-spawn": "~0.3.10",
     "grunt-uidocs-generator": "^0.6.1",
     "hoek": "^5.0.3",

diff --git a/packages/cellnav/src/less/cellNav.less b/packages/cellnav/src/less/cellNav.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-cell-focus {
   outline: 0;

diff --git a/packages/edit/src/less/edit.less b/packages/edit/src/less/edit.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-cell {
   input {

diff --git a/packages/empty-base-layer/src/less/emptyBaseLayer.less b/packages/empty-base-layer/src/less/emptyBaseLayer.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-viewport .ui-grid-empty-base-layer-container {
   position: absolute;

diff --git a/packages/expandable/src/less/expandable.less b/packages/expandable/src/less/expandable.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .expandableRow {
   .ui-grid-row {

diff --git a/packages/exporter/src/less/exporter.less b/packages/exporter/src/less/exporter.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-exporter-header {
 }
diff --git a/packages/grouping/src/less/grouping.less b/packages/grouping/src/less/grouping.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-tree-header-row {
   font-weight: bold !important;

diff --git a/packages/importer/src/less/importer.less b/packages/importer/src/less/importer.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-importer-header {
 }
diff --git a/packages/move-columns/src/less/colMovable.less b/packages/move-columns/src/less/colMovable.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .movingColumn {
   position: absolute;

diff --git a/packages/pinning/src/less/pinning.less b/packages/pinning/src/less/pinning.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-pinned-container {
   position: absolute;

diff --git a/packages/resize-columns/src/less/column-resizer.less b/packages/resize-columns/src/less/column-resizer.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-column-resizer {
   top: 0;

diff --git a/packages/row-edit/src/less/rowEdit.less b/packages/row-edit/src/less/rowEdit.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-row-saving {
    .ui-grid-cell {

diff --git a/packages/selection/src/less/selection.less b/packages/selection/src/less/selection.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-row.ui-grid-row-selected > [ui-grid-row] > .ui-grid-cell {
   background-color: @rowSelected;

diff --git a/packages/tree-base/src/less/tree-base.less b/packages/tree-base/src/less/tree-base.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-tree-row-header-buttons.ui-grid-tree-header {
   cursor: pointer;

diff --git a/packages/tree-view/src/less/tree-view.less b/packages/tree-view/src/less/tree-view.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-tree-header-row {
   font-weight: bold !important;

diff --git a/packages/validate/src/less/validate.less b/packages/validate/src/less/validate.less
@@ -1,4 +1,4 @@
-@import '../../../core/src/less/variables';
+@import (reference) '../../../core/src/less/variables';
 
 .ui-grid-cell-contents.invalid {
   border: @invalidValueBorder;