diff --git a/apps/automated/webpack.custom.config.js b/apps/automated/webpack.custom.config.js index f13fc0393..02e1478d4 100644 --- a/apps/automated/webpack.custom.config.js +++ b/apps/automated/webpack.custom.config.js @@ -12,7 +12,10 @@ module.exports = (env) => { ])) baseConfig.plugins.push(new webpack.DefinePlugin({ - __CI__: !!process.env.CI + __CI__: !!process.env.CI, + __UI_USE_XML_PARSER__: true, + __UI_USE_EXTERNAL_RENDERER__: false, + __CSS_PARSER__: JSON.stringify('css-tree') })) return baseConfig; diff --git a/packages/core/.gitignore b/packages/core/.gitignore index 7fe498c27..1a34b6d4e 100644 --- a/packages/core/.gitignore +++ b/packages/core/.gitignore @@ -5,7 +5,6 @@ dist !xml/xml.js !js-libs/**/*.* !cli-hooks/**/*.* -!css/**/*.js !css/**/*.ts css/parser.js* css/system-classes.js* diff --git a/packages/core/__tests__/css/parser.ts b/packages/core/__tests__/css/parser.ts index 2fabfc3d2..ac877496b 100644 --- a/packages/core/__tests__/css/parser.ts +++ b/packages/core/__tests__/css/parser.ts @@ -1,5 +1,7 @@ import { assert } from 'chai'; -import { parseURL, parseColor, parsePercentageOrLength, parseBackgroundPosition, parseBackground, parseSelector, AttributeSelectorTest, CSS3Parser, TokenObjectType, CSSNativeScript } from '@nativescript/core/css/parser'; +import { parseURL, parseColor, parsePercentageOrLength, parseBackgroundPosition, parseBackground, parseSelector, AttributeSelectorTest } from '@nativescript/core/css/parser'; +import { CSS3Parser, TokenObjectType } from '@nativescript/core/css/CSS3Parser'; +import { CSSNativeScript } from '@nativescript/core/css/CSSNativeScript'; import * as fs from 'fs'; import * as shadyCss from 'shady-css-parser'; diff --git a/packages/core/css/.gitignore b/packages/core/css/.gitignore new file mode 100644 index 000000000..1fabb47f1 --- /dev/null +++ b/packages/core/css/.gitignore @@ -0,0 +1 @@ +!reworkcss.js \ No newline at end of file diff --git a/packages/core/ui/styling/style-scope.ts b/packages/core/ui/styling/style-scope.ts index 717dce964..659b3b6f4 100644 --- a/packages/core/ui/styling/style-scope.ts +++ b/packages/core/ui/styling/style-scope.ts @@ -3,8 +3,6 @@ import { ViewBase } from '../core/view-base'; import { View } from '../core/view'; import { unsetValue, _evaluateCssVariableExpression, _evaluateCssCalcExpression, isCssVariable, isCssVariableExpression, isCssCalcExpression } from '../core/properties'; import { SyntaxTree, Keyframes as KeyframesDefinition, parse as parseCss, Node as CssNode } from '../../css'; -import { CSS3Parser, CSSNativeScript } from '../../css/parser'; -import { cssTreeParse } from '../../css/css-tree-parser'; import { RuleSet, SelectorsMap, SelectorCore, SelectorsMatch, ChangeMap, fromAstNodes, Node } from './css-selector'; import { Trace } from '../../trace'; diff --git a/packages/core/xml/index.js b/packages/core/xml/index.js index d8fdb947f..e7786fcf6 100644 --- a/packages/core/xml/index.js +++ b/packages/core/xml/index.js @@ -1,6 +1,5 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.XmlParser = exports.ParserEvent = exports.ParserEventType = void 0; -var easysax = require('../js-libs/easysax'); var easysax_1 = require("../js-libs/easysax"); var ParserEventType = (function () { function ParserEventType() {