diff --git a/local/rollup/src/pipeline.build.js b/local/rollup/src/pipeline.build.js index 99f5394..87f1ab6 100644 --- a/local/rollup/src/pipeline.build.js +++ b/local/rollup/src/pipeline.build.js @@ -72,7 +72,7 @@ module.exports = (resolve, options, esm) => { plugins: [ rollupLicense(banner, sourcemap), rollupAlias(alias), - rollupScss(extractStyles, false, sourcemap), + rollupScss(banner, sourcemap, extractStyles, false), rollupTs(srcPath), rollupResolve(srcPath, resolve), rollupCommonjs(sourcemap, resolve), diff --git a/local/rollup/src/pipeline.common.plugins.js b/local/rollup/src/pipeline.common.plugins.js index 1e35002..e7352c7 100644 --- a/local/rollup/src/pipeline.common.plugins.js +++ b/local/rollup/src/pipeline.common.plugins.js @@ -30,13 +30,21 @@ module.exports = { moduleDirectories: resolve.directories, extensions: resolve.extensions, }), - rollupScss: (extractStyleOption, output, sourceMap) => { + rollupScss: (banner, sourceMap, extractStyleOption, output) => { if (extractStyleOption) { return output ? rollupPluginScss({ output, sourceMap, sass, + prefix: banner + ? `/*! \r\n${banner + .replace(/\r\n/g, '\r') + .replace(/\n/g, '\r') + .split(/\r/) + .map((line) => ` * ${line}\r\n`) + .join('')} */` + : undefined, processor: () => postcss([autoprefixer()]), }) : rollupPluginIgnoreImport({ diff --git a/local/rollup/src/pipeline.dev.js b/local/rollup/src/pipeline.dev.js index af05cc9..e2ecb28 100644 --- a/local/rollup/src/pipeline.dev.js +++ b/local/rollup/src/pipeline.dev.js @@ -8,7 +8,7 @@ const { } = require('./pipeline.common.plugins'); module.exports = (resolve, options) => { - const { rollup, paths, alias, extractStyles } = options; + const { rollup, paths, alias, extractStyles, banner } = options; const { output: rollupOutput, input, plugins = [], ...rollupOptions } = rollup; const { file, sourcemap: rawSourcemap, ...outputConfig } = rollupOutput; const { src: srcPath, dist: distPath } = paths; @@ -28,7 +28,7 @@ module.exports = (resolve, options) => { ...rollupOptions, plugins: [ rollupAlias(alias), - rollupScss(extractStyles, false, sourcemap), + rollupScss(banner, sourcemap, extractStyles, false), rollupEsBuild(), rollupResolve(srcPath, resolve), rollupCommonjs(sourcemap, resolve), diff --git a/local/rollup/src/pipeline.styles.js b/local/rollup/src/pipeline.styles.js index b0c7e4b..c0c13eb 100644 --- a/local/rollup/src/pipeline.styles.js +++ b/local/rollup/src/pipeline.styles.js @@ -2,7 +2,7 @@ const path = require('path'); const { rollupResolve, rollupScss, rollupEsBuild } = require('./pipeline.common.plugins'); module.exports = (resolve, options) => { - const { rollup, paths } = options; + const { rollup, paths, banner } = options; const { output: rollupOutput, input } = rollup; const { file, sourcemap } = rollupOutput; const { src: srcPath, styles: stylesPath } = paths; @@ -12,7 +12,7 @@ module.exports = (resolve, options) => { input, plugins: [ rollupResolve(srcPath, resolve), - rollupScss(true, path.resolve(stylesPath, `${file}.css`), sourcemap), + rollupScss(banner, sourcemap, true, path.resolve(stylesPath, `${file}.css`)), rollupEsBuild(), { generateBundle() { diff --git a/package-lock.json b/package-lock.json index 7fbe895..782756f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,9 +7,6 @@ "workspaces": [ "packages/*" ], - "bin": { - "workspace-root": "workspace.root.js" - }, "devDependencies": { "@babel/core": "^7.18.2", "@babel/plugin-transform-runtime": "^7.18.2", diff --git a/packages/overlayscrollbars/src/styles/scrollbars.scss b/packages/overlayscrollbars/src/styles/scrollbars.scss index 4d693ff..9dddc46 100644 --- a/packages/overlayscrollbars/src/styles/scrollbars.scss +++ b/packages/overlayscrollbars/src/styles/scrollbars.scss @@ -1,6 +1,3 @@ -[data-overlayscrollbars~='updating'] > .os-scrollbar { - display: none !important; -} .os-scrollbar { contain: strict; transition: opacity 0.3s, visibility 0.3s, top 0.3s, right 0.3s, bottom 0.3s, left 0.3s; @@ -77,6 +74,7 @@ body > .os-scrollbar { } /* NONE THEME: */ +[data-overlayscrollbars~='updating'] > .os-scrollbar, .os-theme-none.os-scrollbar { display: none !important; } diff --git a/packages/overlayscrollbars/styles/overlayscrollbars.css b/packages/overlayscrollbars/styles/overlayscrollbars.css index 4f5de68..c248656 100644 --- a/packages/overlayscrollbars/styles/overlayscrollbars.css +++ b/packages/overlayscrollbars/styles/overlayscrollbars.css @@ -1,3 +1,12 @@ +/*! + * OverlayScrollbars + * Version: 2.0.0-beta.0 + * + * Copyright (c) Rene Haas | KingSora. + * https://github.com/KingSora + * + * Released under the MIT license. + */ .os-size-observer, .os-size-observer-listener { direction: inherit; @@ -298,10 +307,6 @@ html.os-viewport-scrollbar-hidden > body[data-overlayscrollbars] { box-sizing: inherit; } -[data-overlayscrollbars~=updating] > .os-scrollbar { - display: none !important; -} - .os-scrollbar { contain: strict; transition: opacity 0.3s, visibility 0.3s, top 0.3s, right 0.3s, bottom 0.3s, left 0.3s; @@ -394,6 +399,7 @@ body > .os-scrollbar { } /* NONE THEME: */ +[data-overlayscrollbars~=updating] > .os-scrollbar, .os-theme-none.os-scrollbar { display: none !important; } diff --git a/packages/overlayscrollbars/styles/overlayscrollbars.css.map b/packages/overlayscrollbars/styles/overlayscrollbars.css.map index e1a0327..7c7abc1 100644 --- a/packages/overlayscrollbars/styles/overlayscrollbars.css.map +++ b/packages/overlayscrollbars/styles/overlayscrollbars.css.map @@ -1 +1 @@ -{"version":3,"sources":["../../src/styles/sizeobserver.scss","../overlayscrollbars.css","../../src/styles/trinsicobserver.scss","../../src/styles/structure.scss","../../src/styles/scrollbars.scss"],"names":[],"mappings":"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","file":"overlayscrollbars.css"} \ No newline at end of file +{"version":3,"sources":["../stdin","../../src/styles/sizeobserver.scss","../overlayscrollbars.css","../../src/styles/trinsicobserver.scss","../../src/styles/structure.scss","../../src/styles/scrollbars.scss"],"names":[],"mappings":"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","file":"overlayscrollbars.css"} \ No newline at end of file