fix(beidou-webpack): remove hash name while not using module in css l…

…oader, add client alias
alibaba · Mar 16, 2018 · 81f50fb · 81f50fb
1 parent d1ef5af
commit 81f50fb
Show file tree

Hide file tree

Showing 14 changed files with 70 additions and 113 deletions.
diff --git a/examples/performance/package.json b/examples/performance/package.json
@@ -7,7 +7,8 @@
     "start": "NODE_ENV=local node ./bin/server.js",
     "start-prod": "NODE_ENV=production node ./bin/server.js",
     "reinstall": "lerna bootstrap",
-    "lint": "./node_modules/.bin/eslint --fix --ext .jsx --ext .js app client config webpack",
+    "lint":
+      "./node_modules/.bin/eslint --fix --ext .jsx --ext .js app client config webpack",
     "build": "webpack --config ./webpack/webpack.config.prod.js"
   },
   "author": "",

diff --git a/examples/with-rax/package.json b/examples/with-rax/package.json
@@ -22,9 +22,5 @@
     "rax-view": "^0.5.0",
     "react": "^16.2.0"
   },
-  "files": [
-    "app",
-    "client",
-    "config"
-  ]
+  "files": ["app", "client", "config"]
 }
diff --git a/packages/babel-preset-beidou-client/package.json b/packages/babel-preset-beidou-client/package.json
@@ -4,7 +4,8 @@
   "description": "Babel preset for Beidou Client.",
   "author": "六猴",
   "license": "MIT",
-  "repository": "https://github.com/alibaba/beidou/tree/master/packages/babel-preset-beidou-client",
+  "repository":
+    "https://github.com/alibaba/beidou/tree/master/packages/babel-preset-beidou-client",
   "main": "index.js",
   "scripts": {
     "test": "TEST_REPORTER=spec egg-bin test",

diff --git a/packages/babel-preset-beidou-server/package.json b/packages/babel-preset-beidou-server/package.json
@@ -5,7 +5,8 @@
   "author": "六猴",
   "license": "MIT",
   "main": "index.js",
-  "repository": "https://github.com/alibaba/beidou/tree/master/packages/babel-preset-beidou-server",
+  "repository":
+    "https://github.com/alibaba/beidou/tree/master/packages/babel-preset-beidou-server",
   "scripts": {
     "test": "TEST_REPORTER=spec egg-bin test",
     "cov": "TEST_REPORTER=spec egg-bin cov",

diff --git a/packages/beidou-core/config/config.prod.js b/packages/beidou-core/config/config.prod.js
@@ -7,5 +7,6 @@ module.exports = appInfo => ({
   static: {
     prefix: '/build',
     dir: path.join(appInfo.baseDir, 'build/'),
+    dynamic: false,
   },
 });
diff --git a/packages/beidou-isomorphic/package.json b/packages/beidou-isomorphic/package.json
@@ -11,11 +11,7 @@
   "eggPlugin": {
     "name": "isomorphic"
   },
-  "keywords": [
-    "beidou",
-    "plugin",
-    "isomorphic"
-  ],
+  "keywords": ["beidou", "plugin", "isomorphic"],
   "license": "MIT",
   "dependencies": {
     "babel-preset-beidou-server": "^1.0.0-beta.2",
@@ -28,13 +24,10 @@
     "mkdirp": "^0.5.1",
     "supertest": "1"
   },
-  "files": [
-    "config",
-    "lib",
-    "app.js"
-  ],
+  "files": ["config", "lib", "app.js"],
   "engines": {
     "node": ">= 8.0.0"
   },
-  "repository": "https://github.com/alibaba/beidou/tree/master/packages/beidou-isomorphic"
+  "repository":
+    "https://github.com/alibaba/beidou/tree/master/packages/beidou-isomorphic"
 }
diff --git a/packages/beidou-router/package.json b/packages/beidou-router/package.json
@@ -23,13 +23,10 @@
     "react": "^16.2.0",
     "supertest": "1"
   },
