From d44e1d727ab5fffdd8be072159565f6e02e2c17f Mon Sep 17 00:00:00 2001 From: Jun Yang Date: Sat, 2 Mar 2019 03:36:33 +0800 Subject: [PATCH] chore: fix test on windows 10 --- libs.d.ts | 4 ++-- package-lock.json | 32 ++++++++++++++++++++++++++++++++ package.json | 2 +- rollup.config.ts | 14 +++++++++++--- test/stub/mockfs.ts | 5 +++-- 5 files changed, 49 insertions(+), 8 deletions(-) diff --git a/libs.d.ts b/libs.d.ts index 139b56fbb..6957a17e5 100644 --- a/libs.d.ts +++ b/libs.d.ts @@ -1,6 +1,6 @@ declare module 'rollup-plugin-uglify' { export function uglify (): any } -declare module 'rollup-plugin-alias' { - export default function alias(options: any): any +declare module 'rollup-plugin-replace' { + export default function replace(options: any): any } diff --git a/package-lock.json b/package-lock.json index 462a7d1bc..97c6bee0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3745,6 +3745,15 @@ "integrity": "sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==", "dev": true }, + "magic-string": { + "version": "0.25.2", + "resolved": "http://registry.npm.taobao.org/magic-string/download/magic-string-0.25.2.tgz", + "integrity": "sha1-E5w6cpUV7FXpbmnoKhH+iQopOtk=", + "dev": true, + "requires": { + "sourcemap-codec": "^1.4.4" + } + }, "make-error": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz", @@ -9145,6 +9154,23 @@ "slash": "^2.0.0" } }, + "rollup-plugin-import-alias": { + "version": "1.0.6", + "resolved": "http://registry.npm.taobao.org/rollup-plugin-import-alias/download/rollup-plugin-import-alias-1.0.6.tgz", + "integrity": "sha1-iywc3ujjnuRmOXcrAI3gppRzyT8=", + "dev": true + }, + "rollup-plugin-replace": { + "version": "2.1.0", + "resolved": "http://registry.npm.taobao.org/rollup-plugin-replace/download/rollup-plugin-replace-2.1.0.tgz", + "integrity": "sha1-+cB6Somi+L6RLuVLPw9o2R6e0K4=", + "dev": true, + "requires": { + "magic-string": "^0.25.1", + "minimatch": "^3.0.2", + "rollup-pluginutils": "^2.0.1" + } + }, "rollup-plugin-typescript2": { "version": "0.19.2", "resolved": "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.19.2.tgz", @@ -9762,6 +9788,12 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, + "sourcemap-codec": { + "version": "1.4.4", + "resolved": "http://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.4.tgz", + "integrity": "sha1-xj6pJ8Ap3WvZorf6A7P+wCrVbp8=", + "dev": true + }, "spawn-error-forwarder": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/spawn-error-forwarder/-/spawn-error-forwarder-1.0.0.tgz", diff --git a/package.json b/package.json index 0af54afad..15634a0c8 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "nyc": "^13.1.0", "regenerator-runtime": "^0.12.1", "rollup": "^1.1.2", - "rollup-plugin-alias": "^1.5.1", + "rollup-plugin-replace": "^2.1.0", "rollup-plugin-typescript2": "^0.19.2", "rollup-plugin-uglify": "^6.0.2", "semantic-release": "^15.13.3", diff --git a/rollup.config.ts b/rollup.config.ts index 644127498..862479118 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -1,7 +1,7 @@ -import alias from 'rollup-plugin-alias' import { uglify } from 'rollup-plugin-uglify' import pkg from './package.json' import typescript from 'rollup-plugin-typescript2' +import replace from 'rollup-plugin-replace' const version = process.env.VERSION || pkg.version const sourcemap = true @@ -45,7 +45,11 @@ export default [{ banner }], plugins: [ - alias({ resolve: ['.ts'], './fs/node': './fs/browser' }), + replace({ + include: './src/liquid.ts', + delimiters: ["'", "'"], + './fs/node': './fs/browser' + }), typescript({ tsconfigOverride: { include: [ 'src' ], @@ -67,7 +71,11 @@ export default [{ sourcemap }], plugins: [ - alias({ resolve: ['.ts'], './fs/node': './fs/browser' }), + replace({ + include: './src/liquid.ts', + delimiters: ["'", "'"], + './fs/node': './fs/browser' + }), typescript({ tsconfigOverride: { include: [ 'src' ], diff --git a/test/stub/mockfs.ts b/test/stub/mockfs.ts index 72682e587..6d59c3192 100644 --- a/test/stub/mockfs.ts +++ b/test/stub/mockfs.ts @@ -1,5 +1,6 @@ import { isString, forOwn } from '../../src/util/underscore' import fs from '../../src/fs/node' +import { resolve } from 'path' type fileDescriptor = { mode: string, content: string } @@ -9,8 +10,8 @@ const exists = fs.exists export function mock (options: { [path: string]: (string | fileDescriptor) }) { forOwn(options, (val, key) => { - files[key] = isString(val) - ? { mode: '33188', content: val as string } + files[resolve(key)] = isString(val) + ? { mode: '33188', content: val } : val as fileDescriptor }) fs.readFile = async function (path) {