Gerald 8 лет назад
Родитель
Сommit
26cd6fa225
4 измененных файлов с 2 добавлено и 78 удалено
  1. 0 11
      gulpfile.js
  2. 0 8
      package.json
  3. 0 58
      scripts/update.js
  4. 2 1
      src/background/sync/base.js

+ 0 - 11
gulpfile.js

@@ -2,8 +2,6 @@ const del = require('del');
 const gulp = require('gulp');
 const gutil = require('gulp-util');
 const concat = require('gulp-concat');
-const merge2 = require('merge2');
-const postcss = require('gulp-postcss');
 const gulpFilter = require('gulp-filter');
 const uglify = require('gulp-uglify');
 const svgSprite = require('gulp-svg-sprite');
@@ -72,21 +70,12 @@ gulp.task('manifest', () => (
 
 gulp.task('copy-files', () => {
   const jsFilter = gulpFilter(['**/*.js'], {restore: true});
-  const cssFilter = gulpFilter(['**/*.css'], {restore: true});
   let stream = gulp.src(paths.copy, {base: 'src'});
   if (isProd) stream = stream
   .pipe(jsFilter)
   .pipe(uglify())
   .pipe(jsFilter.restore);
   stream = stream
-  .pipe(cssFilter)
-  .pipe(postcss([
-    require('precss')(),
-    isProd && require('cssnano')({
-      // zindex: false,
-    }),
-  ].filter(Boolean)))
-  .pipe(cssFilter.restore)
   .pipe(gulp.dest('dist/'));
 });
 

+ 0 - 8
package.json

@@ -9,7 +9,6 @@
     "analyze:json": "webpack --profile --json --config scripts/webpack.conf.js > stats.json",
     "i18n": "gulp i18n",
     "lint": "eslint --ext .js,.vue .",
-    "update": "node scripts/update",
     "svgo": "svgo icons",
     "pretest": "webpack --config scripts/webpack.test.conf.js",
     "test": "node dist/test"
@@ -22,7 +21,6 @@
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-es2015": "^6.24.0",
     "css-loader": "^0.27.3",
-    "cssnano": "^3.10.0",
     "del": "^2.2.0",
     "eslint": "^3.18.0",
     "eslint-config-airbnb-base": "^11.1.2",
@@ -33,12 +31,9 @@
     "eslint-plugin-import": "^2.2.0",
     "extract-text-webpack-plugin": "^2.1.0",
     "friendly-errors-webpack-plugin": "^1.6.1",
-    "glob": "^7.0.3",
     "gulp": "^3.9.1",
     "gulp-concat": "^2.6.0",
-    "gulp-eslint": "^3.0.1",
     "gulp-filter": "^5.0.0",
-    "gulp-postcss": "^6.3.0",
     "gulp-svg-sprite": "^1.2.19",
     "gulp-uglify": "^2.0.0",
     "gulp-util": "^3.0.7",
@@ -46,9 +41,6 @@
     "html-webpack-plugin": "^2.28.0",
     "js-yaml": "^3.5.5",
     "localStorage": "^1.0.3",
-    "merge2": "^1.0.2",
-    "mocha": "^3.1.2",
-    "ncp": "^2.0.0",
     "precss": "^1.4.0",
     "svgo": "^0.7.2",
     "tape": "^4.6.3",

+ 0 - 58
scripts/update.js

@@ -1,58 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const glob = require('glob');
-const ncp = require('ncp');
-
-function promisify(func, ...partialArgs) {
-  return function (...args) {
-    return new Promise((resolve, reject) => {
-      func(...args, ...partialArgs, (err, data) => {
-        err ? reject(err) : resolve(data);
-      });
-    });
-  };
-}
-
-const getFiles = (glob => {
-  return function (pattern, cwd='.') {
-    return glob(pattern, {nodir: true, cwd});
-  };
-})(promisify(glob));
-const readdir = promisify(fs.readdir);
-const stat = promisify(fs.stat);
-const copy = (copy => {
-  return function (src, dest) {
-    console.log(`Copy ${src} => ${dest}`);
-    return copy(src, dest);
-  };
-})(promisify(ncp));
-
-const MOD_DIR = 'node_modules';
-const LIB_DIR = 'src/public/lib';
-const mappings = {
-  CodeMirror: 'codemirror',
-  'define.js': 'define-commonjs',
-  'vue.min.js': 'vue/dist',
-};
-
-function updateFile(dest, src) {
-  const srcPath = path.join(MOD_DIR, src);
-  return stat(srcPath)
-  .then(res => res.isDirectory() ? path.join(srcPath, dest) : srcPath)
-  .then(srcPath => copy(srcPath, path.join(LIB_DIR, dest)));
-}
-
-function updateDir(dest, src) {
-  return getFiles('**', path.join(LIB_DIR, dest))
-  .then(files => Promise.all(files.map(file => (
-    copy(path.join(MOD_DIR, src, file), path.join(LIB_DIR, dest, file))
-  ))));
-}
-
-function update(dest, src) {
-  return stat(path.join(LIB_DIR, dest))
-  .then(res => res.isFile() ? updateFile(dest, src) : updateDir(dest, src));
-}
-
-Promise.all(Object.keys(mappings).map(key => update(key, mappings[key])))
-.catch(err => console.log(err));

+ 2 - 1
src/background/sync/base.js

@@ -291,7 +291,8 @@ export const BaseService = serviceFactory({
     ]))
     .then(([remoteMeta, remoteData, localData]) => {
       const remoteMetaInfo = remoteMeta.info || {};
-      let remoteChanged = !remoteMeta.timestamp || Object.keys(remoteMetaInfo).length !== remoteData.length;
+      let remoteChanged = !remoteMeta.timestamp
+        || Object.keys(remoteMetaInfo).length !== remoteData.length;
       const now = Date.now();
       const remoteItemMap = {};
       remoteMeta.info = remoteData.reduce((info, item) => {