-  "files": [
-    "app",
-    "lib",
-    "config"
-  ],
+  "files": ["app", "lib", "config"],
   "engines": {
     "node": ">= 8.0.0"
   },
-  "repository": "https://github.com/alibaba/beidou/tree/master/packages/beidou-view-react"
+  "repository":
+    "https://github.com/alibaba/beidou/tree/master/packages/beidou-view-react"
 }
diff --git a/packages/beidou-view-rax/package.json b/packages/beidou-view-rax/package.json
@@ -4,18 +4,9 @@
   "description": "Beidou Rax server side render plugin",
   "eggPlugin": {
     "name": "rax",
-    "dep": [
-      "beidouView",
-      "isomorphic"
-    ]
+    "dep": ["beidouView", "isomorphic"]
   },
-  "keywords": [
-    "beidou",
-    "beidouPlugin",
-    "beidou-plugin",
-    "beidouView",
-    "rax"
-  ],
+  "keywords": ["beidou", "beidouPlugin", "beidou-plugin", "beidouView", "rax"],
   "main": "index.js",
   "author": "<devrsi0n devrsi0n@gmail.com>",
   "license": "MIT",
@@ -52,10 +43,5 @@
     "rax-text": "^0.5.0",
     "rax-view": "^0.5.0"
   },
-  "files": [
-    "app",
-    "app.js",
-    "lib",
-    "config"
-  ]
+  "files": ["app", "app.js", "lib", "config"]
 }
diff --git a/packages/beidou-view-react/package.json b/packages/beidou-view-react/package.json
@@ -4,9 +4,7 @@
   "description": "beidou view react",
   "eggPlugin": {
     "name": "react",
-    "dependencies": [
-      "beidouView"
-    ]
+    "dependencies": ["beidouView"]
   },
   "main": "index.js",
   "scripts": {
@@ -32,14 +30,10 @@
     "should": "8",
     "supertest": "1"
   },
-  "files": [
-    "app",
-    "lib",
-    "config",
-    "app.js"
-  ],
+  "files": ["app", "lib", "config", "app.js"],
   "engines": {
     "node": ">= 8.0.0"
   },
-  "repository": "https://github.com/alibaba/beidou/tree/master/packages/beidou-view-react"
+  "repository":
+    "https://github.com/alibaba/beidou/tree/master/packages/beidou-view-react"
 }
diff --git a/packages/beidou-view/package.json b/packages/beidou-view/package.json
@@ -24,14 +24,10 @@
     "egg-bin": "^4.0.0",
     "egg-mock": "^3.7.1"
   },
-  "files": [
-    "app",
-    "lib",
-    "config",
-    "index.js"
-  ],
+  "files": ["app", "lib", "config", "index.js"],
   "engines": {
     "node": ">= 8.0.0"
   },
-  "repository": "https://github.com/alibaba/beidou/tree/master/packages/beidou-view"
+  "repository":
+    "https://github.com/alibaba/beidou/tree/master/packages/beidou-view"
 }
diff --git a/packages/beidou-webpack/config/config.default.js b/packages/beidou-webpack/config/config.default.js
@@ -1,37 +1,44 @@
 'use strict';
 
