Fixes #3504 / organizes tests (#3523)

* Fixes #3504 / organizes tests
less · Jun 22, 2020 · 51fb02b · 51fb02b
1 parent efb76ec
commit 51fb02b
Show file tree

Hide file tree

Showing 214 changed files with 81 additions and 66 deletions.
diff --git a/packages/less/Gruntfile.js b/packages/less/Gruntfile.js
@@ -235,31 +235,31 @@ module.exports = function(grunt) {
                     // @TODO: make this more thorough
                     // CURRENT OPTIONS
                     // --math
-                    "node bin/lessc --math=always test/less/lazy-eval.less tmp/lazy-eval.css",
-                    "node bin/lessc --math=parens-division test/less/lazy-eval.less tmp/lazy-eval.css",
-                    "node bin/lessc --math=parens test/less/lazy-eval.less tmp/lazy-eval.css",
-                    "node bin/lessc --math=strict test/less/lazy-eval.less tmp/lazy-eval.css",
-                    "node bin/lessc --math=strict-legacy test/less/lazy-eval.less tmp/lazy-eval.css",
+                    "node bin/lessc --math=always test/less/_main/lazy-eval.less tmp/lazy-eval.css",
+                    "node bin/lessc --math=parens-division test/less/_main/lazy-eval.less tmp/lazy-eval.css",
+                    "node bin/lessc --math=parens test/less/_main/lazy-eval.less tmp/lazy-eval.css",
+                    "node bin/lessc --math=strict test/less/_main/lazy-eval.less tmp/lazy-eval.css",
+                    "node bin/lessc --math=strict-legacy test/less/_main/lazy-eval.less tmp/lazy-eval.css",
 
                     // DEPRECATED OPTIONS
                     // --strict-math
-                    "node bin/lessc --strict-math=on test/less/lazy-eval.less tmp/lazy-eval.css"
+                    "node bin/lessc --strict-math=on test/less/_main/lazy-eval.less tmp/lazy-eval.css"
                 ].join(" && ")
             },
             plugin: {
                 command: [
-                    'node bin/lessc --clean-css="--s1 --advanced" test/less/lazy-eval.less tmp/lazy-eval.css',
+                    'node bin/lessc --clean-css="--s1 --advanced" test/less/_main/lazy-eval.less tmp/lazy-eval.css',
                     "cd lib",
-                    'node ../bin/lessc --clean-css="--s1 --advanced" ../test/less/lazy-eval.less ../tmp/lazy-eval.css',
+                    'node ../bin/lessc --clean-css="--s1 --advanced" ../test/less/_main/lazy-eval.less ../tmp/lazy-eval.css',
                     "cd ..",
                     // Test multiple plugins
-                    'node bin/lessc --plugin=clean-css="--s1 --advanced" --plugin=autoprefix="ie 11,Edge >= 13,Chrome >= 47,Firefox >= 45,iOS >= 9.2,Safari >= 9" test/less/lazy-eval.less tmp/lazy-eval.css'
+                    'node bin/lessc --plugin=clean-css="--s1 --advanced" --plugin=autoprefix="ie 11,Edge >= 13,Chrome >= 47,Firefox >= 45,iOS >= 9.2,Safari >= 9" test/less/_main/lazy-eval.less tmp/lazy-eval.css'
                 ].join(" && ")
             },
             "sourcemap-test": {
                 // quoted value doesn't seem to get picked up by time-grunt, or isn't output, at least; maybe just "sourcemap" is fine?
                 command: [
-                    "node bin/lessc --source-map=test/sourcemaps/maps/import-map.map test/less/import.less test/sourcemaps/import.css",
+                    "node bin/lessc --source-map=test/sourcemaps/maps/import-map.map test/less/_main/import.less test/sourcemaps/import.css",
                     "node bin/lessc --source-map test/less/sourcemaps/basic.less test/sourcemaps/basic.css"
                 ].join(" && ")
             }

diff --git a/packages/less/lib/less/tree/import.js b/packages/less/lib/less/tree/import.js
diff --git a/packages/less/lib/less/tree/import.js.map b/packages/less/lib/less/tree/import.js.map
diff --git a/packages/less/src/less/tree/import.js b/packages/less/src/less/tree/import.js
@@ -171,11 +171,13 @@ class Import extends Node {
                 throw this.error;
             }
             return newImport;
-        } else {
+        } else if (this.root) {
             ruleset = new Ruleset(null, utils.copyArray(this.root.rules));
             ruleset.evalImports(context);
 
             return this.features ? new Media(ruleset.rules, this.features.value) : ruleset.rules;
+        } else {
+            return [];
         }
     }
 }

