fix: sass头部添加变量引用链接

taoyage · Jun 26, 2022 · 9f6fa8b · 9f6fa8b
1 parent 36410b1
commit 9f6fa8b
Show file tree

Hide file tree

Showing 23 changed files with 5,879 additions and 604 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ node_modules
 esm
 cjs
 lib
+es
 .idea/
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "A react mobile components lib",
   "main": "lib/index.js",
   "module": "es/index.js",
-  "typings": "lib/index.d.ts",
+  "typings": "lib/typing/index.d.ts",
   "scripts": {
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
@@ -56,6 +56,7 @@
     "babel-loader": "^8.2.5",
     "chalk": "^4.0.0",
     "gulp-if": "^3.0.0",
+    "gulp-image": "^5.1.0",
     "gulp-sass": "^5.1.0",
     "gulp-style-aliases": "^1.1.11",
     "gulp-ts-alias": "^1.3.0",

diff --git a/packages/.DS_Store b/packages/.DS_Store
diff --git a/packages/button/styles/index.scss b/packages/button/styles/index.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 .ygm-button {
   color: $ygm-color-text;
   background-color: $ygm-color-white;

diff --git a/packages/card/styles/index.scss b/packages/card/styles/index.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 .ygm-card {
   background: $ygm-color-white;
   border-radius: 13px;

diff --git a/packages/countdown/styles/index.scss b/packages/countdown/styles/index.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 .ygm-countdown {
   display: flex;
   align-items: center;

diff --git a/packages/image/index.tsx b/packages/image/index.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import useIntersectionObserver from '@/hooks/useIntersectionObserver';
 
-import placeholderImg from './placeholder.png';
+// @ts-ignore
+import placeholderImg from '@/image/placeholder.png';
 
 export interface ImageProps {
   src: string;

diff --git a/packages/mask/styles/index.scss b/packages/mask/styles/index.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 .ygm-mask {
   z-index: 999;
   position: fixed;

diff --git a/packages/nav-bar/styles/index.scss b/packages/nav-bar/styles/index.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 .ygm-nav-bar {
   height: 45px;
   border-bottom: none;

diff --git a/packages/popup/styles/index.scss b/packages/popup/styles/index.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 .ygm-popup {
   z-index: 1001;
   position: fixed;

diff --git a/packages/pull-to-refresh/styles/index.scss b/packages/pull-to-refresh/styles/index.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 .ygm-pull-to-refresh {
   overflow: hidden;
   user-select: none;

diff --git a/packages/space/index.tsx b/packages/space/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import cx from 'classnames';
 
-import './index.scss';
+import './styles/index.scss';
 
 export interface SpaceProps {
   /** 间距方向 */

diff --git a/packages/space/index.scss → packages/space/styles/index.scss b/packages/space/index.scss → packages/space/styles/index.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 $class-prefix-space: 'ygm-space';
 
 .#{$class-prefix-space} {

diff --git a/packages/spinner-loading/styles/index.scss b/packages/spinner-loading/styles/index.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 .ygm-spinner {
   &-loading {
     border-top: 1px solid;

diff --git a/packages/swiper/styles/swiper-item.scss b/packages/swiper/styles/swiper-item.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 .ygm-swiper-item {
   display: block;
   width: 100%;

diff --git a/packages/swiper/styles/swiper-page-indicator.scss b/packages/swiper/styles/swiper-page-indicator.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 .ygm-swiper-page-indicator {
   display: flex;
   width: auto;

diff --git a/packages/swiper/styles/swiper.scss b/packages/swiper/styles/swiper.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 .ygm-swiper {
   width: 100%;
   height: auto;

diff --git a/packages/toast/styles/index.scss b/packages/toast/styles/index.scss
@@ -1,3 +1,5 @@
+@import '../../styles/variable.scss';
+
 .ygm-toast {
   position: fixed;
   top: 0;

diff --git a/typings.d.ts → packages/typings/index.d.ts b/typings.d.ts → packages/typings/index.d.ts
diff --git a/scripts/utils/babel.js b/scripts/utils/babel.js
@@ -60,6 +60,7 @@ module.exports = function (opts) {
         base: srcPath,
       })
       .pipe(gulpIf((f) => isTsFile(f.path), gulpAlias({ configuration: tsConfig })))
+      .pipe(gulpIf((f) => isStyleFile(f.path), gulpAlias({ configuration: tsConfig })))
       .pipe(
         gulpIf(
           (f) => isStyleFile(f.path),
@@ -101,7 +102,7 @@ module.exports = function (opts) {
         base: srcPath,
       })
       .pipe(gulpIf((f) => isTsFile(f.path), gulpAlias({ configuration: tsConfig })))
-      .pipe(gulpIf((f) => isTsFile(f.path), gulpTs(tsConfig)))
+      .pipe(gulpIf((f) => isTsFile(f.path), gulpTs({ ...tsConfig, files: [path.join(cwd, 'typings.d.ts')] })))
       .pipe(vfs.dest(targetPath));
   }
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -14,5 +14,6 @@
   },
   "include": ["packages", "stories"],
   "exclude": ["node_modules"],
-  "files": ["./typings.d.ts"]
+  "files": ["./packages/typings/index.d.ts"],
+  "typeRoots": ["./packages/typings"]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ node_modules @@
     esm
     cjs
     lib
+    es
     .idea/