diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/app.acss b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/app.acss index 207d5d480..8e21a772c 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/app.acss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/app.acss @@ -1,3 +1,4 @@ +@import "./remax-styles.acss"; page { background-image: url('/assets/images/dont-exist.jpg'); background: #eee; diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/app.js b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/app.js index f5b2ee23c..834d3b4e7 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/app.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/app.js @@ -1,4 +1,5 @@ require('./runtime.js'); +require('./remax-styles.js'); (my["webpackJsonp"] = my["webpackJsonp"] || []).push([[1],[ /* 0 */ /***/ (function(module, exports, __webpack_require__) { @@ -148,4 +149,4 @@ __webpack_require__.r(__webpack_exports__); /* harmony default export */ __webpack_exports__["default"] = (__webpack_require__.p + "31d6cfe0d16ae931b73c59d7e0c089c0.png"); /***/ }) -],[[0,0]]]); \ No newline at end of file +],[[0,0,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/packageA/pages/index.acss b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/packageA/pages/index.acss index ee000bc9f..84b824366 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/packageA/pages/index.acss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/packageA/pages/index.acss @@ -1,7 +1,4 @@ -.c { - background-color: red; -} - +@import "./../../remax-styles.acss"; .pageA-index { background-color: aliceblue; } diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/packageA/pages/index.js b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/packageA/pages/index.js index ac563e204..290a12deb 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/packageA/pages/index.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/packageA/pages/index.js @@ -1,54 +1,31 @@ require('./../../runtime.js'); require('./../../remax-vendors.js'); -(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[3],[ -/* 0 */, -/* 1 */, -/* 2 */ -/***/ (function(module, exports) { - -module.exports = require("@remax/runtime"); +require('./../../remax-styles.js'); +(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[3],{ -/***/ }), -/* 3 */, -/* 4 */, -/* 5 */, -/* 6 */ +/***/ 11: /***/ (function(module, exports) { -module.exports = require("react"); +module.exports = require("remax/ali"); /***/ }), -/* 7 */, -/* 8 */, -/* 9 */, -/* 10 */, -/* 11 */ + +/***/ 2: /***/ (function(module, exports) { -module.exports = require("remax/ali"); +module.exports = require("@remax/runtime"); /***/ }), -/* 12 */, -/* 13 */, -/* 14 */ -/***/ (function(module, exports, __webpack_require__) { - -// extracted by mini-css-extract-plugin -/***/ }), -/* 15 */, -/* 16 */, -/* 17 */, -/* 18 */, -/* 19 */, -/* 20 */ +/***/ 20: /***/ (function(module, exports, __webpack_require__) { module.exports = __webpack_require__(21); /***/ }), -/* 21 */ + +/***/ 21: /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -94,10 +71,19 @@ var _page = function _page() { /* harmony default export */ __webpack_exports__["default"] = (Page(Object(_remax_runtime__WEBPACK_IMPORTED_MODULE_0__["createPageConfig"])(_page, "packageA/pages/index"))); /***/ }), -/* 22 */ + +/***/ 22: /***/ (function(module, exports, __webpack_require__) { // extracted by mini-css-extract-plugin +/***/ }), + +/***/ 6: +/***/ (function(module, exports) { + +module.exports = require("react"); + /***/ }) -],[[20,0,5]]]); \ No newline at end of file + +},[[20,0,6,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/classPage.acss b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/classPage.acss index e69de29bb..8c6866eab 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/classPage.acss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/classPage.acss @@ -0,0 +1 @@ +@import "./../remax-styles.acss"; diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/classPage.js b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/classPage.js index bd8622323..458a1db30 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/classPage.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/classPage.js @@ -1,5 +1,6 @@ require('./../runtime.js'); -(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[4],{ +require('./../remax-styles.js'); +(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[5],{ /***/ 17: /***/ (function(module, exports, __webpack_require__) { @@ -108,4 +109,4 @@ module.exports = require("react"); /***/ }) -},[[17,0]]]); \ No newline at end of file +},[[17,0,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/index.acss b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/index.acss index 182103046..ae292b804 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/index.acss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/index.acss @@ -1,7 +1,4 @@ -.c { - background-color: red; -} - +@import "./../remax-styles.acss"; .page-index___1ZW9Y { background-color: aliceblue; } diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/index.js b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/index.js index 15d8d707f..9611a688b 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/index.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/index.js @@ -1,5 +1,6 @@ require('./../runtime.js'); require('./../remax-vendors.js'); +require('./../remax-styles.js'); (my["webpackJsonp"] = my["webpackJsonp"] || []).push([[2],[ /* 0 */, /* 1 */, @@ -133,12 +134,7 @@ module.exports = require("remax/wechat"); /***/ }), /* 13 */, -/* 14 */ -/***/ (function(module, exports, __webpack_require__) { - -// extracted by mini-css-extract-plugin - -/***/ }), +/* 14 */, /* 15 */ /***/ (function(module) { @@ -152,4 +148,4 @@ module.exports = JSON.parse("{\"data\":\"value\"}"); module.exports = {"page-index":"page-index___1ZW9Y"}; /***/ }) -],[[8,0,5]]]); \ No newline at end of file +],[[8,0,6,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/remax-styles.acss b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/remax-styles.acss new file mode 100644 index 000000000..0cdc233c0 --- /dev/null +++ b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/remax-styles.acss @@ -0,0 +1,4 @@ +.c { + background-color: red; +} + diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/remax-styles.js b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/remax-styles.js new file mode 100644 index 000000000..f1983876f --- /dev/null +++ b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/remax-styles.js @@ -0,0 +1,10 @@ +(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[4],{ + +/***/ 14: +/***/ (function(module, exports, __webpack_require__) { + +// extracted by mini-css-extract-plugin + +/***/ }) + +}]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/remax-vendors.js b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/remax-vendors.js index 9decf6d28..beb8edaa8 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/remax-vendors.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/remax-vendors.js @@ -1,4 +1,4 @@ -(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[5],{ +(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[6],{ /***/ 13: /***/ (function(module, __webpack_exports__, __webpack_require__) { diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/app.acss b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/app.acss index 207d5d480..8e21a772c 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/app.acss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/app.acss @@ -1,3 +1,4 @@ +@import "./remax-styles.acss"; page { background-image: url('/assets/images/dont-exist.jpg'); background: #eee; diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/app.js b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/app.js index 294d008d9..f22ff1ea2 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/app.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/app.js @@ -1,4 +1,5 @@ require('./runtime.js'); +require('./remax-styles.js'); (my["webpackJsonp"] = my["webpackJsonp"] || []).push([[1],[ /* 0 */ /***/ (function(module, exports, __webpack_require__) { @@ -143,4 +144,4 @@ __webpack_require__.r(__webpack_exports__); /* harmony default export */ __webpack_exports__["default"] = (__webpack_require__.p + "31d6cfe0d16ae931b73c59d7e0c089c0.png"); /***/ }) -],[[0,0]]]); \ No newline at end of file +],[[0,0,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/packageA/pages/index.acss b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/packageA/pages/index.acss index ee000bc9f..84b824366 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/packageA/pages/index.acss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/packageA/pages/index.acss @@ -1,7 +1,4 @@ -.c { - background-color: red; -} - +@import "./../../remax-styles.acss"; .pageA-index { background-color: aliceblue; } diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/packageA/pages/index.js b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/packageA/pages/index.js index d4a00a948..fb63fa45a 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/packageA/pages/index.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/packageA/pages/index.js @@ -1,5 +1,6 @@ require('./../../runtime.js'); require('./../../remax-vendors.js'); +require('./../../remax-styles.js'); (my["webpackJsonp"] = my["webpackJsonp"] || []).push([[3],[ /* 0 */, /* 1 */, @@ -30,12 +31,7 @@ module.exports = require("remax/ali"); /***/ }), /* 12 */, /* 13 */, -/* 14 */ -/***/ (function(module, exports, __webpack_require__) { - -// extracted by mini-css-extract-plugin - -/***/ }), +/* 14 */, /* 15 */, /* 16 */, /* 17 */ @@ -97,4 +93,4 @@ var _page = function _page() { // extracted by mini-css-extract-plugin /***/ }) -],[[17,0,4]]]); \ No newline at end of file +],[[17,0,5,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/pages/index.acss b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/pages/index.acss index 182103046..ae292b804 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/pages/index.acss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/pages/index.acss @@ -1,7 +1,4 @@ -.c { - background-color: red; -} - +@import "./../remax-styles.acss"; .page-index___1ZW9Y { background-color: aliceblue; } diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/pages/index.js b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/pages/index.js index c1328ca35..8275e463a 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/pages/index.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/pages/index.js @@ -1,5 +1,6 @@ require('./../runtime.js'); require('./../remax-vendors.js'); +require('./../remax-styles.js'); (my["webpackJsonp"] = my["webpackJsonp"] || []).push([[2],[ /* 0 */, /* 1 */, @@ -132,12 +133,7 @@ module.exports = require("remax/wechat"); /***/ }), /* 13 */, -/* 14 */ -/***/ (function(module, exports, __webpack_require__) { - -// extracted by mini-css-extract-plugin - -/***/ }), +/* 14 */, /* 15 */ /***/ (function(module) { @@ -151,4 +147,4 @@ module.exports = JSON.parse("{\"data\":\"value\"}"); module.exports = {"page-index":"page-index___1ZW9Y"}; /***/ }) -],[[8,0,4]]]); \ No newline at end of file +],[[8,0,5,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/remax-styles.acss b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/remax-styles.acss new file mode 100644 index 000000000..0cdc233c0 --- /dev/null +++ b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/remax-styles.acss @@ -0,0 +1,4 @@ +.c { + background-color: red; +} + diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/remax-styles.js b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/remax-styles.js new file mode 100644 index 000000000..f1983876f --- /dev/null +++ b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/remax-styles.js @@ -0,0 +1,10 @@ +(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[4],{ + +/***/ 14: +/***/ (function(module, exports, __webpack_require__) { + +// extracted by mini-css-extract-plugin + +/***/ }) + +}]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/remax-vendors.js b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/remax-vendors.js index cde46c6c9..9decf6d28 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/remax-vendors.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/remax-vendors.js @@ -1,4 +1,4 @@ -(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[4],{ +(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[5],{ /***/ 13: /***/ (function(module, __webpack_exports__, __webpack_require__) { diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/app.acss b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/app.acss index 207d5d480..8e21a772c 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/app.acss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/app.acss @@ -1,3 +1,4 @@ +@import "./remax-styles.acss"; page { background-image: url('/assets/images/dont-exist.jpg'); background: #eee; diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/app.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/app.js index 294d008d9..f22ff1ea2 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/app.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/app.js @@ -1,4 +1,5 @@ require('./runtime.js'); +require('./remax-styles.js'); (my["webpackJsonp"] = my["webpackJsonp"] || []).push([[1],[ /* 0 */ /***/ (function(module, exports, __webpack_require__) { @@ -143,4 +144,4 @@ __webpack_require__.r(__webpack_exports__); /* harmony default export */ __webpack_exports__["default"] = (__webpack_require__.p + "31d6cfe0d16ae931b73c59d7e0c089c0.png"); /***/ }) -],[[0,0]]]); \ No newline at end of file +],[[0,0,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/packageA/pages/index.acss b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/packageA/pages/index.acss index ee000bc9f..84b824366 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/packageA/pages/index.acss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/packageA/pages/index.acss @@ -1,7 +1,4 @@ -.c { - background-color: red; -} - +@import "./../../remax-styles.acss"; .pageA-index { background-color: aliceblue; } diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/packageA/pages/index.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/packageA/pages/index.js index f05a3aa75..e5a37e176 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/packageA/pages/index.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/packageA/pages/index.js @@ -1,5 +1,6 @@ require('./../../runtime.js'); require('./../../remax-vendors.js'); +require('./../../remax-styles.js'); (my["webpackJsonp"] = my["webpackJsonp"] || []).push([[3],[ /* 0 */, /* 1 */, @@ -31,12 +32,7 @@ module.exports = require("react"); module.exports = require("remax/ali"); /***/ }), -/* 15 */ -/***/ (function(module, exports, __webpack_require__) { - -// extracted by mini-css-extract-plugin - -/***/ }), +/* 15 */, /* 16 */, /* 17 */, /* 18 */, @@ -106,4 +102,4 @@ module.exports = require("@remax/one"); // extracted by mini-css-extract-plugin /***/ }) -],[[20,0,4]]]); \ No newline at end of file +],[[20,0,5,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/pages/index.acss b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/pages/index.acss index 182103046..ae292b804 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/pages/index.acss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/pages/index.acss @@ -1,7 +1,4 @@ -.c { - background-color: red; -} - +@import "./../remax-styles.acss"; .page-index___1ZW9Y { background-color: aliceblue; } diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/pages/index.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/pages/index.js index b021b2ae3..deb775cd8 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/pages/index.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/pages/index.js @@ -1,5 +1,6 @@ require('./../runtime.js'); require('./../remax-vendors.js'); +require('./../remax-styles.js'); (my["webpackJsonp"] = my["webpackJsonp"] || []).push([[2],[ /* 0 */, /* 1 */, @@ -143,12 +144,7 @@ module.exports = require("remax/wechat"); module.exports = require("remax/ali"); /***/ }), -/* 15 */ -/***/ (function(module, exports, __webpack_require__) { - -// extracted by mini-css-extract-plugin - -/***/ }), +/* 15 */, /* 16 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { @@ -189,4 +185,4 @@ __webpack_require__.r(__webpack_exports__); module.exports = {"page-index":"page-index___1ZW9Y"}; /***/ }) -],[[8,0,4]]]); \ No newline at end of file +],[[8,0,5,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/remax-styles.acss b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/remax-styles.acss new file mode 100644 index 000000000..0cdc233c0 --- /dev/null +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/remax-styles.acss @@ -0,0 +1,4 @@ +.c { + background-color: red; +} + diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/remax-styles.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/remax-styles.js new file mode 100644 index 000000000..ddd783d63 --- /dev/null +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/remax-styles.js @@ -0,0 +1,10 @@ +(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[4],{ + +/***/ 15: +/***/ (function(module, exports, __webpack_require__) { + +// extracted by mini-css-extract-plugin + +/***/ }) + +}]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/remax-vendors.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/remax-vendors.js index bf84baa66..ab5399156 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/remax-vendors.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/ali/remax-vendors.js @@ -1,4 +1,4 @@ -(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[4],{ +(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[5],{ /***/ 13: /***/ (function(module, __webpack_exports__, __webpack_require__) { diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/app.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/app.js index 1e3434bab..f0d97facd 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/app.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/app.js @@ -1,4 +1,5 @@ require('./runtime.js'); +require('./remax-styles.js'); (tt["webpackJsonp"] = tt["webpackJsonp"] || []).push([[1],[ /* 0 */ /***/ (function(module, exports, __webpack_require__) { @@ -143,4 +144,4 @@ __webpack_require__.r(__webpack_exports__); /* harmony default export */ __webpack_exports__["default"] = (__webpack_require__.p + "31d6cfe0d16ae931b73c59d7e0c089c0.png"); /***/ }) -],[[0,0]]]); \ No newline at end of file +],[[0,0,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/app.ttss b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/app.ttss index 207d5d480..dfce64c17 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/app.ttss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/app.ttss @@ -1,3 +1,4 @@ +@import "./remax-styles.ttss"; page { background-image: url('/assets/images/dont-exist.jpg'); background: #eee; diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/packageA/pages/index.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/packageA/pages/index.js index 277c3b54d..74e23b369 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/packageA/pages/index.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/packageA/pages/index.js @@ -1,5 +1,6 @@ require('./../../runtime.js'); require('./../../remax-vendors.js'); +require('./../../remax-styles.js'); (tt["webpackJsonp"] = tt["webpackJsonp"] || []).push([[3],[ /* 0 */, /* 1 */, @@ -31,12 +32,7 @@ module.exports = require("react"); module.exports = require("remax/ali"); /***/ }), -/* 15 */ -/***/ (function(module, exports, __webpack_require__) { - -// extracted by mini-css-extract-plugin - -/***/ }), +/* 15 */, /* 16 */, /* 17 */, /* 18 */, @@ -106,4 +102,4 @@ module.exports = require("@remax/one"); // extracted by mini-css-extract-plugin /***/ }) -],[[20,0,4]]]); \ No newline at end of file +],[[20,0,5,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/packageA/pages/index.ttss b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/packageA/pages/index.ttss index ee000bc9f..f64ad7f68 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/packageA/pages/index.ttss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/packageA/pages/index.ttss @@ -1,7 +1,4 @@ -.c { - background-color: red; -} - +@import "./../../remax-styles.ttss"; .pageA-index { background-color: aliceblue; } diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/pages/index.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/pages/index.js index 281da92e3..9e25ce873 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/pages/index.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/pages/index.js @@ -1,5 +1,6 @@ require('./../runtime.js'); require('./../remax-vendors.js'); +require('./../remax-styles.js'); (tt["webpackJsonp"] = tt["webpackJsonp"] || []).push([[2],[ /* 0 */, /* 1 */, @@ -143,12 +144,7 @@ module.exports = require("remax/wechat"); module.exports = require("remax/ali"); /***/ }), -/* 15 */ -/***/ (function(module, exports, __webpack_require__) { - -// extracted by mini-css-extract-plugin - -/***/ }), +/* 15 */, /* 16 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { @@ -187,4 +183,4 @@ __webpack_require__.r(__webpack_exports__); module.exports = {"page-index":"page-index___1ZW9Y"}; /***/ }) -],[[8,0,4]]]); \ No newline at end of file +],[[8,0,5,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/pages/index.ttss b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/pages/index.ttss index 182103046..19a3431ff 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/pages/index.ttss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/pages/index.ttss @@ -1,7 +1,4 @@ -.c { - background-color: red; -} - +@import "./../remax-styles.ttss"; .page-index___1ZW9Y { background-color: aliceblue; } diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/remax-styles.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/remax-styles.js new file mode 100644 index 000000000..69092fc4e --- /dev/null +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/remax-styles.js @@ -0,0 +1,10 @@ +(tt["webpackJsonp"] = tt["webpackJsonp"] || []).push([[4],{ + +/***/ 15: +/***/ (function(module, exports, __webpack_require__) { + +// extracted by mini-css-extract-plugin + +/***/ }) + +}]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/remax-styles.ttss b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/remax-styles.ttss new file mode 100644 index 000000000..0cdc233c0 --- /dev/null +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/remax-styles.ttss @@ -0,0 +1,4 @@ +.c { + background-color: red; +} + diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/remax-vendors.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/remax-vendors.js index 4e73ee2ce..2f748bc6c 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/remax-vendors.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/toutiao/remax-vendors.js @@ -1,4 +1,4 @@ -(tt["webpackJsonp"] = tt["webpackJsonp"] || []).push([[4],{ +(tt["webpackJsonp"] = tt["webpackJsonp"] || []).push([[5],{ /***/ 13: /***/ (function(module, __webpack_exports__, __webpack_require__) { diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/app.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/app.js index 983521972..558ce0968 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/app.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/app.js @@ -1,4 +1,5 @@ require('./runtime.js'); +require('./remax-styles.js'); (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([[1],[ /* 0 */ /***/ (function(module, exports, __webpack_require__) { @@ -143,4 +144,4 @@ __webpack_require__.r(__webpack_exports__); /* harmony default export */ __webpack_exports__["default"] = (__webpack_require__.p + "31d6cfe0d16ae931b73c59d7e0c089c0.png"); /***/ }) -],[[0,0]]]); \ No newline at end of file +],[[0,0,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/app.wxss b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/app.wxss index 207d5d480..cb43800df 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/app.wxss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/app.wxss @@ -1,3 +1,4 @@ +@import "./remax-styles.wxss"; page { background-image: url('/assets/images/dont-exist.jpg'); background: #eee; diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/packageA/pages/index.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/packageA/pages/index.js index 4e0bd7bd2..b6c500688 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/packageA/pages/index.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/packageA/pages/index.js @@ -1,5 +1,6 @@ require('./../../runtime.js'); require('./../../remax-vendors.js'); +require('./../../remax-styles.js'); (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([[3],[ /* 0 */, /* 1 */, @@ -31,12 +32,7 @@ module.exports = require("react"); module.exports = require("remax/ali"); /***/ }), -/* 15 */ -/***/ (function(module, exports, __webpack_require__) { - -// extracted by mini-css-extract-plugin - -/***/ }), +/* 15 */, /* 16 */, /* 17 */, /* 18 */, @@ -106,4 +102,4 @@ module.exports = require("@remax/one"); // extracted by mini-css-extract-plugin /***/ }) -],[[20,0,4]]]); \ No newline at end of file +],[[20,0,5,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/packageA/pages/index.wxss b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/packageA/pages/index.wxss index ee000bc9f..7a51b9d18 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/packageA/pages/index.wxss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/packageA/pages/index.wxss @@ -1,7 +1,4 @@ -.c { - background-color: red; -} - +@import "./../../remax-styles.wxss"; .pageA-index { background-color: aliceblue; } diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/pages/index.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/pages/index.js index fbef1cbbc..6e39a3f7d 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/pages/index.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/pages/index.js @@ -1,5 +1,6 @@ require('./../runtime.js'); require('./../remax-vendors.js'); +require('./../remax-styles.js'); (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([[2],[ /* 0 */, /* 1 */, @@ -143,12 +144,7 @@ module.exports = require("remax/wechat"); module.exports = require("remax/ali"); /***/ }), -/* 15 */ -/***/ (function(module, exports, __webpack_require__) { - -// extracted by mini-css-extract-plugin - -/***/ }), +/* 15 */, /* 16 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { @@ -183,4 +179,4 @@ __webpack_require__.r(__webpack_exports__); module.exports = {"page-index":"page-index___1ZW9Y"}; /***/ }) -],[[8,0,4]]]); \ No newline at end of file +],[[8,0,5,4]]]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/pages/index.wxss b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/pages/index.wxss index 182103046..e611258b1 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/pages/index.wxss +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/pages/index.wxss @@ -1,7 +1,4 @@ -.c { - background-color: red; -} - +@import "./../remax-styles.wxss"; .page-index___1ZW9Y { background-color: aliceblue; } diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/remax-styles.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/remax-styles.js new file mode 100644 index 000000000..2794fd20a --- /dev/null +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/remax-styles.js @@ -0,0 +1,10 @@ +(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([[4],{ + +/***/ 15: +/***/ (function(module, exports, __webpack_require__) { + +// extracted by mini-css-extract-plugin + +/***/ }) + +}]); \ No newline at end of file diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/remax-styles.wxss b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/remax-styles.wxss new file mode 100644 index 000000000..0cdc233c0 --- /dev/null +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/remax-styles.wxss @@ -0,0 +1,4 @@ +.c { + background-color: red; +} + diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/remax-vendors.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/remax-vendors.js index 04b918a2c..aaad7d0db 100644 --- a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/remax-vendors.js +++ b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/remax-vendors.js @@ -1,4 +1,4 @@ -(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([[4],{ +(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([[5],{ /***/ 13: /***/ (function(module, __webpack_exports__, __webpack_require__) { diff --git a/packages/remax-cli/src/build/webpack/config.mini.ts b/packages/remax-cli/src/build/webpack/config.mini.ts index 3f61b2cdf..a57cdc0a8 100644 --- a/packages/remax-cli/src/build/webpack/config.mini.ts +++ b/packages/remax-cli/src/build/webpack/config.mini.ts @@ -72,12 +72,20 @@ export default function webpackConfig(api: API, options: Options, target: Platfo config.optimization.runtimeChunk({ name: 'runtime' }); config.optimization.splitChunks({ cacheGroups: { + remaxStyles: { + name: 'remax-styles', + test: new RegExp(`(.css|.less|.sass|.scss|.stylus|.styl|${api.meta.style})$`), + chunks: 'initial', + minChunks: 2, + minSize: 0, + }, remaxVendors: { name: 'remax-vendors', test: moduleMatcher, chunks: 'initial', minChunks: 2, minSize: 0, + priority: 2, }, }, });