Merge pull request #546 from hdeshev/reworkcss-root

Move css and css-value modules to the toplevel.

CrossPlatformModules.csproj

@@ -380,7 +380,7 @@
     <TypeScriptCompile Include="image-source\image-source.ios.ts">
       <DependentUpon>image-source.d.ts</DependentUpon>
     </TypeScriptCompile>
-    <TypeScriptCompile Include="js-libs\reworkcss-value\reworkcss-value.d.ts" />
+    <TypeScriptCompile Include="css-value\reworkcss-value.d.ts" />
     <TypeScriptCompile Include="platform\platform.ios.ts">
       <DependentUpon>platform.d.ts</DependentUpon>
     </TypeScriptCompile>
@@ -900,7 +900,7 @@
     <Content Include="apps\ui-tests-app\pages\text\button.xml" />
     <Content Include="apps\ui-tests-app\web-view\webview.xml" />
     <Content Include="fetch\fetch.js" />
-    <Content Include="js-libs\reworkcss-value\reworkcss-value.js" />
+    <Content Include="css-value\reworkcss-value.js" />
     <Content Include="ui\layouts\stack-layout\package.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1130,7 +1130,7 @@
     <TypeScriptCompile Include="apps\perf-tests\LargeObjectArrayMemoryTest\mainPage.ts" />
     <TypeScriptCompile Include="apps\perf-tests\ComplexObjectGraphMemoryTest\app.ts" />
     <TypeScriptCompile Include="apps\perf-tests\ComplexObjectGraphMemoryTest\mainPage.ts" />
-    <TypeScriptCompile Include="js-libs\reworkcss\reworkcss.d.ts" />
+    <TypeScriptCompile Include="css\reworkcss.d.ts" />
     <Content Include="js-libs\esprima\esprima.js">
       <DependentUpon>esprima.d.ts</DependentUpon>
     </Content>
@@ -1138,7 +1138,7 @@
     <Content Include="js-libs\polymer-expressions\polymer-expressions.js">
       <DependentUpon>polymer-expressions.d.ts</DependentUpon>
     </Content>
-    <Content Include="js-libs\reworkcss\reworkcss.js">
+    <Content Include="css\reworkcss.js">
       <DependentUpon>reworkcss.d.ts</DependentUpon>
     </Content>
     <TypeScriptCompile Include="apps\tests\xml-declaration\app.ts" />
@@ -1662,9 +1662,9 @@
     <Content Include="apps\perf-tests\ApplicationLoadTimeAndFPS\package.json" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="js-libs\reworkcss\LICENSE" />
-    <Content Include="js-libs\reworkcss\package.json" />
-    <Content Include="js-libs\reworkcss\Readme.md" />
+    <Content Include="css\LICENSE" />
+    <Content Include="css\package.json" />
+    <Content Include="css\Readme.md" />
     <Content Include="data\observable\package.json" />
   </ItemGroup>
   <ItemGroup>
@@ -1805,9 +1805,9 @@
     <Content Include="ui\repeater\package.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="js-libs\reworkcss-value\LICENSE" />
-    <Content Include="js-libs\reworkcss-value\package.json" />
-    <Content Include="js-libs\reworkcss-value\Readme.md" />
+    <Content Include="css-value\LICENSE" />
+    <Content Include="css-value\package.json" />
+    <Content Include="css-value\Readme.md" />
     <Content Include="ui\action-bar\package.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1880,4 +1880,4 @@
       <UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>

css-value/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "reworkcss-value.js",
+  "name": "css-value",
   "version": "0.0.1",
   "description": "CSS value parser",
   "keywords": ["css", "parser", "value"],

css-value/reworkcss-value.d.ts

@@ -1,4 +1,4 @@
-declare module "js-libs/reworkcss-value" {
+declare module "css-value" {
     export interface CSSValue {
         type: string;
         string: string;

css/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "reworkcss",
+  "name": "css",
   "version": "2.1.0",
   "description": "CSS parser",
   "main": "reworkcss.js",

css/reworkcss.d.ts

@@ -1,4 +1,4 @@
-declare module "js-libs/reworkcss" {
+declare module "css" {
     export interface Position {
         start: { line: number; column: number };
         end: { line: number; column: number };
@@ -28,4 +28,4 @@ declare module "js-libs/reworkcss" {
     }
 
     export function parse(css: string, options: any): SyntaxTree;
-}
+}

gruntfile.js

@@ -199,6 +199,8 @@ module.exports = function(grunt) {
                 src: [
                     "./js-libs/**/*.js",
                     "./fetch/**/*.js",
+                    "./css/**/*.js",
+                    "./css-value/**/*.js",
                 ],
                 dest: "<%= localCfg.outModulesDir %>/",
                 cwd: localCfg.srcDir

tsconfig.json

@@ -309,7 +309,7 @@
         "./js-libs/easysax/easysax.d.ts",
         "./js-libs/esprima/esprima.d.ts",
         "./js-libs/polymer-expressions/polymer-expressions.d.ts",
-        "./js-libs/reworkcss/reworkcss.d.ts",
+        "./css/reworkcss.d.ts",
         "./libjs.d.ts",
         "./location/location-common.ts",
         "./location/location.android.ts",

ui/styling/background-common.ts

@@ -3,7 +3,7 @@ import colorModule = require("color");
 import types = require("utils/types");
 import enums = require("ui/enums");
 import dts = require("ui/styling/background");
-import cssValue = require("js-libs/reworkcss-value");
+import cssValue = require("css-value");
 
 export class Background implements dts.Background {
     public static default = new Background(undefined, undefined, undefined, undefined, undefined);

ui/styling/css-selector.d.ts

@@ -1,6 +1,6 @@
 declare module "ui/styling/css-selector" {
     import view = require("ui/core/view");
-    import cssParser = require("js-libs/reworkcss");
+    import cssParser = require("css");
     import styleProperty = require("ui/styling/style-property");
 
     export class CssSelector {
@@ -53,4 +53,4 @@
     }
 
     export function applyInlineSyle(view: view.View, declarations: cssParser.Declaration[]);
-}
+}

ui/styling/css-selector.ts

@@ -1,6 +1,6 @@
 import view = require("ui/core/view");
 import observable = require("ui/core/dependency-observable");
-import cssParser = require("js-libs/reworkcss");
+import cssParser = require("css");
 import styleProperty = require("ui/styling/style-property");
 import trace = require("trace");
 
@@ -186,4 +186,4 @@ class InlineStyleSelector extends CssSelector {
 export function applyInlineSyle(view: view.View, declarations: cssParser.Declaration[]) {
     var localStyleSelector = new InlineStyleSelector(declarations);
     localStyleSelector.apply(view);
-}
+}

ui/styling/style-scope.ts

@@ -1,7 +1,7 @@
 import view = require("ui/core/view");
 import trace = require("trace");
 import cssSelector = require("ui/styling/css-selector");
-import cssParser = require("js-libs/reworkcss");
+import cssParser = require("css");
 import {VisualState} from "ui/styling/visual-state";
 import application = require("application");
 import utils = require("utils/utils");