Cml-vue-loader and extract-css

lerna.json

@@ -24,7 +24,9 @@
     "packages/runtime-check",
     "packages/url-loader",
     "packages/webpack-check-plugin",
-    "packages/webpack-liveload-middleware"
+    "packages/webpack-liveload-middleware",
+    "packages/cml-vue-loader",
+    "packages/cml-extract-css-webpack-plugin"
   ],
   "version": "0.1.0-alpha.4",
   "command": {

packages/chameleon-tool/chameleon.js

-#! /usr/bin/env node
+#! /usr/bin/env node 
 // --inspect-brk
 
 require('./lib/index.js');

packages/chameleon-tool/configs/component_export/getWebExportConfig.js

@@ -4,7 +4,7 @@ const path = require('path');
 const webpack = require('webpack');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const { getBabelPath, getGlobalCheckWhiteList, styleLoaders, getWebEntry } = require('../utils');
-var ExtractTextPlugin = require('extract-text-webpack-plugin')
+var ExtractTextPlugin = require('cml-extract-css-webpack-plugin')
 var UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
 const ChameleonWebpackPlugin = require('chameleon-webpack-plugin')
@@ -41,7 +41,7 @@ module.exports = function (options) {
   publicPath = options.publicPath || '/';
 
   var cmlLoaders = [{
-    loader: 'vue-loader',
+    loader: 'cml-vue-loader',
     options: Object.assign(getCmlLoaderConfig({ type: 'web', disableExtract, media, mode }), {
       postcss: {
         config: {
@@ -192,7 +192,7 @@ module.exports = function (options) {
         {
           test: /\.vue$/,
           use: [{
-            loader: 'vue-loader',
+            loader: 'cml-vue-loader',
             options: Object.assign(getCmlLoaderConfig({ type: 'web', disableExtract }), {
               postcss: {
                 config: {

packages/chameleon-tool/configs/component_export/getWebExportConfig_new.js

@@ -6,7 +6,7 @@ const getWebCommonConfig = require('../getWebCommonConfig.js')
 const getCmlLoaderConfig = require('../cml-loader.conf');
 const { styleLoaders, getBabelPath } = require('../utils');
 const ExportPlugin = require('./exportPlugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const ExtractTextPlugin = require('cml-extract-css-webpack-plugin')
 
 
 module.exports = function(options) {
@@ -31,7 +31,7 @@ module.exports = function(options) {
   let publicPath = options.publicPath || '/';
 
   var cmlLoaders = [{
-    loader: 'vue-loader',
+    loader: 'cml-vue-loader',
     options: Object.assign(getCmlLoaderConfig({ type: 'web', disableExtract, media, mode }), {
       postcss: {
         config: {

packages/chameleon-tool/configs/getMiniAppCommonConfig.js

-var ExtractTextPlugin = require('extract-text-webpack-plugin')
+var ExtractTextPlugin = require('cml-extract-css-webpack-plugin')
 var utils = require('./utils.js');
 var path = require('path');
 var webpack = require('webpack')

packages/chameleon-tool/configs/getWebCommonConfig.js

-var ExtractTextPlugin = require('extract-text-webpack-plugin')
+var ExtractTextPlugin = require('cml-extract-css-webpack-plugin')
 var utils = require('./utils.js');
 var getCmlLoaderConfig = require('./cml-loader.conf');
 var path = require('path');
@@ -22,7 +22,7 @@ module.exports = function (options) {
   let {entry, htmlPlugins} = utils.getWebEntry(options);
 
   var cmlLoaders = [{
-    loader: 'vue-loader',
+    loader: 'cml-vue-loader',
     options: Object.assign(getCmlLoaderConfig({type: 'web', hot: options.hot, disableExtract}), {
       postcss: {
         config: {
@@ -70,7 +70,7 @@ module.exports = function (options) {
         {
           test: /\.vue$/,
           use: [{
-            loader: 'vue-loader',
+            loader: 'cml-vue-loader',
             options: Object.assign(getCmlLoaderConfig({type: 'web', hot: options.hot, disableExtract}), {
               postcss: {
                 config: {

packages/chameleon-tool/configs/utils.js

 var path = require('path')
-var ExtractTextPlugin = require('extract-text-webpack-plugin')
+var ExtractTextPlugin = require('cml-extract-css-webpack-plugin')
 var fs = require('fs');
 const fse = require('fs-extra');
 const HtmlWebpackPlugin = require('html-webpack-plugin')

packages/chameleon-tool/npm-shrinkwrap.json

@@ -2794,6 +2794,49 @@
         "is-supported-regexp-flag": "1.0.1"
       }
     },
+    "cml-extract-css-webpack-plugin": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/cml-extract-css-webpack-plugin/-/cml-extract-css-webpack-plugin-0.0.1.tgz",
+      "integrity": "sha512-1Rma4eOPEugMRlrmcno/PNRf0FxzWZiWk2r03nA28DfOYW31pGSW3sjJksJzlL7Lza9iN5jCZKe+nCgvKP4G7Q==",
+      "requires": {
+        "async": "2.6.1",
+        "loader-utils": "1.2.3",
+        "schema-utils": "0.3.0",
+        "webpack-sources": "1.3.0"
+      }
+    },
+    "cml-vue-loader": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/cml-vue-loader/-/cml-vue-loader-0.0.1.tgz",
+      "integrity": "sha512-lByRhvIuUdVIaItNSX/aEJxAFN8gQbSbdvvOjjw6n95gEUptTUElyp/L8Avq9zu+c2jKsfIKpPrhAkDZxNzTLQ==",
+      "requires": {
+        "consolidate": "0.14.0",
+        "hash-sum": "1.0.2",
+        "loader-utils": "1.2.3",
+        "lru-cache": "4.1.5",
+        "postcss": "6.0.23",
+        "postcss-load-config": "1.2.0",
+        "postcss-selector-parser": "2.2.3",
+        "prettier": "1.15.3",
+        "resolve": "1.9.0",
+        "source-map": "0.6.1",
+        "vue-hot-reload-api": "2.3.1",
+        "vue-style-loader": "4.0.1",
+        "vue-template-es2015-compiler": "1.7.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+          "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+          "requires": {
+            "flatten": "1.0.2",
+            "indexes-of": "1.0.1",
+            "uniq": "1.0.1"
+          }
+        }
+      }
+    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -4651,17 +4694,6 @@
         }
       }
     },
-    "extract-text-webpack-plugin": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz",
-      "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==",
-      "requires": {
-        "async": "2.6.1",
-        "loader-utils": "1.2.3",
-        "schema-utils": "0.3.0",
-        "webpack-sources": "1.3.0"
-      }
-    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -13736,38 +13768,6 @@
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz",
       "integrity": "sha512-AA86yKZ5uOKz87/q1UpngEXhbRkaYg1b7HMMVRobNV1IVKqZe8oLIzo6iMocVwZXnYitlGwf2k4ZRLOZlS8oPQ=="
     },
-    "vue-loader": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-14.2.3.tgz",
-      "integrity": "sha512-mEd2/14gNCVVpKU/44lVDoMDoAteM8PkvaVjzZ4KHyRKtry3pifSh9UMFsjoPBMeVYs9jTEDyT8UKmgPpnP8Yw==",
-      "requires": {
-        "consolidate": "0.14.0",
-        "hash-sum": "1.0.2",
-        "loader-utils": "1.2.3",
-        "lru-cache": "4.1.5",
-        "postcss": "6.0.23",
-        "postcss-load-config": "1.2.0",
-        "postcss-selector-parser": "2.2.3",
-        "prettier": "1.15.3",
-        "resolve": "1.9.0",
-        "source-map": "0.6.1",
-        "vue-hot-reload-api": "2.3.1",
-        "vue-style-loader": "4.0.1",
-        "vue-template-es2015-compiler": "1.7.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "2.2.3",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-          "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-          "requires": {
-            "flatten": "1.0.2",
-            "indexes-of": "1.0.1",
-            "uniq": "1.0.1"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz",

packages/chameleon-tool/package.json

@@ -53,6 +53,8 @@
     "chameleon-webpack-plugin": "0.1.0-alpha.4",
     "chameleon-weex-vue-loader": "0.1.0-alpha.4",
     "clean-webpack-plugin": "0.1.19",
+    "cml-extract-css-webpack-plugin": "0.0.1",
+    "cml-vue-loader": "0.0.1",
     "commander": "2.16.0",
     "connect-history-api-fallback": "^1.5.0",
     "copy-webpack-plugin": "4.5.2",
@@ -60,7 +62,6 @@
     "css-loader": "0.28.11",
     "eventsource-polyfill": "0.9.6",
     "express": "4.16.3",
-    "extract-text-webpack-plugin": "3.0.2",
     "file-loader": "1.1.11",
     "fs-extra": "6.0.1",
     "glob": "7.1.2",
@@ -89,7 +90,6 @@
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
     "vue": "2.5.16",
-    "vue-loader": "14.2.3",
     "vue-router": "3.0.1",
     "vue-template-compiler": "2.5.16",
     "vuex": "3.0.1",