@ray-js/builder-web 1.3.99-beta.0 → 1.3.99-beta.2

package/lib/build.js

@@ -51,6 +51,7 @@ const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
 const webpackbar_1 = __importDefault(require("webpackbar"));
 const shared_1 = require("@ray-js/shared");
 const crypto = __importStar(require("crypto"));
+const css_1 = require("@ray-core/cli/lib/build/webpack/config/css");
 const process_css_1 = require("./loaders/process-css");
 const process_less_1 = require("./loaders/process-less");
 function hash(path) {
@@ -176,7 +177,7 @@ function build(options, context) {
             },
         });
         config.performance.hints(false);
-        config.plugin('defined').use(webpack_1.default.DefinePlugin, [
+        config.plugin('webpack-define-plugin').use(webpack_1.default.DefinePlugin, [
             {
                 'process.env.NODE_ENV': JSON.stringify(mode),
                 'process.env.PLATFORM': JSON.stringify(target),
@@ -233,7 +234,16 @@ function build(options, context) {
         else {
             config.set('externals', Object.assign(Object.assign({}, externals), internalExternals));
         }
-        api.callPluginMethod('configWebpack', { config });
+        const opts = Object.assign(Object.assign({}, compileOptions), { rootDir: compileOptions.source });
+        delete opts.source; // ray-core 中 rootDir 等同于 ray-js 中 source
+        // todo 未开启 css modules
+        api.callPluginMethod('configWebpack', {
+            config,
+            addCSSRule: (ruleConfig) => {
+                (0, css_1.addCSSRule)(config, { options: opts }, true, ruleConfig);
+            },
+            options: opts
+        });
         if (watch) {
             const defaultHttpPort = parseInt(port);
             const httpPort = yield (0, detect_port_1.default)(defaultHttpPort);

package/lib/loaders/route.js

@@ -32,7 +32,7 @@ const _PAGES_ = [
 `;
 const render = ejs_1.default.compile(routeTml);
 const readConfigFromConfigFile = (api) => {
-    const routesConfigFile = api.searchJSFile('src/routes.config');
+    const routesConfigFile = api.searchJSFile(`${api.options.source}/routes.config`);
     if (!routesConfigFile) {
         throw new Error(`missing configuration file (routes.config.{ts|js})`);
     }
@@ -53,7 +53,7 @@ function default_1(source) {
     return __awaiter(this, void 0, void 0, function* () {
         const cb = this.async();
         const { api } = this.getOptions();
-        const routesConfigFile = api.searchJSFile('src/routes.config');
+        const routesConfigFile = api.searchJSFile(`${api.options.source}/routes.config`);
         if (routesConfigFile === this.resourcePath) {
             const routes = readConfigFromConfigFile(api);
             const routeWithConfig = routesAdditionConfig(api, routes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/builder-web",
-  "version": "1.3.99-beta.0",
+  "version": "1.3.99-beta.2",
   "description": "Ray builder for web",
   "keywords": [
     "ray"
@@ -21,9 +21,9 @@
     "watch": "tsc -p ./tsconfig.build.json --watch"
   },
   "dependencies": {
-    "@ray-js/babel-preset-standard": "^1.3.99-beta.0",
-    "@ray-js/shared": "^1.3.99-beta.0",
-    "@ray-js/types": "^1.3.99-beta.0",
+    "@ray-js/babel-preset-standard": "^1.3.99-beta.2",
+    "@ray-js/shared": "^1.3.99-beta.2",
+    "@ray-js/types": "^1.3.99-beta.2",
     "address": "^1.1.2",
     "autoprefixer": "9.x",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
@@ -58,6 +58,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "55e5b53442b4d17914c437b101e15e485ec4aebe",
+  "gitHead": "c129b96e800e9bb062bdbb1236c05cb800fdc34b",
   "repository": {}
 }