Skip to content

Commit 8fe8153

Browse files
committed
Build: tweak tasks
1 parent a647af0 commit 8fe8153

5 files changed

Lines changed: 41 additions & 57 deletions

File tree

scripts/build-ks-react.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const replace = require('rollup-plugin-replace');
99
const commonjs = require('rollup-plugin-commonjs');
1010
const resolve = require('rollup-plugin-node-resolve');
1111

12-
let cache;
12+
// let cache;
1313

1414
function buildKs(cb) {
1515
const env = process.env.NODE_ENV || 'development';
@@ -30,11 +30,14 @@ function buildKs(cb) {
3030
.replace('../../build/core/css/framework7.css', '../../packages/core/css/framework7.min.css')
3131
.replace('../../build/core/js/framework7.js', '../../packages/core/js/framework7.min.js');
3232
}))
33-
.pipe(gulp.dest('./kitchen-sink/react'));
33+
.pipe(gulp.dest('./kitchen-sink/react'))
34+
.on('error', (err) => {
35+
console.log(err);
36+
});
3437

3538
rollup.rollup({
3639
input: './kitchen-sink/react/src/app.js',
37-
cache,
40+
// cache,
3841
plugins: [
3942
replace({
4043
delimiters: ['', ''],
@@ -50,13 +53,13 @@ function buildKs(cb) {
5053
}),
5154
],
5255
}).then((bundle) => {
53-
cache = bundle;
56+
// cache = bundle;
5457
return bundle.write({
5558
format: 'umd',
5659
name: 'app',
5760
strict: true,
5861
sourcemap: false,
59-
cache,
62+
// cache,
6063
file: './kitchen-sink/react/js/app.js',
6164
});
6265
}).then(() => {

scripts/build-ks-vue.js

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ const commonjs = require('rollup-plugin-commonjs');
1010
const resolve = require('rollup-plugin-node-resolve');
1111
const vue = require('rollup-plugin-vue');
1212

13-
let cache;
14-
1513
function buildKs(cb) {
1614
const env = process.env.NODE_ENV || 'development';
1715
const target = process.env.TARGET || 'universal';
@@ -35,7 +33,6 @@ function buildKs(cb) {
3533

3634
rollup.rollup({
3735
input: './kitchen-sink/vue/src/app.js',
38-
cache,
3936
plugins: [
4037
replace({
4138
delimiters: ['', ''],
@@ -51,17 +48,13 @@ function buildKs(cb) {
5148
objectAssign: 'Object.assign',
5249
}),
5350
],
54-
}).then((bundle) => {
55-
cache = bundle;
56-
return bundle.write({
57-
format: 'umd',
58-
name: 'app',
59-
strict: true,
60-
sourcemap: false,
61-
cache,
62-
file: './kitchen-sink/vue/js/app.js',
63-
});
64-
}).then(() => {
51+
}).then(bundle => bundle.write({
52+
format: 'umd',
53+
name: 'app',
54+
strict: true,
55+
sourcemap: false,
56+
file: './kitchen-sink/vue/js/app.js',
57+
})).then(() => {
6558
if (cb) cb();
6659
}).catch((err) => {
6760
console.log(err);

scripts/build-react.js

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ const uglify = require('gulp-uglify');
1818
const sourcemaps = require('gulp-sourcemaps');
1919
const rename = require('gulp-rename');
2020

21-
let cache;
22-
2321
function esm({ banner, componentImports, componentAliases, componentExports }) {
2422
return `
2523
${banner}
@@ -102,7 +100,6 @@ function buildReact(cb) {
102100
/* Build UMD from esm bundle: framework7-react.esm.bundle.js -> framework7-react.js */
103101
rollup.rollup({
104102
input: `${buildPath}/react/framework7-react.esm.bundle.js`,
105-
cache,
106103
external: ['react'],
107104
plugins: [
108105
replace({
@@ -115,21 +112,18 @@ function buildReact(cb) {
115112
objectAssign: 'Object.assign',
116113
}),
117114
],
118-
}).then((bundle) => {
119-
cache = bundle;
120-
return bundle.write({
121-
globals: {
122-
react: 'React',
123-
},
124-
strict: true,
125-
file: `${buildPath}/react/framework7-react.js`,
126-
format: 'umd',
127-
name: 'Framework7React',
128-
sourcemap: env === 'development',
129-
sourcemapFile: `${buildPath}/react/framework7-react.js.map`,
130-
banner: bannerReact,
131-
});
132-
}).then(() => {
115+
}).then(bundle => bundle.write({
116+
globals: {
117+
react: 'React',
118+
},
119+
strict: true,
120+
file: `${buildPath}/react/framework7-react.js`,
121+
format: 'umd',
122+
name: 'Framework7React',
123+
sourcemap: env === 'development',
124+
sourcemapFile: `${buildPath}/react/framework7-react.js.map`,
125+
banner: bannerReact,
126+
})).then(() => {
133127
// Remove esm.bundle
134128
fs.unlinkSync(`${buildPath}/react/framework7-react.esm.bundle.js`);
135129

scripts/build-vue.js

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ const uglify = require('gulp-uglify');
1616
const sourcemaps = require('gulp-sourcemaps');
1717
const rename = require('gulp-rename');
1818

19-
let cache;
20-
2119
function esm({ banner, componentImports, componentExports }) {
2220
return `
2321
${banner}
@@ -97,7 +95,6 @@ function buildVue(cb) {
9795
/* Build UMD from esm bundle: framework7-vue.esm.bundle.js -> framework7-vue.js */
9896
rollup.rollup({
9997
input: `${buildPath}/vue/framework7-vue.esm.bundle.js`,
100-
cache,
10198
external: ['vue'],
10299
plugins: [
103100
replace({
@@ -108,21 +105,18 @@ function buildVue(cb) {
108105
objectAssign: 'Object.assign',
109106
}),
110107
],
111-
}).then((bundle) => {
112-
cache = bundle;
113-
return bundle.write({
114-
globals: {
115-
vue: 'Vue',
116-
},
117-
strict: true,
118-
file: `${buildPath}/vue/framework7-vue.js`,
119-
format: 'umd',
120-
name: 'Framework7Vue',
121-
sourcemap: env === 'development',
122-
sourcemapFile: `${buildPath}/vue/framework7-vue.js.map`,
123-
banner: bannerVue,
124-
});
125-
}).then(() => {
108+
}).then(bundle => bundle.write({
109+
globals: {
110+
vue: 'Vue',
111+
},
112+
strict: true,
113+
file: `${buildPath}/vue/framework7-vue.js`,
114+
format: 'umd',
115+
name: 'Framework7Vue',
116+
sourcemap: env === 'development',
117+
sourcemapFile: `${buildPath}/vue/framework7-vue.js.map`,
118+
banner: bannerVue,
119+
})).then(() => {
126120
if (env === 'development') {
127121
if (cb) cb();
128122
return;

scripts/gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ const watch = {
4848
gulp.watch(['./src/core/**/*.js'], () => runSequence('core-js', 'core-components', 'ks-react'));
4949
gulp.watch('./src/core/**/*.less', () => runSequence('core-less', 'core-components'));
5050
gulp.watch(['./src/phenome/**/*.js', './src/phenome/**/*.jsx'], () => runSequence('phenome', 'build-react', 'ks-react'));
51-
gulp.watch(['./kitchen-sink/react/src/**/*.js', './kitchen-sink/react/src/**/*.jsx'], () => runSequence('ks-react'));
51+
gulp.watch(['./kitchen-sink/react/src/**/*.js', './kitchen-sink/react/src/**/*.jsx'], ['ks-react']);
5252
},
5353
vue() {
5454
gulp.watch(['./src/core/**/*.js'], () => runSequence('core-js', 'core-components', 'ks-vue'));
5555
gulp.watch('./src/core/**/*.less', () => runSequence('core-less', 'core-components'));
5656
gulp.watch(['./src/phenome/**/*.js', './src/phenome/**/*.jsx'], () => runSequence('phenome', 'build-vue', 'ks-vue'));
57-
gulp.watch(['./kitchen-sink/vue/src/**/*.js', './kitchen-sink/vue/src/**/*.vue'], () => runSequence('ks-vue'));
57+
gulp.watch(['./kitchen-sink/vue/src/**/*.js', './kitchen-sink/vue/src/**/*.vue'], ['ks-vue']);
5858
},
5959
};
6060

0 commit comments

Comments
 (0)