diff --git a/packages/less/test/README.md b/packages/less/test/README.md
@@ -0,0 +1,3 @@
+Tests are generally organized in the `less/` folder by what options are set in index.js.
+
+The main tests are located under `less/_main/`
diff --git a/packages/less/test/browser/generator/runner.config.js b/packages/less/test/browser/generator/runner.config.js
@@ -3,14 +3,14 @@ module.exports = {
     main: {
     // src is used to build list of less files to compile
         src: [
-            "test/less/*.less",
-            "!test/less/plugin-preeval.less", // uses ES6 syntax
+            "test/less/_main/*.less",
+            "!test/less/_main/plugin-preeval.less", // uses ES6 syntax
             // Don't test NPM import, obviously
-            "!test/less/plugin-module.less",
-            "!test/less/import-module.less",
-            "!test/less/javascript.less",
-            "!test/less/urls.less",
-            "!test/less/empty.less"
+            "!test/less/_main/plugin-module.less",
+            "!test/less/_main/import-module.less",
+            "!test/less/_main/javascript.less",
+            "!test/less/_main/urls.less",
+            "!test/less/_main/empty.less"
         ],
         options: {
             helpers: "test/browser/runner-main-options.js",

diff --git a/packages/less/test/browser/runner-browser-options.js b/packages/less/test/browser/runner-browser-options.js
@@ -13,8 +13,8 @@ var testFiles = ['charsets', 'colors', 'comments', 'css-3', 'strings', 'media',
 
 for (var i = 0; i < testFiles.length; i++) {
     var file = testFiles[i],
-        lessPath  = '/test/less/' + file + '.less',
-        cssPath   = '/test/css/' + file + '.css',
+        lessPath  = '/test/less/_main/' + file + '.less',
+        cssPath   = '/test/css/_main/' + file + '.css',
         lessStyle = document.createElement('style'),
         cssLink   = document.createElement('link'),
         lessText  = '@import "' + lessPath + '";';

diff --git a/packages/less/test/css/calc.css → packages/less/test/css/_main/calc.css b/packages/less/test/css/calc.css → packages/less/test/css/_main/calc.css
diff --git a/packages/less/test/css/charsets.css → packages/less/test/css/_main/charsets.css b/packages/less/test/css/charsets.css → packages/less/test/css/_main/charsets.css
diff --git a/packages/less/test/css/colors.css → packages/less/test/css/_main/colors.css b/packages/less/test/css/colors.css → packages/less/test/css/_main/colors.css
diff --git a/packages/less/test/css/comments.css → packages/less/test/css/_main/comments.css b/packages/less/test/css/comments.css → packages/less/test/css/_main/comments.css
diff --git a/packages/less/test/css/comments2.css → packages/less/test/css/_main/comments2.css b/packages/less/test/css/comments2.css → packages/less/test/css/_main/comments2.css
diff --git a/packages/less/test/css/css-3.css → packages/less/test/css/_main/css-3.css b/packages/less/test/css/css-3.css → packages/less/test/css/_main/css-3.css
diff --git a/packages/less/test/css/css-escapes.css → packages/less/test/css/_main/css-escapes.css b/packages/less/test/css/css-escapes.css → packages/less/test/css/_main/css-escapes.css
diff --git a/packages/less/test/css/css-grid.css → packages/less/test/css/_main/css-grid.css b/packages/less/test/css/css-grid.css → packages/less/test/css/_main/css-grid.css
diff --git a/packages/less/test/css/css-guards.css → packages/less/test/css/_main/css-guards.css b/packages/less/test/css/css-guards.css → packages/less/test/css/_main/css-guards.css
diff --git a/packages/less/test/css/detached-rulesets.css → ...less/test/css/_main/detached-rulesets.css b/packages/less/test/css/detached-rulesets.css → ...less/test/css/_main/detached-rulesets.css
diff --git a/...ages/less/test/css/directives-bubling.css → ...ess/test/css/_main/directives-bubling.css b/...ages/less/test/css/directives-bubling.css → ...ess/test/css/_main/directives-bubling.css
diff --git a/packages/less/test/css/empty.css → packages/less/test/css/_main/empty.css b/packages/less/test/css/empty.css → packages/less/test/css/_main/empty.css
diff --git a/packages/less/test/css/extend-chaining.css → ...s/less/test/css/_main/extend-chaining.css b/packages/less/test/css/extend-chaining.css → ...s/less/test/css/_main/extend-chaining.css
diff --git a/packages/less/test/css/extend-clearfix.css → ...s/less/test/css/_main/extend-clearfix.css b/packages/less/test/css/extend-clearfix.css → ...s/less/test/css/_main/extend-clearfix.css
diff --git a/packages/less/test/css/extend-exact.css → ...ages/less/test/css/_main/extend-exact.css b/packages/less/test/css/extend-exact.css → ...ages/less/test/css/_main/extend-exact.css
diff --git a/packages/less/test/css/extend-media.css → ...ages/less/test/css/_main/extend-media.css b/packages/less/test/css/extend-media.css → ...ages/less/test/css/_main/extend-media.css
diff --git a/packages/less/test/css/extend-nest.css → packages/less/test/css/_main/extend-nest.css b/packages/less/test/css/extend-nest.css → packages/less/test/css/_main/extend-nest.css
diff --git a/packages/less/test/css/extend-selector.css → ...s/less/test/css/_main/extend-selector.css b/packages/less/test/css/extend-selector.css → ...s/less/test/css/_main/extend-selector.css
diff --git a/packages/less/test/css/extend.css → packages/less/test/css/_main/extend.css b/packages/less/test/css/extend.css → packages/less/test/css/_main/extend.css
diff --git a/...ages/less/test/css/extract-and-length.css → ...ess/test/css/_main/extract-and-length.css b/...ages/less/test/css/extract-and-length.css → ...ess/test/css/_main/extract-and-length.css
diff --git a/packages/less/test/css/functions-each.css → ...es/less/test/css/_main/functions-each.css b/packages/less/test/css/functions-each.css → ...es/less/test/css/_main/functions-each.css
diff --git a/packages/less/test/css/functions.css → packages/less/test/css/_main/functions.css b/packages/less/test/css/functions.css → packages/less/test/css/_main/functions.css
diff --git a/packages/less/test/css/ie-filters.css → packages/less/test/css/_main/ie-filters.css b/packages/less/test/css/ie-filters.css → packages/less/test/css/_main/ie-filters.css
diff --git a/packages/less/test/css/import-inline.css → ...ges/less/test/css/_main/import-inline.css b/packages/less/test/css/import-inline.css → ...ges/less/test/css/_main/import-inline.css
diff --git a/...es/less/test/css/import-interpolation.css → ...s/test/css/_main/import-interpolation.css b/...es/less/test/css/import-interpolation.css → ...s/test/css/_main/import-interpolation.css
diff --git a/packages/less/test/css/import-module.css → ...ges/less/test/css/_main/import-module.css b/packages/less/test/css/import-module.css → ...ges/less/test/css/_main/import-module.css
diff --git a/packages/less/test/css/import-once.css → packages/less/test/css/_main/import-once.css b/packages/less/test/css/import-once.css → packages/less/test/css/_main/import-once.css
diff --git a/...less/test/css/import-reference-issues.css → ...est/css/_main/import-reference-issues.css b/...less/test/css/import-reference-issues.css → ...est/css/_main/import-reference-issues.css
diff --git a/packages/less/test/css/import-reference.css → .../less/test/css/_main/import-reference.css b/packages/less/test/css/import-reference.css → .../less/test/css/_main/import-reference.css
diff --git a/packages/less/test/css/import.css → packages/less/test/css/_main/import.css b/packages/less/test/css/import.css → packages/less/test/css/_main/import.css
diff --git a/packages/less/test/css/javascript.css → packages/less/test/css/_main/javascript.css b/packages/less/test/css/javascript.css → packages/less/test/css/_main/javascript.css
diff --git a/packages/less/test/css/lazy-eval.css → packages/less/test/css/_main/lazy-eval.css b/packages/less/test/css/lazy-eval.css → packages/less/test/css/_main/lazy-eval.css
diff --git a/packages/less/test/css/media.css → packages/less/test/css/_main/media.css b/packages/less/test/css/media.css → packages/less/test/css/_main/media.css
diff --git a/packages/less/test/css/merge.css → packages/less/test/css/_main/merge.css b/packages/less/test/css/merge.css → packages/less/test/css/_main/merge.css
diff --git a/packages/less/test/css/mixins-closure.css → ...es/less/test/css/_main/mixins-closure.css b/packages/less/test/css/mixins-closure.css → ...es/less/test/css/_main/mixins-closure.css
diff --git a/...s/test/css/mixins-guards-default-func.css → .../css/_main/mixins-guards-default-func.css b/...s/test/css/mixins-guards-default-func.css → .../css/_main/mixins-guards-default-func.css
diff --git a/packages/less/test/css/mixins-guards.css → ...ges/less/test/css/_main/mixins-guards.css b/packages/less/test/css/mixins-guards.css → ...ges/less/test/css/_main/mixins-guards.css
diff --git a/packages/less/test/css/mixins-important.css → .../less/test/css/_main/mixins-important.css b/packages/less/test/css/mixins-important.css → .../less/test/css/_main/mixins-important.css
diff --git a/...ges/less/test/css/mixins-interpolated.css → ...ss/test/css/_main/mixins-interpolated.css b/...ges/less/test/css/mixins-interpolated.css → ...ss/test/css/_main/mixins-interpolated.css
diff --git a/packages/less/test/css/mixins-named-args.css → ...less/test/css/_main/mixins-named-args.css b/packages/less/test/css/mixins-named-args.css → ...less/test/css/_main/mixins-named-args.css
diff --git a/packages/less/test/css/mixins-nested.css → ...ges/less/test/css/_main/mixins-nested.css b/packages/less/test/css/mixins-nested.css → ...ges/less/test/css/_main/mixins-nested.css
diff --git a/packages/less/test/css/mixins-pattern.css → ...es/less/test/css/_main/mixins-pattern.css b/packages/less/test/css/mixins-pattern.css → ...es/less/test/css/_main/mixins-pattern.css
diff --git a/packages/less/test/css/mixins.css → packages/less/test/css/_main/mixins.css b/packages/less/test/css/mixins.css → packages/less/test/css/_main/mixins.css
diff --git a/packages/less/test/css/no-output.css → packages/less/test/css/_main/no-output.css b/packages/less/test/css/no-output.css → packages/less/test/css/_main/no-output.css
diff --git a/packages/less/test/css/operations.css → packages/less/test/css/_main/operations.css b/packages/less/test/css/operations.css → packages/less/test/css/_main/operations.css
diff --git a/...ges/less/test/css/parse-interpolation.css → ...ss/test/css/_main/parse-interpolation.css b/...ges/less/test/css/parse-interpolation.css → ...ss/test/css/_main/parse-interpolation.css
diff --git a/packages/less/test/css/permissive-parse.css → .../less/test/css/_main/permissive-parse.css b/packages/less/test/css/permissive-parse.css → .../less/test/css/_main/permissive-parse.css
diff --git a/packages/less/test/css/plugin-module.css → ...ges/less/test/css/_main/plugin-module.css b/packages/less/test/css/plugin-module.css → ...ges/less/test/css/_main/plugin-module.css
diff --git a/packages/less/test/css/plugin-preeval.css → ...es/less/test/css/_main/plugin-preeval.css b/packages/less/test/css/plugin-preeval.css → ...es/less/test/css/_main/plugin-preeval.css
diff --git a/packages/less/test/css/plugin.css → packages/less/test/css/_main/plugin.css b/packages/less/test/css/plugin.css → packages/less/test/css/_main/plugin.css
diff --git a/...ages/less/test/css/property-accessors.css → ...ess/test/css/_main/property-accessors.css b/...ages/less/test/css/property-accessors.css → ...ess/test/css/_main/property-accessors.css
diff --git a/...es/less/test/css/property-name-interp.css → ...s/test/css/_main/property-name-interp.css b/...es/less/test/css/property-name-interp.css → ...s/test/css/_main/property-name-interp.css
diff --git a/packages/less/test/css/rulesets.css → packages/less/test/css/_main/rulesets.css b/packages/less/test/css/rulesets.css → packages/less/test/css/_main/rulesets.css
diff --git a/packages/less/test/css/scope.css → packages/less/test/css/_main/scope.css b/packages/less/test/css/scope.css → packages/less/test/css/_main/scope.css
diff --git a/packages/less/test/css/selectors.css → packages/less/test/css/_main/selectors.css b/packages/less/test/css/selectors.css → packages/less/test/css/_main/selectors.css
diff --git a/packages/less/test/css/strings.css → packages/less/test/css/_main/strings.css b/packages/less/test/css/strings.css → packages/less/test/css/_main/strings.css
diff --git a/packages/less/test/css/urls.css → packages/less/test/css/_main/urls.css b/packages/less/test/css/urls.css → packages/less/test/css/_main/urls.css
diff --git a/...s/less/test/css/variables-in-at-rules.css → .../test/css/_main/variables-in-at-rules.css b/...s/less/test/css/variables-in-at-rules.css → .../test/css/_main/variables-in-at-rules.css
diff --git a/packages/less/test/css/variables.css → packages/less/test/css/_main/variables.css b/packages/less/test/css/variables.css → packages/less/test/css/_main/variables.css
diff --git a/packages/less/test/css/whitespace.css → packages/less/test/css/_main/whitespace.css b/packages/less/test/css/whitespace.css → packages/less/test/css/_main/whitespace.css
diff --git a/packages/less/test/css/process-imports/google.css b/packages/less/test/css/process-imports/google.css
@@ -0,0 +1,3 @@
+.a {
+  b: c;
+}
diff --git a/packages/less/test/index.js b/packages/less/test/index.js
@@ -7,13 +7,13 @@ console.log('\n' + stylize('Less', 'underline') + '\n');
 
 lessTester.prepBomTest();
 var testMap = [
-    [{}, 'namespacing/'],
     [{
         // TODO: Change this to rewriteUrls: 'all' once the relativeUrls option is removed
         relativeUrls: true,
         silent: true,
         javascriptEnabled: true
-    }],
+    }, '_main/'],
+    [{}, 'namespacing/'],
     [{
         math: 'strict-legacy'
     }, 'math/strict-legacy/'],
@@ -49,7 +49,7 @@ var testMap = [
             return path.join('test/sourcemaps', filename) + '.json';
         }],
 
-    [{math: 'strict', strictUnits: true, globalVars: true }, 'import/json/',
+    [{math: 'strict', strictUnits: true, globalVars: true }, '_main/import/json/',
         lessTester.testImports, null, true,
         function(filename, type, baseFolder) {
             return path.join(baseFolder, filename) + '.json';
@@ -67,20 +67,21 @@ var testMap = [
     [{rewriteUrls: 'local'}, 'rewrite-urls-local/'],
     [{rootpath: 'http://example.com/assets/css/', rewriteUrls: 'all'}, 'rootpath-rewrite-urls-all/'],
     [{rootpath: 'http://example.com/assets/css/', rewriteUrls: 'local'}, 'rootpath-rewrite-urls-local/'],
-    [{paths: ['test/data/', 'test/less/import/']}, 'include-path/'],
-    [{paths: 'test/data/'}, 'include-path-string/'],
+    [{paths: ['test/less/data/', 'test/less/_main/import/']}, 'include-path/'],
+    [{paths: 'test/less/data/'}, 'include-path-string/'],
     [{plugin: 'test/plugins/postprocess/'}, 'postProcessorPlugin/'],
     [{plugin: 'test/plugins/preprocess/'}, 'preProcessorPlugin/'],
     [{plugin: 'test/plugins/visitor/'}, 'visitorPlugin/'],
     [{plugin: 'test/plugins/filemanager/'}, 'filemanagerPlugin/'],
     [{}, 'no-strict-math/'],
-    [{}, '3rd-party/']
+    [{}, '3rd-party/'],
+    [{ processImports: false }, 'process-imports/']
 ];
 testMap.forEach(function(args) {
     lessTester.runTestSet.apply(lessTester, args)
 });
-lessTester.testSyncronous({syncImport: true}, 'import');
-lessTester.testSyncronous({syncImport: true}, 'plugin');
+lessTester.testSyncronous({syncImport: true}, '_main/import');
+lessTester.testSyncronous({syncImport: true}, '_main/plugin');
 lessTester.testSyncronous({syncImport: true}, 'math/strict-legacy/css');
 lessTester.testNoOptions();
 lessTester.testJSImport();

diff --git a/packages/less/test/less/calc.less → packages/less/test/less/_main/calc.less b/packages/less/test/less/calc.less → packages/less/test/less/_main/calc.less
diff --git a/packages/less/test/less/charsets.less → packages/less/test/less/_main/charsets.less b/packages/less/test/less/charsets.less → packages/less/test/less/_main/charsets.less
diff --git a/packages/less/test/less/colors.less → packages/less/test/less/_main/colors.less b/packages/less/test/less/colors.less → packages/less/test/less/_main/colors.less
diff --git a/packages/less/test/less/comments.less → packages/less/test/less/_main/comments.less b/packages/less/test/less/comments.less → packages/less/test/less/_main/comments.less
diff --git a/packages/less/test/less/comments2.less → packages/less/test/less/_main/comments2.less b/packages/less/test/less/comments2.less → packages/less/test/less/_main/comments2.less
diff --git a/packages/less/test/less/css-3.less → packages/less/test/less/_main/css-3.less b/packages/less/test/less/css-3.less → packages/less/test/less/_main/css-3.less
diff --git a/packages/less/test/less/css-escapes.less → ...ges/less/test/less/_main/css-escapes.less b/packages/less/test/less/css-escapes.less → ...ges/less/test/less/_main/css-escapes.less
diff --git a/packages/less/test/less/css-grid.less → packages/less/test/less/_main/css-grid.less b/packages/less/test/less/css-grid.less → packages/less/test/less/_main/css-grid.less
diff --git a/packages/less/test/less/css-guards.less → ...ages/less/test/less/_main/css-guards.less b/packages/less/test/less/css-guards.less → ...ages/less/test/less/_main/css-guards.less
diff --git a/...ges/less/test/less/detached-rulesets.less → ...ss/test/less/_main/detached-rulesets.less b/...ges/less/test/less/detached-rulesets.less → ...ss/test/less/_main/detached-rulesets.less
diff --git a/...es/less/test/less/directives-bubling.less → ...s/test/less/_main/directives-bubling.less b/...es/less/test/less/directives-bubling.less → ...s/test/less/_main/directives-bubling.less
diff --git a/packages/less/test/less/empty.less → packages/less/test/less/_main/empty.less b/packages/less/test/less/empty.less → packages/less/test/less/_main/empty.less
diff --git a/packages/less/test/less/extend-chaining.less → ...less/test/less/_main/extend-chaining.less b/packages/less/test/less/extend-chaining.less → ...less/test/less/_main/extend-chaining.less
diff --git a/packages/less/test/less/extend-clearfix.less → ...less/test/less/_main/extend-clearfix.less b/packages/less/test/less/extend-clearfix.less → ...less/test/less/_main/extend-clearfix.less
diff --git a/packages/less/test/less/extend-exact.less → ...es/less/test/less/_main/extend-exact.less b/packages/less/test/less/extend-exact.less → ...es/less/test/less/_main/extend-exact.less
diff --git a/packages/less/test/less/extend-media.less → ...es/less/test/less/_main/extend-media.less b/packages/less/test/less/extend-media.less → ...es/less/test/less/_main/extend-media.less
diff --git a/packages/less/test/less/extend-nest.less → ...ges/less/test/less/_main/extend-nest.less b/packages/less/test/less/extend-nest.less → ...ges/less/test/less/_main/extend-nest.less
diff --git a/packages/less/test/less/extend-selector.less → ...less/test/less/_main/extend-selector.less b/packages/less/test/less/extend-selector.less → ...less/test/less/_main/extend-selector.less
diff --git a/packages/less/test/less/extend.less → packages/less/test/less/_main/extend.less b/packages/less/test/less/extend.less → packages/less/test/less/_main/extend.less
diff --git a/...es/less/test/less/extract-and-length.less → ...s/test/less/_main/extract-and-length.less b/...es/less/test/less/extract-and-length.less → ...s/test/less/_main/extract-and-length.less
diff --git a/packages/less/test/less/functions-each.less → .../less/test/less/_main/functions-each.less b/packages/less/test/less/functions-each.less → .../less/test/less/_main/functions-each.less
diff --git a/packages/less/test/less/functions.less → packages/less/test/less/_main/functions.less b/packages/less/test/less/functions.less → packages/less/test/less/_main/functions.less
diff --git a/packages/less/test/less/ie-filters.less → ...ages/less/test/less/_main/ie-filters.less b/packages/less/test/less/ie-filters.less → ...ages/less/test/less/_main/ie-filters.less
diff --git a/packages/less/test/less/import-inline.less → ...s/less/test/less/_main/import-inline.less b/packages/less/test/less/import-inline.less → ...s/less/test/less/_main/import-inline.less
diff --git a/.../less/test/less/import-interpolation.less → ...test/less/_main/import-interpolation.less b/.../less/test/less/import-interpolation.less → ...test/less/_main/import-interpolation.less
diff --git a/packages/less/test/less/import-module.less → ...s/less/test/less/_main/import-module.less b/packages/less/test/less/import-module.less → ...s/less/test/less/_main/import-module.less
diff --git a/packages/less/test/less/import-once.less → ...ges/less/test/less/_main/import-once.less b/packages/less/test/less/import-once.less → ...ges/less/test/less/_main/import-once.less
diff --git a/...ss/test/less/import-reference-issues.less → ...t/less/_main/import-reference-issues.less b/...ss/test/less/import-reference-issues.less → ...t/less/_main/import-reference-issues.less
diff --git a/...rence-issues/appender-reference-1968.less → ...rence-issues/appender-reference-1968.less b/...rence-issues/appender-reference-1968.less → ...rence-issues/appender-reference-1968.less
diff --git a/...reference-issues/global-scope-import.less → ...reference-issues/global-scope-import.less b/...reference-issues/global-scope-import.less → ...reference-issues/global-scope-import.less
diff --git a/...reference-issues/global-scope-nested.less → ...reference-issues/global-scope-nested.less b/...reference-issues/global-scope-nested.less → ...reference-issues/global-scope-nested.less
diff --git a/...s/import-reference-issues/mixin-1968.less → ...n/import-reference-issues/mixin-1968.less b/...s/import-reference-issues/mixin-1968.less → ...n/import-reference-issues/mixin-1968.less
diff --git a/...erence-issues/multiple-import-nested.less → ...erence-issues/multiple-import-nested.less b/...erence-issues/multiple-import-nested.less → ...erence-issues/multiple-import-nested.less
diff --git a/...ort-reference-issues/multiple-import.less → ...ort-reference-issues/multiple-import.less b/...ort-reference-issues/multiple-import.less → ...ort-reference-issues/multiple-import.less
diff --git a/.../import-reference-issues/simple-mixin.css → .../import-reference-issues/simple-mixin.css b/.../import-reference-issues/simple-mixin.css → .../import-reference-issues/simple-mixin.css
diff --git a/...reference-issues/simple-ruleset-2162.less → ...reference-issues/simple-ruleset-2162.less b/...reference-issues/simple-ruleset-2162.less → ...reference-issues/simple-ruleset-2162.less
diff --git a/...ages/less/test/less/import-reference.less → ...ess/test/less/_main/import-reference.less b/...ages/less/test/less/import-reference.less → ...ess/test/less/_main/import-reference.less
diff --git a/packages/less/test/less/import.less → packages/less/test/less/_main/import.less b/packages/less/test/less/import.less → packages/less/test/less/_main/import.less
diff --git a/...ges/less/test/less/import/css-import.less → ...ss/test/less/_main/import/css-import.less b/...ges/less/test/less/import/css-import.less → ...ss/test/less/_main/import/css-import.less
diff --git a/.../import/deeper/deeper-2/url-import-2.less → .../import/deeper/deeper-2/url-import-2.less b/.../import/deeper/deeper-2/url-import-2.less → .../import/deeper/deeper-2/url-import-2.less
diff --git a/...ss/import/deeper/deeper-2/url-import.less → ...in/import/deeper/deeper-2/url-import.less b/...ss/import/deeper/deeper-2/url-import.less → ...in/import/deeper/deeper-2/url-import.less
diff --git a/...ess/import/deeper/import-once-test-a.less → ...ain/import/deeper/import-once-test-a.less b/...ess/import/deeper/import-once-test-a.less → ...ain/import/deeper/import-once-test-a.less
diff --git a/...s/test/less/import/deeper/url-import.less → .../less/_main/import/deeper/url-import.less b/...s/test/less/import/deeper/url-import.less → .../less/_main/import/deeper/url-import.less
diff --git a/...mport/import-and-relative-paths-test.less → ...mport/import-and-relative-paths-test.less b/...mport/import-and-relative-paths-test.less → ...mport/import-and-relative-paths-test.less
diff --git a/...test/less/import/import-charset-test.less → ...ess/_main/import/import-charset-test.less b/...test/less/import/import-charset-test.less → ...ess/_main/import/import-charset-test.less
diff --git a/...ess/import/import-inline-invalid-css.less → ...ain/import/import-inline-invalid-css.less b/...ess/import/import-inline-invalid-css.less → ...ain/import/import-inline-invalid-css.less
diff --git a/...est/less/import/import-interpolation.less → ...ss/_main/import/import-interpolation.less b/...est/less/import/import-interpolation.less → ...ss/_main/import/import-interpolation.less
diff --git a/...st/less/import/import-interpolation2.less → ...s/_main/import/import-interpolation2.less b/...st/less/import/import-interpolation2.less → ...s/_main/import/import-interpolation2.less
diff --git a/.../test/less/import/import-once-test-c.less → ...less/_main/import/import-once-test-c.less b/.../test/less/import/import-once-test-c.less → ...less/_main/import/import-once-test-c.less
diff --git a/...ss/test/less/import/import-reference.less → ...t/less/_main/import/import-reference.less b/...ss/test/less/import/import-reference.less → ...t/less/_main/import/import-reference.less
diff --git a/.../less/test/less/import/import-test-a.less → ...test/less/_main/import/import-test-a.less b/.../less/test/less/import/import-test-a.less → ...test/less/_main/import/import-test-a.less
diff --git a/.../less/test/less/import/import-test-b.less → ...test/less/_main/import/import-test-b.less b/.../less/test/less/import/import-test-b.less → ...test/less/_main/import/import-test-b.less
diff --git a/.../less/test/less/import/import-test-c.less → ...test/less/_main/import/import-test-c.less b/.../less/test/less/import/import-test-c.less → ...test/less/_main/import/import-test-c.less
diff --git a/...s/less/test/less/import/import-test-d.css → .../test/less/_main/import/import-test-d.css b/...s/less/test/less/import/import-test-d.css → .../test/less/_main/import/import-test-d.css
diff --git a/.../less/test/less/import/import-test-e.less → ...test/less/_main/import/import-test-e.less b/.../less/test/less/import/import-test-e.less → ...test/less/_main/import/import-test-e.less
diff --git a/.../less/test/less/import/import-test-f.less → ...test/less/_main/import/import-test-f.less b/.../less/test/less/import/import-test-f.less → ...test/less/_main/import/import-test-f.less
diff --git a/...s/less/test/less/import/imports/font.less → .../test/less/_main/import/imports/font.less b/...s/less/test/less/import/imports/font.less → .../test/less/_main/import/imports/font.less
diff --git a/...s/less/test/less/import/imports/logo.less → .../test/less/_main/import/imports/logo.less b/...s/less/test/less/import/imports/logo.less → .../test/less/_main/import/imports/logo.less
diff --git a/.../test/less/import/interpolation-vars.less → ...less/_main/import/interpolation-vars.less b/.../test/less/import/interpolation-vars.less → ...less/_main/import/interpolation-vars.less
diff --git a/...es/less/test/less/import/invalid-css.less → ...s/test/less/_main/import/invalid-css.less b/...es/less/test/less/import/invalid-css.less → ...s/test/less/_main/import/invalid-css.less
diff --git a/...ges/less/test/less/import/json/index.json → ...ss/test/less/_main/import/json/index.json b/...ges/less/test/less/import/json/index.json → ...ss/test/less/_main/import/json/index.json
diff --git a/...ges/less/test/less/import/json/index.less → ...ss/test/less/_main/import/json/index.less b/...ges/less/test/less/import/json/index.less → ...ss/test/less/_main/import/json/index.less
diff --git a/packages/less/test/less/import/urls.less → ...ges/less/test/less/_main/import/urls.less b/packages/less/test/less/import/urls.less → ...ges/less/test/less/_main/import/urls.less
diff --git a/packages/less/test/less/javascript.less → ...ages/less/test/less/_main/javascript.less b/packages/less/test/less/javascript.less → ...ages/less/test/less/_main/javascript.less
diff --git a/packages/less/test/less/lazy-eval.less → packages/less/test/less/_main/lazy-eval.less b/packages/less/test/less/lazy-eval.less → packages/less/test/less/_main/lazy-eval.less
diff --git a/packages/less/test/less/media.less → packages/less/test/less/_main/media.less b/packages/less/test/less/media.less → packages/less/test/less/_main/media.less
diff --git a/packages/less/test/less/merge.less → packages/less/test/less/_main/merge.less b/packages/less/test/less/merge.less → packages/less/test/less/_main/merge.less
diff --git a/packages/less/test/less/mixins-closure.less → .../less/test/less/_main/mixins-closure.less b/packages/less/test/less/mixins-closure.less → .../less/test/less/_main/mixins-closure.less
diff --git a/...test/less/mixins-guards-default-func.less → ...ess/_main/mixins-guards-default-func.less b/...test/less/mixins-guards-default-func.less → ...ess/_main/mixins-guards-default-func.less
diff --git a/packages/less/test/less/mixins-guards.less → ...s/less/test/less/_main/mixins-guards.less b/packages/less/test/less/mixins-guards.less → ...s/less/test/less/_main/mixins-guards.less
diff --git a/...ages/less/test/less/mixins-important.less → ...ess/test/less/_main/mixins-important.less b/...ages/less/test/less/mixins-important.less → ...ess/test/less/_main/mixins-important.less
diff --git a/...s/less/test/less/mixins-interpolated.less → .../test/less/_main/mixins-interpolated.less b/...s/less/test/less/mixins-interpolated.less → .../test/less/_main/mixins-interpolated.less
diff --git a/...ges/less/test/less/mixins-named-args.less → ...ss/test/less/_main/mixins-named-args.less b/...ges/less/test/less/mixins-named-args.less → ...ss/test/less/_main/mixins-named-args.less
diff --git a/packages/less/test/less/mixins-nested.less → ...s/less/test/less/_main/mixins-nested.less b/packages/less/test/less/mixins-nested.less → ...s/less/test/less/_main/mixins-nested.less
diff --git a/packages/less/test/less/mixins-pattern.less → .../less/test/less/_main/mixins-pattern.less b/packages/less/test/less/mixins-pattern.less → .../less/test/less/_main/mixins-pattern.less
diff --git a/packages/less/test/less/mixins.less → packages/less/test/less/_main/mixins.less b/packages/less/test/less/mixins.less → packages/less/test/less/_main/mixins.less
diff --git a/...ent-with-svg-gradient/mixin-consumer.less → ...ent-with-svg-gradient/mixin-consumer.less b/...ent-with-svg-gradient/mixin-consumer.less → ...ent-with-svg-gradient/mixin-consumer.less
diff --git a/...with-svg-gradient/svg-gradient-mixin.less → ...with-svg-gradient/svg-gradient-mixin.less b/...with-svg-gradient/svg-gradient-mixin.less → ...with-svg-gradient/svg-gradient-mixin.less
diff --git a/packages/less/test/less/no-output.less → packages/less/test/less/_main/no-output.less b/packages/less/test/less/no-output.less → packages/less/test/less/_main/no-output.less
diff --git a/packages/less/test/less/operations.less → ...ages/less/test/less/_main/operations.less b/packages/less/test/less/operations.less → ...ages/less/test/less/_main/operations.less
diff --git a/...s/less/test/less/parse-interpolation.less → .../test/less/_main/parse-interpolation.less b/...s/less/test/less/parse-interpolation.less → .../test/less/_main/parse-interpolation.less
diff --git a/...ages/less/test/less/permissive-parse.less → ...ess/test/less/_main/permissive-parse.less b/...ages/less/test/less/permissive-parse.less → ...ess/test/less/_main/permissive-parse.less
diff --git a/packages/less/test/less/plugin-module.less → ...s/less/test/less/_main/plugin-module.less b/packages/less/test/less/plugin-module.less → ...s/less/test/less/_main/plugin-module.less
diff --git a/packages/less/test/less/plugin-preeval.less → .../less/test/less/_main/plugin-preeval.less b/packages/less/test/less/plugin-preeval.less → .../less/test/less/_main/plugin-preeval.less
diff --git a/packages/less/test/less/plugin.less → packages/less/test/less/_main/plugin.less b/packages/less/test/less/plugin.less → packages/less/test/less/_main/plugin.less
diff --git a/...ess/test/less/plugin/plugin-collection.js → ...st/less/_main/plugin/plugin-collection.js b/...ess/test/less/plugin/plugin-collection.js → ...st/less/_main/plugin/plugin-collection.js
diff --git a/...es/less/test/less/plugin/plugin-global.js → ...s/test/less/_main/plugin/plugin-global.js b/...es/less/test/less/plugin/plugin-global.js → ...s/test/less/_main/plugin/plugin-global.js
diff --git a/...ges/less/test/less/plugin/plugin-local.js → ...ss/test/less/_main/plugin/plugin-local.js b/...ges/less/test/less/plugin/plugin-local.js → ...ss/test/less/_main/plugin/plugin-local.js
diff --git a/...s/less/test/less/plugin/plugin-preeval.js → .../test/less/_main/plugin/plugin-preeval.js b/...s/less/test/less/plugin/plugin-preeval.js → .../test/less/_main/plugin/plugin-preeval.js
diff --git a/...es/less/test/less/plugin/plugin-scope1.js → ...s/test/less/_main/plugin/plugin-scope1.js b/...es/less/test/less/plugin/plugin-scope1.js → ...s/test/less/_main/plugin/plugin-scope1.js
diff --git a/...es/less/test/less/plugin/plugin-scope2.js → ...s/test/less/_main/plugin/plugin-scope2.js b/...es/less/test/less/plugin/plugin-scope2.js → ...s/test/less/_main/plugin/plugin-scope2.js
diff --git a/...test/less/plugin/plugin-set-options-v2.js → ...ess/_main/plugin/plugin-set-options-v2.js b/...test/less/plugin/plugin-set-options-v2.js → ...ess/_main/plugin/plugin-set-options-v2.js
diff --git a/...test/less/plugin/plugin-set-options-v3.js → ...ess/_main/plugin/plugin-set-options-v3.js b/...test/less/plugin/plugin-set-options-v3.js → ...ess/_main/plugin/plugin-set-options-v3.js
diff --git a/...ss/test/less/plugin/plugin-set-options.js → ...t/less/_main/plugin/plugin-set-options.js b/...ss/test/less/plugin/plugin-set-options.js → ...t/less/_main/plugin/plugin-set-options.js
diff --git a/...es/less/test/less/plugin/plugin-simple.js → ...s/test/less/_main/plugin/plugin-simple.js b/...es/less/test/less/plugin/plugin-simple.js → ...s/test/less/_main/plugin/plugin-simple.js
diff --git a/...ess/test/less/plugin/plugin-transitive.js → ...st/less/_main/plugin/plugin-transitive.js b/...ess/test/less/plugin/plugin-transitive.js → ...st/less/_main/plugin/plugin-transitive.js
diff --git a/...s/test/less/plugin/plugin-transitive.less → .../less/_main/plugin/plugin-transitive.less b/...s/test/less/plugin/plugin-transitive.less → .../less/_main/plugin/plugin-transitive.less
diff --git a/...ess/test/less/plugin/plugin-tree-nodes.js → ...st/less/_main/plugin/plugin-tree-nodes.js b/...ess/test/less/plugin/plugin-tree-nodes.js → ...st/less/_main/plugin/plugin-tree-nodes.js
diff --git a/...es/less/test/less/property-accessors.less → ...s/test/less/_main/property-accessors.less b/...es/less/test/less/property-accessors.less → ...s/test/less/_main/property-accessors.less
diff --git a/.../less/test/less/property-name-interp.less → ...test/less/_main/property-name-interp.less b/.../less/test/less/property-name-interp.less → ...test/less/_main/property-name-interp.less
diff --git a/packages/less/test/less/rulesets.less → packages/less/test/less/_main/rulesets.less b/packages/less/test/less/rulesets.less → packages/less/test/less/_main/rulesets.less
diff --git a/packages/less/test/less/scope.less → packages/less/test/less/_main/scope.less b/packages/less/test/less/scope.less → packages/less/test/less/_main/scope.less
diff --git a/packages/less/test/less/selectors.less → packages/less/test/less/_main/selectors.less b/packages/less/test/less/selectors.less → packages/less/test/less/_main/selectors.less
diff --git a/packages/less/test/less/strings.less → packages/less/test/less/_main/strings.less b/packages/less/test/less/strings.less → packages/less/test/less/_main/strings.less
diff --git a/packages/less/test/less/urls.less → packages/less/test/less/_main/urls.less b/packages/less/test/less/urls.less → packages/less/test/less/_main/urls.less
diff --git a/...less/test/less/variables-in-at-rules.less → ...est/less/_main/variables-in-at-rules.less b/...less/test/less/variables-in-at-rules.less → ...est/less/_main/variables-in-at-rules.less
diff --git a/packages/less/test/less/variables.less → packages/less/test/less/_main/variables.less b/packages/less/test/less/variables.less → packages/less/test/less/_main/variables.less
diff --git a/packages/less/test/less/whitespace.less → ...ages/less/test/less/_main/whitespace.less b/packages/less/test/less/whitespace.less → ...ages/less/test/less/_main/whitespace.less
diff --git a/packages/less/test/data/data-uri-fail.png → ...ges/less/test/less/data/data-uri-fail.png b/packages/less/test/data/data-uri-fail.png → ...ges/less/test/less/data/data-uri-fail.png
diff --git a/packages/less/test/data/image.jpg → packages/less/test/less/data/image.jpg b/packages/less/test/data/image.jpg → packages/less/test/less/data/image.jpg
diff --git a/packages/less/test/data/image.svg → packages/less/test/less/data/image.svg b/packages/less/test/data/image.svg → packages/less/test/less/data/image.svg
diff --git a/packages/less/test/data/page.html → packages/less/test/less/data/page.html b/packages/less/test/data/page.html → packages/less/test/less/data/page.html
diff --git a/packages/less/test/less/errors/functions-1.less b/packages/less/test/less/errors/functions-1.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-undefined();
diff --git a/packages/less/test/less/errors/functions-1.txt b/packages/less/test/less/errors/functions-1.txt
@@ -1,3 +1,3 @@
 SyntaxError: Function 'test-undefined' is undefined in {path}functions-1.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-undefined();
diff --git a/packages/less/test/less/errors/functions-10-keyword.less b/packages/less/test/less/errors/functions-10-keyword.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-keyword();
diff --git a/packages/less/test/less/errors/functions-10-keyword.txt b/packages/less/test/less/errors/functions-10-keyword.txt
@@ -1,3 +1,3 @@
 SyntaxError: Keyword node returned by a function is not valid here in {path}functions-10-keyword.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-keyword();
diff --git a/packages/less/test/less/errors/functions-11-operation.less b/packages/less/test/less/errors/functions-11-operation.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-operation();
diff --git a/packages/less/test/less/errors/functions-11-operation.txt b/packages/less/test/less/errors/functions-11-operation.txt
@@ -1,3 +1,3 @@
 SyntaxError: Operation node returned by a function is not valid here in {path}functions-11-operation.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-operation();
diff --git a/packages/less/test/less/errors/functions-12-quoted.less b/packages/less/test/less/errors/functions-12-quoted.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-quoted();
diff --git a/packages/less/test/less/errors/functions-12-quoted.txt b/packages/less/test/less/errors/functions-12-quoted.txt
@@ -1,3 +1,3 @@
 SyntaxError: Quoted node returned by a function is not valid here in {path}functions-12-quoted.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-quoted();
diff --git a/packages/less/test/less/errors/functions-13-selector.less b/packages/less/test/less/errors/functions-13-selector.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-selector();
diff --git a/packages/less/test/less/errors/functions-13-selector.txt b/packages/less/test/less/errors/functions-13-selector.txt
@@ -1,3 +1,3 @@
 SyntaxError: Selector node returned by a function is not valid here in {path}functions-13-selector.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-selector();
diff --git a/packages/less/test/less/errors/functions-14-url.less b/packages/less/test/less/errors/functions-14-url.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-url();
diff --git a/packages/less/test/less/errors/functions-14-url.txt b/packages/less/test/less/errors/functions-14-url.txt
@@ -1,3 +1,3 @@
 SyntaxError: Url node returned by a function is not valid here in {path}functions-14-url.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-url();
diff --git a/packages/less/test/less/errors/functions-15-value.less b/packages/less/test/less/errors/functions-15-value.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-value();
diff --git a/packages/less/test/less/errors/functions-15-value.txt b/packages/less/test/less/errors/functions-15-value.txt
@@ -1,3 +1,3 @@
 SyntaxError: Value node returned by a function is not valid here in {path}functions-15-value.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-value();
diff --git a/packages/less/test/less/errors/functions-3-assignment.less b/packages/less/test/less/errors/functions-3-assignment.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-assignment();
diff --git a/packages/less/test/less/errors/functions-3-assignment.txt b/packages/less/test/less/errors/functions-3-assignment.txt
@@ -1,3 +1,3 @@
 SyntaxError: Assignment node returned by a function is not valid here in {path}functions-3-assignment.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-assignment();
diff --git a/packages/less/test/less/errors/functions-4-call.less b/packages/less/test/less/errors/functions-4-call.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-call();
diff --git a/packages/less/test/less/errors/functions-4-call.txt b/packages/less/test/less/errors/functions-4-call.txt
@@ -1,3 +1,3 @@
 SyntaxError: Function 'foo' is undefined in {path}functions-4-call.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-call();
diff --git a/packages/less/test/less/errors/functions-5-color.less b/packages/less/test/less/errors/functions-5-color.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-color();
diff --git a/packages/less/test/less/errors/functions-5-color.txt b/packages/less/test/less/errors/functions-5-color.txt
@@ -1,3 +1,3 @@
 SyntaxError: Color node returned by a function is not valid here in {path}functions-5-color.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-color();
diff --git a/packages/less/test/less/errors/functions-6-condition.less b/packages/less/test/less/errors/functions-6-condition.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-condition();
diff --git a/packages/less/test/less/errors/functions-6-condition.txt b/packages/less/test/less/errors/functions-6-condition.txt
@@ -1,3 +1,3 @@
 SyntaxError: Condition node returned by a function is not valid here in {path}functions-6-condition.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-condition();
diff --git a/packages/less/test/less/errors/functions-7-dimension.less b/packages/less/test/less/errors/functions-7-dimension.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-dimension();
diff --git a/packages/less/test/less/errors/functions-7-dimension.txt b/packages/less/test/less/errors/functions-7-dimension.txt
@@ -1,3 +1,3 @@
 SyntaxError: Dimension node returned by a function is not valid here in {path}functions-7-dimension.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-dimension();
diff --git a/packages/less/test/less/errors/functions-8-element.less b/packages/less/test/less/errors/functions-8-element.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-element();
diff --git a/packages/less/test/less/errors/functions-8-element.txt b/packages/less/test/less/errors/functions-8-element.txt
@@ -1,3 +1,3 @@
 SyntaxError: Element node returned by a function is not valid here in {path}functions-8-element.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-element();
diff --git a/packages/less/test/less/errors/functions-9-expression.less b/packages/less/test/less/errors/functions-9-expression.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-expression();
diff --git a/packages/less/test/less/errors/functions-9-expression.txt b/packages/less/test/less/errors/functions-9-expression.txt
@@ -1,3 +1,3 @@
 SyntaxError: Expression node returned by a function is not valid here in {path}functions-9-expression.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-expression();
diff --git a/packages/less/test/less/errors/root-func-undefined-2.less b/packages/less/test/less/errors/root-func-undefined-2.less
@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes.js";
+@plugin "../_main/plugin/plugin-tree-nodes.js";
 test-undefined();
diff --git a/packages/less/test/less/errors/root-func-undefined-2.txt b/packages/less/test/less/errors/root-func-undefined-2.txt
@@ -1,3 +1,3 @@
 SyntaxError: Function 'test-undefined' is undefined in {path}root-func-undefined-2.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes.js";
+1 @plugin "../_main/plugin/plugin-tree-nodes.js";
 2 test-undefined();
diff --git a/packages/less/test/less/process-imports/google.less b/packages/less/test/less/process-imports/google.less
@@ -0,0 +1,3 @@
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
+
+.a { b: c; }
diff --git a/packages/less/test/less/static-urls/urls.less b/packages/less/test/less/static-urls/urls.less
@@ -30,4 +30,4 @@
     url: url(@a);
 }
 
-@import "../import/import-and-relative-paths-test";
+@import "../_main/import/import-and-relative-paths-test";
diff --git a/packages/less/test/less/url-args/urls.less b/packages/less/test/less/url-args/urls.less
@@ -33,19 +33,19 @@
     url: url(@a);
 }
 
-@import "../import/imports/font";
+@import "../_main/import/imports/font";
 
 #data-uri {
-  uri: data-uri('image/jpeg;base64', '../../data/image.jpg');
+  uri: data-uri('image/jpeg;base64', '../data/image.jpg');
 }
 
 #data-uri-guess {
-  uri: data-uri('../../data/image.jpg');
+  uri: data-uri('../data/image.jpg');
 }
 
 #data-uri-ascii {
-  uri-1: data-uri('text/html', '../../data/page.html');
-  uri-2: data-uri('../../data/page.html');
+  uri-1: data-uri('text/html', '../data/page.html');
+  uri-2: data-uri('../data/page.html');
 }
 
 #svg-functions {