From d3a53a651b217d503809bcb1eb503ce7987fbbd2 Mon Sep 17 00:00:00 2001 From: Farnabaz Date: Fri, 5 Mar 2021 17:27:32 +0330 Subject: [PATCH 1/2] fix: support regex using `devalue` --- package.json | 1 + src/utils.ts | 6 +++++- templates/workbox/sw.js | 2 +- yarn.lock | 7 +++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d87dcdc1..277c979f 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "test": "yarn lint && jest" }, "dependencies": { + "@nuxt/devalue": "^1.2.5", "clone-deep": "^4.0.1", "defu": "^3.2.2", "execa": "^5.0.0", diff --git a/src/utils.ts b/src/utils.ts index 19a71bdb..ca719736 100755 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,3 +1,4 @@ +import devalue from '@nuxt/devalue' import { posix, resolve, dirname } from 'path' import { mkdirp, readFile, existsSync, writeFile } from 'fs-extra' import template from 'lodash.template' @@ -102,7 +103,10 @@ export function pick (obj, props) { } export async function copyTemplate ({ src, dst, options }) { - const compile = template(await readFile(src, 'utf8')) + const compile = template( + await readFile(src, 'utf8'), + { imports: { devalue } } + ) await writeFile(dst, compile({ options })) } diff --git a/templates/workbox/sw.js b/templates/workbox/sw.js index 039fd0d7..c8fe376d 100644 --- a/templates/workbox/sw.js +++ b/templates/workbox/sw.js @@ -1,4 +1,4 @@ -const options = <%= JSON.stringify(options.swOptions) %> +const options = <%= devalue(options.swOptions) %> importScripts(...[options.workboxURL, ...options.importScripts]) diff --git a/yarn.lock b/yarn.lock index b60d8516..a1b9e56a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1255,6 +1255,13 @@ dependencies: consola "^2.9.0" +"@nuxt/devalue@^1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@nuxt/devalue/-/devalue-1.2.5.tgz#8d95e3e74b3332d3eb713342c5c4d18096047d66" + integrity sha512-Tg86C7tqzvZtZli2BQVqgzZN136mZDTgauvJXagglKkP2xt5Kw3NUIiJyjX0Ww/IZy2xVmD0LN+CEPpij4dB2g== + dependencies: + consola "^2.9.0" + "@nuxt/friendly-errors-webpack-plugin@^2.5.0": version "2.5.0" resolved "https://registry.yarnpkg.com/@nuxt/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.5.0.tgz#5374665bc72d34b7dbadcc361a4777e3f0f5d46b" From ceda98018bf663d61385b637aca0558c4e23d899 Mon Sep 17 00:00:00 2001 From: Farnabaz Date: Fri, 5 Mar 2021 17:36:07 +0330 Subject: [PATCH 2/2] chore: import order --- src/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils.ts b/src/utils.ts index ca719736..e8541e20 100755 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,7 +1,7 @@ -import devalue from '@nuxt/devalue' import { posix, resolve, dirname } from 'path' import { mkdirp, readFile, existsSync, writeFile } from 'fs-extra' import template from 'lodash.template' +import devalue from '@nuxt/devalue' import { name, version } from '../package.json' export const PKG = {