From b91e323425944e3068a51e5d2da5eef811be9865 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Thu, 23 Sep 2021 16:35:52 +0300 Subject: [PATCH] build index.css --- lerna-debug.log | 69 ++++++++-- package.json | 1 + wax-prosemirror-services/rollup.config.js | 2 + .../src/CodeBlockService/CodeBlockService.js | 3 +- .../src/CodeBlockService/highlightStyles.css | 124 ++++++++++++++++++ yarn.lock | 20 +++ 6 files changed, 203 insertions(+), 16 deletions(-) create mode 100644 wax-prosemirror-services/src/CodeBlockService/highlightStyles.css diff --git a/lerna-debug.log b/lerna-debug.log index 836ad0307..1dd842896 100644 --- a/lerna-debug.log +++ b/lerna-debug.log @@ -1,23 +1,64 @@ -0 silly input [ 'clean' ] +0 silly input [ 'build' ] 1 silly flags { 1 silly flags _: [ 'run' ], 1 silly flags 'reject-cycles': false, 1 silly flags rejectCycles: false, -1 silly flags parallel: true, -1 silly flags script: 'clean', +1 silly flags script: 'build', 1 silly flags args: [] 1 silly flags } 2 verbose rootPath /home/chris/workspace/wax-prosemirror 3 info version 2.11.0 4 silly existsSync /home/chris/workspace/wax-prosemirror/VERSION -5 error EPACKAGES Errored while collecting packages and package graph -6 error JSONError: Unexpected token } in JSON at position 1058 while parsing near '...ties": "^0.0.40", }, "devDependencie...' in wax-prosemirror-core/package.json -6 error at module.exports (/home/chris/workspace/wax-prosemirror/node_modules/load-json-file/node_modules/parse-json/index.js:26:19) -6 error at parse (/home/chris/workspace/wax-prosemirror/node_modules/load-json-file/index.js:8:29) -6 error at Function.module.exports.sync (/home/chris/workspace/wax-prosemirror/node_modules/load-json-file/index.js:11:29) -6 error at Function.module.exports.sync (/home/chris/workspace/wax-prosemirror/node_modules/read-pkg/index.js:40:25) -6 error at /home/chris/workspace/wax-prosemirror/node_modules/lerna/lib/PackageUtilities.js:138:47 -6 error at Array.forEach (<anonymous>) -6 error at /home/chris/workspace/wax-prosemirror/node_modules/lerna/lib/PackageUtilities.js:132:86 -6 error at Array.forEach (<anonymous>) -6 error at Function.getPackages (/home/chris/workspace/wax-prosemirror/node_modules/lerna/lib/PackageUtilities.js:131:22) +5 silly initialize attempt +6 warn ECYCLE Encountered a cycle in the dependency graph.This may cause instability! Packages in cycle are: "wax-prosemirror-core", "wax-prosemirror-components", "wax-prosemirror-plugins", "wax-prosemirror-services" +7 silly packages [ 'wax-prosemirror-core' ] +8 silly initialize success +9 silly execute attempt +10 silly runScriptInDir build [] wax-prosemirror-utilities +11 silly getExecOpts { +11 silly getExecOpts cwd: '/home/chris/workspace/wax-prosemirror/wax-prosemirror-utilities' +11 silly getExecOpts } +12 silly runScriptInDir build [] wax-prosemirror-schema +13 silly getExecOpts { cwd: '/home/chris/workspace/wax-prosemirror/wax-prosemirror-schema' } +14 silly runScriptInDir build [] wax-prosemirror-core +15 silly getExecOpts { cwd: '/home/chris/workspace/wax-prosemirror/wax-prosemirror-core' } +16 silly runScriptInDir build [] wax-prosemirror-components +17 silly getExecOpts { +17 silly getExecOpts cwd: '/home/chris/workspace/wax-prosemirror/wax-prosemirror-components' +17 silly getExecOpts } +18 silly runScriptInDir build [] wax-prosemirror-plugins +19 silly getExecOpts { +19 silly getExecOpts cwd: '/home/chris/workspace/wax-prosemirror/wax-prosemirror-plugins' +19 silly getExecOpts } +20 silly runScriptInDir build [] wax-prosemirror-services +21 silly getExecOpts { +21 silly getExecOpts cwd: '/home/chris/workspace/wax-prosemirror/wax-prosemirror-services' +21 silly getExecOpts } +22 error build Errored while running script in 'wax-prosemirror-services' +23 error execute callback with error +24 error Error: Command failed: yarn run build +24 error loaded rollup.config.js with warnings +24 error (!) Unused external imports +24 error terser imported from external module 'rollup-plugin-terser' but never used +24 error +24 error index.js → dist/index.js... +24 error Browserslist: caniuse-lite is outdated. Please run: +24 error npx browserslist@latest --update-db +24 error [!] Error: Could not resolve './highlightStyles' from src/CodeBlockService/CodeBlockService.js +24 error Error: Could not resolve './highlightStyles' from src/CodeBlockService/CodeBlockService.js +24 error at error (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:5171:30) +24 error at ModuleLoader.handleResolveId (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:17864:24) +24 error at /home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:17856:22 +24 error at async Promise.all (index 5) +24 error at ModuleLoader.fetchStaticDependencies (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:17854:34) +24 error at async Promise.all (index 0) +24 error at ModuleLoader.fetchModule (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:17831:9) +24 error at async Promise.all (index 20) +24 error at ModuleLoader.fetchStaticDependencies (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:17854:34) +24 error at async Promise.all (index 0) +24 error +24 error error Command failed with exit code 1. +24 error $ BABEL_ENV=production rollup -c +24 error info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command. +24 error +24 error at /home/chris/workspace/wax-prosemirror/node_modules/lerna/node_modules/execa/index.js:236:11 diff --git a/package.json b/package.json index d4129a43d..62e85f2ff 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ "rollup-plugin-babel": "^4.4.0", "rollup-plugin-peer-deps-external": "^2.2.2", "rollup-plugin-terser": "^5.3.0", + "rollup-plugin-import-css": "^3.0.2", "style-loader": "^0.23.1", "styled-components": "^5.3.0", "svg-inline-loader": "^0.8.0" diff --git a/wax-prosemirror-services/rollup.config.js b/wax-prosemirror-services/rollup.config.js index 9104a937f..acb96af95 100644 --- a/wax-prosemirror-services/rollup.config.js +++ b/wax-prosemirror-services/rollup.config.js @@ -2,6 +2,7 @@ import babel from 'rollup-plugin-babel'; import commonjs from '@rollup/plugin-commonjs'; import external from 'rollup-plugin-peer-deps-external'; import { terser } from 'rollup-plugin-terser'; +import css from 'rollup-plugin-import-css'; export default { input: 'index.js', @@ -13,6 +14,7 @@ export default { }, ], plugins: [ + css(), external({ includeDependencies: true, }), diff --git a/wax-prosemirror-services/src/CodeBlockService/CodeBlockService.js b/wax-prosemirror-services/src/CodeBlockService/CodeBlockService.js index 2e851d322..724bc3a96 100644 --- a/wax-prosemirror-services/src/CodeBlockService/CodeBlockService.js +++ b/wax-prosemirror-services/src/CodeBlockService/CodeBlockService.js @@ -1,9 +1,8 @@ import { highlightPlugin } from 'wax-prosemirror-plugins'; -import 'highlight.js/styles/github.css'; - import { codeBlockNode } from 'wax-prosemirror-schema'; import Service from '../Service'; import CodeBlockTool from './CodeBlockTool'; +import './highlightStyles.css'; export default class CodeBlockService extends Service { boot() { diff --git a/wax-prosemirror-services/src/CodeBlockService/highlightStyles.css b/wax-prosemirror-services/src/CodeBlockService/highlightStyles.css new file mode 100644 index 000000000..d1fc72738 --- /dev/null +++ b/wax-prosemirror-services/src/CodeBlockService/highlightStyles.css @@ -0,0 +1,124 @@ +/*! + Theme: GitHub + Description: Light theme as seen on github.com + Author: github.com + Maintainer: @Hirse + Updated: 2021-05-15 + Outdated base version: https://github.com/primer/github-syntax-light + Current colors taken from GitHub's CSS +*/ + +.hljs { + color: #24292e; + background: #ffffff; +} + +.hljs-doctag, +.hljs-keyword, +.hljs-meta .hljs-keyword, +.hljs-template-tag, +.hljs-template-variable, +.hljs-type, +.hljs-variable.language_ { + /* prettylights-syntax-keyword */ + color: #d73a49; +} + +.hljs-title, +.hljs-title.class_, +.hljs-title.class_.inherited__, +.hljs-title.function_ { + /* prettylights-syntax-entity */ + color: #6f42c1; +} + +.hljs-attr, +.hljs-attribute, +.hljs-literal, +.hljs-meta, +.hljs-number, +.hljs-operator, +.hljs-variable, +.hljs-selector-attr, +.hljs-selector-class, +.hljs-selector-id { + /* prettylights-syntax-constant */ + color: #005cc5; +} + +.hljs-regexp, +.hljs-string, +.hljs-meta .hljs-string { + /* prettylights-syntax-string */ + color: #032f62; +} + +.hljs-built_in, +.hljs-symbol { + /* prettylights-syntax-variable */ + color: #e36209; +} + +.hljs-comment, +.hljs-code, +.hljs-formula { + /* prettylights-syntax-comment */ + color: #6a737d; +} + +.hljs-name, +.hljs-quote, +.hljs-selector-tag, +.hljs-selector-pseudo { + /* prettylights-syntax-entity-tag */ + color: #22863a; +} + +.hljs-subst { + /* prettylights-syntax-storage-modifier-import */ + color: #24292e; +} + +.hljs-section { + /* prettylights-syntax-markup-heading */ + color: #005cc5; + font-weight: bold; +} + +.hljs-bullet { + /* prettylights-syntax-markup-list */ + color: #735c0f; +} + +.hljs-emphasis { + /* prettylights-syntax-markup-italic */ + color: #24292e; + font-style: italic; +} + +.hljs-strong { + /* prettylights-syntax-markup-bold */ + color: #24292e; + font-weight: bold; +} + +.hljs-addition { + /* prettylights-syntax-markup-inserted */ + color: #22863a; + background-color: #f0fff4; +} + +.hljs-deletion { + /* prettylights-syntax-markup-deleted */ + color: #b31d28; + background-color: #ffeef0; +} + +.hljs-char.escape_, +.hljs-link, +.hljs-params, +.hljs-property, +.hljs-punctuation, +.hljs-tag { + /* purposely ignored */ +} diff --git a/yarn.lock b/yarn.lock index 7bbe51bc9..99c33e8ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2295,6 +2295,14 @@ estree-walker "^1.0.1" picomatch "^2.2.2" +"@rollup/pluginutils@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.1.1.tgz#1d4da86dd4eded15656a57d933fda2b9a08d47ec" + integrity sha512-clDjivHqWGXi7u+0d2r2sBi4Ie6VLEAzWMIkvJLnDmxoOhBYOTfzGbOQBA32THHm11/LiJbd01tJUpJsbshSWQ== + dependencies: + estree-walker "^2.0.1" + picomatch "^2.2.2" + "@storybook/addon-docs@^6.0.0-beta.45": version "6.0.0-beta.45" resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.0.0-beta.45.tgz#efbb0a39bc833a68937abfa80f936800334768b9" @@ -7994,6 +8002,11 @@ estree-walker@^1.0.1: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== +estree-walker@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -16550,6 +16563,13 @@ rollup-plugin-babel@^4.4.0: "@babel/helper-module-imports" "^7.0.0" rollup-pluginutils "^2.8.1" +rollup-plugin-import-css@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rollup-plugin-import-css/-/rollup-plugin-import-css-3.0.2.tgz#7b718aba264b08cff1f171a83fbf0a1b36ad47ca" + integrity sha512-4Y/U5EMQHomMlYSF0OBOo/XJSgfou+iHMfBOqneaX5Cp5BCyQn1YrUtXC6KYEPHPxTadC+oXhrTCr9yzRN2DyA== + dependencies: + "@rollup/pluginutils" "^4.1.1" + rollup-plugin-peer-deps-external@^2.2.2: version "2.2.3" resolved "https://registry.yarnpkg.com/rollup-plugin-peer-deps-external/-/rollup-plugin-peer-deps-external-2.2.3.tgz#059a8aec1eefb48a475e9fcedc3b9e3deb521213" -- GitLab