-exports.webpack = {
-  // keep this key name sync with webpack.common.js reservedKey
-  custom: {
-    // configPath: 'path/to/webpack/config/file',
-  },
-  output: {
-    path: './build',
-    filename: '[name].js?[hash]',
-    chunkFilename: '[name].js',
-    publicPath: '/build/',
-  },
+const path = require('path');
 
-  resolve: {
-    extensions: ['.json', '.js', '.jsx'],
-  },
+module.exports = appInfo => ({
+  webpack: {
+    // keep this key name sync with webpack.common.js reservedKey
+    custom: {
+      // configPath: 'path/to/webpack/config/file',
+    },
+    output: {
+      path: './build',
+      filename: '[name].js?[hash]',
+      chunkFilename: '[name].js',
+      publicPath: '/build/',
+    },
 
-  devServer: {
-    contentBase: false,
-    port: 6002,
-    noInfo: true,
-    quiet: false,
-    clientLogLevel: 'warning',
-    lazy: false,
-    watchOptions: {
-      aggregateTimeout: 300,
+    resolve: {
+      extensions: ['.json', '.js', '.jsx'],
+      alias: {
+        client: path.join(appInfo.baseDir, 'client'),
+      },
     },
-    headers: { 'X-Custom-Header': 'yes' },
-    stats: {
-      colors: true,
-      chunks: false,
+
+    devServer: {
+      contentBase: false,
+      port: 6002,
+      noInfo: true,
+      quiet: false,
+      clientLogLevel: 'warning',
+      lazy: false,
+      watchOptions: {
+        aggregateTimeout: 300,
+      },
+      headers: { 'X-Custom-Header': 'yes' },
+      stats: {
+        colors: true,
+        chunks: false,
+      },
+      publicPath: '/build/',
+      hot: true,
     },
-    publicPath: '/build/',
-    hot: true,
   },
-};
+});
diff --git a/packages/beidou-webpack/config/webpack/utils.js b/packages/beidou-webpack/config/webpack/utils.js
@@ -15,8 +15,8 @@ const imageLoaderConfig = {
 const fileLoaderConfig = {
   test: [
     /\.ico$/,
-    /\.woff2?$/,
     /\.svgz?$/,
+    /\.woff2?$/,
     /\.otf$/,
     /\.tiff?$/,
     /\.ttf$/,
@@ -37,7 +37,7 @@ function getCssLoaderConfig(dev, modules = false) {
       minimize: !dev,
       sourceMap: dev,
       modules,
-      localIdentName: '[local]_[hash:base64:5]',
+      localIdentName: modules ? '[local]_[hash:base64:5]' : undefined,
     },
   };
 }

diff --git a/packages/beidou-webpack/package.json b/packages/beidou-webpack/package.json
@@ -5,11 +5,7 @@
   "eggPlugin": {
     "name": "webpack"
   },
-  "keywords": [
-    "beidou",
-    "plugin",
-    "webpack"
-  ],
+  "keywords": ["beidou", "plugin", "webpack"],
   "main": "index.js",
   "bin": {
     "beidou-build": "./bin/build.js",
@@ -62,15 +58,7 @@
   "peerDependencies": {
     "beidou-core": "^1.0.0-alpha.5"
   },
-  "files": [
-    "bin",
-    "app",
-    "lib",
-    "config",
-    "app.js",
-    "agent.js",
-    "index.js"
-  ],
+  "files": ["bin", "app", "lib", "config", "app.js", "agent.js", "index.js"],
   "engines": {
     "node": ">= 8.0.0"
   },
@@ -79,5 +67,6 @@
     "cov": "TEST_REPORTER=spec egg-bin cov",
     "history": "egg-bin history CHANGELOG.md"
   },
-  "repository": "https://github.com/alibaba/beidou/tree/master/packages/beidou-webpack"
+  "repository":
+    "https://github.com/alibaba/beidou/tree/master/packages/beidou-webpack"
 }
diff --git a/packages/eslint-config-beidou/package.json b/packages/eslint-config-beidou/package.json
@@ -8,13 +8,8 @@
     "cov": "TEST_REPORTER=spec egg-bin cov",
     "history": "egg-bin history CHANGELOG.md"
   },
-  "keywords": [
-    "eslint",
-    "beidou"
-  ],
-  "files": [
-    "index.js"
-  ],
+  "keywords": ["eslint", "beidou"],
+  "files": ["index.js"],
   "license": "MIT",
   "devDependencies": {
     "egg-bin": "^4.3.7",