Skip to content

Commit 57a724d

Browse files
committed
chore: replace resolve
1 parent 5a49f73 commit 57a724d

4 files changed

Lines changed: 20 additions & 20 deletions

File tree

scripts/copy-master.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// 从pages目录,复制文件到master分支
22
const { existsSync, readdirSync, mkdirSync } = require('fs');
33
const { copySync } = require('fs-extra');
4-
const { resolve } = require('path');
5-
const dist = resolve(__dirname, '../dist');
6-
const pages = resolve(dist, 'pages/js');
7-
const master = resolve(dist, 'master');
4+
const { join } = require('path');
5+
const dist = join(__dirname, '../dist');
6+
const pages = join(dist, 'pages/js');
7+
const master = join(dist, 'master');
88

99
readdirSync(pages).forEach(it => {
1010
if (!it.includes('.user.js') && !it.includes('.meta.js')) {
@@ -13,10 +13,10 @@ readdirSync(pages).forEach(it => {
1313

1414
const name = it.substr(0, it.indexOf('.'));
1515

16-
if (!existsSync(resolve(master, name))) {
17-
mkdirSync(resolve(master, name));
16+
if (!existsSync(join(master, name))) {
17+
mkdirSync(join(master, name));
1818
}
19-
copySync(resolve(pages, it), resolve(master, name, it));
19+
copySync(join(pages, it), join(master, name, it));
2020
});
2121

22-
copySync(resolve(__dirname, 'master'), master);
22+
copySync(join(__dirname, 'master'), master);

scripts/utils/build-one.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = function(name, output, isDev = false) {
1313
// 读取版本号
1414
const package = JSON.parse(readFileSync(path.join(root, 'package.json')));
1515
// 读取配置,生成注释
16-
const meta = generateMeta(path.resolve(root, 'meta.yml'), {
16+
const meta = generateMeta(path.join(root, 'meta.yml'), {
1717
version: package.version,
1818
updateURL: `https://userscript.firefoxcn.net/js/${name}.meta.js`,
1919
downloadURL: `https://userscript.firefoxcn.net/js/${name}.user.js`

scripts/utils/copy-one.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ const path = require('path');
33
const { readFileSync, writeFileSync } = require('fs');
44

55
module.exports = function(name, output) {
6-
const root = path.resolve(__dirname, '../..', name);
6+
const root = path.join(__dirname, '../..', name);
77
// 读取配置,生成注释
8-
const meta = generateMeta(path.resolve(root, 'meta.yml'), {
8+
const meta = generateMeta(path.join(root, 'meta.yml'), {
99
updateURL: `https://userscript.firefoxcn.net/js/${name}.meta.js`,
1010
downloadURL: `https://userscript.firefoxcn.net/js/${name}.user.js`
1111
});
1212

1313
// 生成meta.js
14-
writeFileSync(path.resolve(output, name + '.meta.js'), meta.text.trim(), {
14+
writeFileSync(path.join(output, name + '.meta.js'), meta.text.trim(), {
1515
encoding: 'UTF-8'
1616
});
1717

1818
// 复制user.js
19-
const content = readFileSync(path.resolve(root, name + '.user.js'), {
19+
const content = readFileSync(path.join(root, name + '.user.js'), {
2020
encoding: 'UTF-8'
2121
});
22-
writeFileSync(path.resolve(output, name + '.user.js'), meta.text + content, {
22+
writeFileSync(path.join(output, name + '.user.js'), meta.text + content, {
2323
encoding: 'UTF-8'
2424
});
2525

scripts/utils/webpack.config.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const { writeFileSync } = require('fs');
66

77
module.exports = function(options) {
88
const { isDev, name, meta, output } = options;
9-
const root = path.resolve(__dirname, '../..', name);
9+
const root = path.join(__dirname, '../..', name);
1010
const minimizer = [
1111
new webpack.BannerPlugin({
1212
banner: meta,
@@ -58,20 +58,20 @@ module.exports = function(options) {
5858
return {
5959
context: root,
6060
entry: {
61-
[name + '.user']: path.resolve(root, 'src/index')
61+
[name + '.user']: path.join(root, 'src/index')
6262
},
6363
mode: 'production',
6464
// mode: 'development',
6565
module: {
6666
rules: [
6767
{
6868
test: /\.jsx?$/,
69-
include: path.resolve(root, 'src'),
69+
include: path.join(root, 'src'),
7070
use: babelLoader
7171
},
7272
{
7373
test: /\.tsx?$/,
74-
include: path.resolve(root, 'src'),
74+
include: path.join(root, 'src'),
7575
use: [
7676
babelLoader
7777
]
@@ -101,7 +101,7 @@ module.exports = function(options) {
101101
{
102102
apply: compiler => {
103103
compiler.hooks.afterEmit.tap('Generate meta.js', () => {
104-
writeFileSync(path.resolve(output, name + '.meta.js'), meta.trim(), {
104+
writeFileSync(path.join(output, name + '.meta.js'), meta.trim(), {
105105
encoding: 'UTF-8'
106106
});
107107
});
@@ -115,7 +115,7 @@ module.exports = function(options) {
115115
resolveLoader: {
116116
modules: [
117117
'node_modules',
118-
path.resolve(__dirname, 'loader')
118+
path.join(__dirname, 'loader')
119119
]
120120
},
121121
stats: "verbose"

0 commit comments

Comments
 (0)