umbrella22

修正css-loader带来的css样式加载问题,更新依赖

...@@ -52,19 +52,44 @@ let rendererConfig = { ...@@ -52,19 +52,44 @@ let rendererConfig = {
52 // }, 52 // },
53 { 53 {
54 test: /\.scss$/, 54 test: /\.scss$/,
55 - use: ['vue-style-loader', 'css-loader', 'sass-loader'] 55 + use: ['vue-style-loader',
56 + {
57 + loader: 'css-loader',
58 + options: {
59 + esModule: false
60 + }
61 + },
62 + 'sass-loader']
56 }, 63 },
57 { 64 {
58 test: /\.sass$/, 65 test: /\.sass$/,
59 - use: ['vue-style-loader', 'css-loader', 'sass-loader?indentedSyntax'] 66 + use: ['vue-style-loader',
67 + {
68 + loader: 'css-loader',
69 + options: {
70 + esModule: false
71 + }
72 + }, 'sass-loader?indentedSyntax']
60 }, 73 },
61 { 74 {
62 test: /\.less$/, 75 test: /\.less$/,
63 - use: ['vue-style-loader', 'css-loader', 'less-loader'] 76 + use: ['vue-style-loader',
77 + {
78 + loader: 'css-loader',
79 + options: {
80 + esModule: false
81 + }
82 + }, 'less-loader']
64 }, 83 },
65 { 84 {
66 test: /\.css$/, 85 test: /\.css$/,
67 - use: ['vue-style-loader', 'css-loader'] 86 + use: ['vue-style-loader',
87 + {
88 + loader: 'css-loader',
89 + options: {
90 + esModule: false
91 + }
92 + }]
68 }, 93 },
69 { 94 {
70 test: /\.html$/, 95 test: /\.html$/,
...@@ -86,12 +111,6 @@ let rendererConfig = { ...@@ -86,12 +111,6 @@ let rendererConfig = {
86 options: { 111 options: {
87 cacheDirectory: 'node_modules/.cache/vue-loader', 112 cacheDirectory: 'node_modules/.cache/vue-loader',
88 cacheIdentifier: '7270960a', 113 cacheIdentifier: '7270960a',
89 - extractCSS: process.env.NODE_ENV === 'production',
90 - loaders: {
91 - sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax=1',
92 - scss: 'vue-style-loader!css-loader!sass-loader',
93 - less: 'vue-style-loader!css-loader!less-loader'
94 - }
95 } 114 }
96 } 115 }
97 }, 116 },
......
...@@ -39,19 +39,44 @@ let webConfig = { ...@@ -39,19 +39,44 @@ let webConfig = {
39 // }, 39 // },
40 { 40 {
41 test: /\.scss$/, 41 test: /\.scss$/,
42 - use: ['vue-style-loader', 'css-loader', 'sass-loader'] 42 + use: ['vue-style-loader',
43 + {
44 + loader: 'css-loader',
45 + options: {
46 + esModule: false
47 + }
48 + },
49 + 'sass-loader']
43 }, 50 },
44 { 51 {
45 test: /\.sass$/, 52 test: /\.sass$/,
46 - use: ['vue-style-loader', 'css-loader', 'sass-loader?indentedSyntax'] 53 + use: ['vue-style-loader',
54 + {
55 + loader: 'css-loader',
56 + options: {
57 + esModule: false
58 + }
59 + }, 'sass-loader?indentedSyntax']
47 }, 60 },
48 { 61 {
49 test: /\.less$/, 62 test: /\.less$/,
50 - use: ['vue-style-loader', 'css-loader', 'less-loader'] 63 + use: ['vue-style-loader',
64 + {
65 + loader: 'css-loader',
66 + options: {
67 + esModule: false
68 + }
69 + }, 'less-loader']
51 }, 70 },
52 { 71 {
53 test: /\.css$/, 72 test: /\.css$/,
54 - use: ['vue-style-loader', 'css-loader'] 73 + use: ['vue-style-loader',
74 + {
75 + loader: 'css-loader',
76 + options: {
77 + esModule: false
78 + }
79 + }]
55 }, 80 },
56 { 81 {
57 test: /\.html$/, 82 test: /\.html$/,
...@@ -72,12 +97,6 @@ let webConfig = { ...@@ -72,12 +97,6 @@ let webConfig = {
72 options: { 97 options: {
73 cacheDirectory: 'node_modules/.cache/vue-loader', 98 cacheDirectory: 'node_modules/.cache/vue-loader',
74 cacheIdentifier: '7270960a', 99 cacheIdentifier: '7270960a',
75 - extractCSS: process.env.NODE_ENV === 'production',
76 - loaders: {
77 - sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax=1',
78 - scss: 'vue-style-loader!css-loader!sass-loader',
79 - less: 'vue-style-loader!css-loader!less-loader'
80 - }
81 } 100 }
82 } 101 }
83 } 102 }
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
85 "vuex": "^3.5.1" 85 "vuex": "^3.5.1"
86 }, 86 },
87 "devDependencies": { 87 "devDependencies": {
88 - "@babel/core": "^7.10.5", 88 + "@babel/core": "^7.11.0",
89 "@babel/plugin-proposal-class-properties": "^7.10.4", 89 "@babel/plugin-proposal-class-properties": "^7.10.4",
90 "@babel/plugin-proposal-decorators": "^7.10.5", 90 "@babel/plugin-proposal-decorators": "^7.10.5",
91 "@babel/plugin-proposal-do-expressions": "^7.10.4", 91 "@babel/plugin-proposal-do-expressions": "^7.10.4",
...@@ -94,19 +94,19 @@ ...@@ -94,19 +94,19 @@
94 "@babel/plugin-proposal-function-bind": "^7.10.5", 94 "@babel/plugin-proposal-function-bind": "^7.10.5",
95 "@babel/plugin-proposal-function-sent": "^7.10.4", 95 "@babel/plugin-proposal-function-sent": "^7.10.4",
96 "@babel/plugin-proposal-json-strings": "^7.10.4", 96 "@babel/plugin-proposal-json-strings": "^7.10.4",
97 - "@babel/plugin-proposal-logical-assignment-operators": "^7.10.4", 97 + "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
98 "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4", 98 "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
99 "@babel/plugin-proposal-numeric-separator": "^7.10.4", 99 "@babel/plugin-proposal-numeric-separator": "^7.10.4",
100 - "@babel/plugin-proposal-optional-chaining": "^7.10.4", 100 + "@babel/plugin-proposal-optional-chaining": "^7.11.0",
101 "@babel/plugin-proposal-pipeline-operator": "^7.10.5", 101 "@babel/plugin-proposal-pipeline-operator": "^7.10.5",
102 "@babel/plugin-proposal-throw-expressions": "^7.10.4", 102 "@babel/plugin-proposal-throw-expressions": "^7.10.4",
103 "@babel/plugin-syntax-dynamic-import": "^7.8.3", 103 "@babel/plugin-syntax-dynamic-import": "^7.8.3",
104 "@babel/plugin-syntax-import-meta": "^7.10.4", 104 "@babel/plugin-syntax-import-meta": "^7.10.4",
105 - "@babel/plugin-transform-runtime": "^7.10.5", 105 + "@babel/plugin-transform-runtime": "^7.11.0",
106 "@babel/polyfill": "^7.10.4", 106 "@babel/polyfill": "^7.10.4",
107 - "@babel/preset-env": "^7.10.4", 107 + "@babel/preset-env": "^7.11.0",
108 "@babel/register": "^7.10.5", 108 "@babel/register": "^7.10.5",
109 - "@babel/runtime": "^7.10.5", 109 + "@babel/runtime": "^7.11.0",
110 "ajv": "^6.12.3", 110 "ajv": "^6.12.3",
111 "babel-eslint": "^9.0.0", 111 "babel-eslint": "^9.0.0",
112 "babel-loader": "^8.1.0", 112 "babel-loader": "^8.1.0",
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
116 "chalk": "^4.0.0", 116 "chalk": "^4.0.0",
117 "copy-webpack-plugin": "^6.0.3", 117 "copy-webpack-plugin": "^6.0.3",
118 "cross-env": "^7.0.2", 118 "cross-env": "^7.0.2",
119 - "css-loader": "^4.1.0", 119 + "css-loader": "^4.2.0",
120 "del": "^5.1.0", 120 "del": "^5.1.0",
121 "electron": "^9.1.2", 121 "electron": "^9.1.2",
122 "electron-builder": "^22.6.1", 122 "electron-builder": "^22.6.1",
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
149 "vue-loader": "^15.9.3", 149 "vue-loader": "^15.9.3",
150 "vue-style-loader": "^4.1.2", 150 "vue-style-loader": "^4.1.2",
151 "vue-template-compiler": "^2.6.11", 151 "vue-template-compiler": "^2.6.11",
152 - "webpack": "^4.44.0", 152 + "webpack": "^4.44.1",
153 "webpack-cli": "^3.3.12", 153 "webpack-cli": "^3.3.12",
154 "webpack-dev-server": "^3.11.0", 154 "webpack-dev-server": "^3.11.0",
155 "webpack-hot-middleware": "^2.25.0", 155 "webpack-hot-middleware": "^2.25.0",
......