From 608458375cb12d18a52b062fdfed2a5a5907e9c8 Mon Sep 17 00:00:00 2001 From: Phodal Huang Date: Mon, 30 Mar 2020 18:28:37 +0800 Subject: [PATCH] refactor: change marked usage for ie11 --- package.json | 1 + .../presentation/maturity/maturity.component.ts | 2 +- .../markdown-render.component.ts | 2 +- .../markdown-reporter.component.ts | 2 +- .../model/ledge-markdown-converter.ts | 2 +- .../process-table/process-table.component.ts | 2 +- src/polyfills.ts | 17 +++++++++++++++++ yarn.lock | 2 +- 8 files changed, 24 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 45b205f6..eb75b40e 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "@angular/platform-browser-dynamic": "^9.1.0", "@angular/router": "~9.0.3", "@ngx-pwa/local-storage": "^9.0.2", + "core-js": "^3.6.4", "d3": "^5.15.0", "d3-graphviz": "^3.0.4", "dagre-d3": "^0.6.4", diff --git a/src/app/presentation/maturity/maturity.component.ts b/src/app/presentation/maturity/maturity.component.ts index 600b2971..a91cbe48 100644 --- a/src/app/presentation/maturity/maturity.component.ts +++ b/src/app/presentation/maturity/maturity.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import marked from 'marked'; +import marked from 'marked/lib/marked'; import MarkdownHelper from '../../shared/components/model/markdown.helper'; import {MarkdownTaskItemService} from '../../shared/components/markdown-radar-chart/markdown-task-item.service'; import {MarkdownListModel} from '../../shared/components/model/markdown.model'; diff --git a/src/app/shared/components/markdown-render/markdown-render.component.ts b/src/app/shared/components/markdown-render/markdown-render.component.ts index 4ac75a06..7d60fb8f 100644 --- a/src/app/shared/components/markdown-render/markdown-render.component.ts +++ b/src/app/shared/components/markdown-render/markdown-render.component.ts @@ -15,7 +15,7 @@ import {DOCUMENT, Location} from '@angular/common'; import {ActivatedRoute} from '@angular/router'; import {MarkdownService} from 'ngx-markdown'; -import marked, {Slugger} from 'marked'; +import marked, {Slugger} from 'marked/lib/marked'; import {maxBy} from 'lodash-es'; import * as echarts from 'echarts'; diff --git a/src/app/shared/components/markdown-reporter/markdown-reporter.component.ts b/src/app/shared/components/markdown-reporter/markdown-reporter.component.ts index fa87825b..477cf884 100644 --- a/src/app/shared/components/markdown-reporter/markdown-reporter.component.ts +++ b/src/app/shared/components/markdown-reporter/markdown-reporter.component.ts @@ -1,5 +1,5 @@ import {AfterViewInit, Component, Input, OnInit} from '@angular/core'; -import marked from 'marked'; +import marked from 'marked/lib/marked'; import {ReporterChartModel} from '../model/reporter-chart.model'; import * as d3 from 'd3'; diff --git a/src/app/shared/components/model/ledge-markdown-converter.ts b/src/app/shared/components/model/ledge-markdown-converter.ts index 9f17e44a..59103051 100644 --- a/src/app/shared/components/model/ledge-markdown-converter.ts +++ b/src/app/shared/components/model/ledge-markdown-converter.ts @@ -1,4 +1,4 @@ -import marked from 'marked'; +import marked from 'marked/lib/marked'; import { zip } from 'lodash-es'; const LedgeMarkdownConverter = { diff --git a/src/app/shared/components/process-table/process-table.component.ts b/src/app/shared/components/process-table/process-table.component.ts index e148bfb6..ac5b35e3 100644 --- a/src/app/shared/components/process-table/process-table.component.ts +++ b/src/app/shared/components/process-table/process-table.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import marked from 'marked'; +import marked from 'marked/lib/marked'; import { zip } from 'lodash-es'; interface ProcessTable { diff --git a/src/polyfills.ts b/src/polyfills.ts index 6dbc397d..390c77a0 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -18,6 +18,23 @@ * BROWSER POLYFILLS */ +import 'core-js/es/object'; +import 'core-js/es/function'; +import 'core-js/es/parse-int'; +import 'core-js/es/parse-float'; +import 'core-js/es/number'; +import 'core-js/es/math'; +import 'core-js/es/string'; +import 'core-js/es/date'; +import 'core-js/es/array'; +import 'core-js/es/regexp'; +import 'core-js/es/map'; +import 'core-js/es/weak-map'; +import 'core-js/es/set'; + + +import 'core-js/es/reflect'; + /** IE10 and IE11 requires the following for NgClass support on SVG elements */ // import 'classlist.js'; // Run `npm install --save classlist.js`. diff --git a/yarn.lock b/yarn.lock index a3a48562..e6e1b18d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2720,7 +2720,7 @@ core-js-compat@^3.6.0: browserslist "^4.8.3" semver "7.0.0" -core-js@3.6.4, core-js@^3.1.3: +core-js@3.6.4, core-js@^3.1.3, core-js@^3.6.4: version "3.6.4" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647" integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==