Fix escapes, update dependencies

Author: hqjs

compilers/css.mjs

@@ -3,7 +3,6 @@ import { getBrowsersList } from './tools.mjs';
 import { pathToURL } from '../utils.mjs';
 import postcss from 'postcss';
 import postcssPresetEnv from 'postcss-preset-env';
-import querystring from 'querystring';
 import url from 'url';
 export const modulesCache = new Map;
 
@@ -12,12 +11,12 @@ const preprocess = async (ctx, content, sourceMap, { skipSM }) => {
   const prePlugins = [ root => {
     const replacePath3 = (math, p1, styleImport, p2) =>
       styleImport.startsWith('/') ?
-        `${p1}${url.resolve(`${pathToURL(querystring.escape(ctx.app.src))}/`, styleImport.slice(1))}${p2}` :
-        `${p1}.${url.resolve(`${querystring.escape(ctx.dirname)}/`, styleImport)}${p2}`;
+        `${p1}${url.resolve(`${pathToURL(ctx.app.src)}/`, styleImport.slice(1))}${p2}` :
+        `${p1}.${url.resolve(`${pathToURL(ctx.dirname)}/`, styleImport)}${p2}`;
     const replacePath1 = (match, styleImport) =>
       styleImport.startsWith('/') ?
-        `${url.resolve(`${pathToURL(querystring.escape(ctx.app.src))}/`, styleImport.slice(1))}` :
-        `.${url.resolve(`${querystring.escape(ctx.dirname)}/`, styleImport)}`;
+        `${url.resolve(`${pathToURL(ctx.app.src)}/`, styleImport.slice(1))}` :
+        `.${url.resolve(`${pathToURL(ctx.dirname)}/`, styleImport)}`;
     root.walkAtRules('import', rule => {
       rule.params = rule.params
         .replace(/(url\(['"]*)([^'")]+)(['"]*\))/g, replacePath3)

compilers/js.mjs

@@ -59,7 +59,6 @@ import hqTransformPaths from '@hqjs/babel-plugin-transform-paths';
 import hqTransformTypescript from '@hqjs/babel-plugin-transform-typescript';
 import hqTypeMetadata from '@hqjs/babel-plugin-add-type-metadata';
 import path from 'path';
-import querystring from 'querystring';
 import url from 'url';
 
 const CSS_MODULES_REX = /import\s+[*a-zA-Z_,{}\s]+\s+from\s+['"]{1}([^'"]+\.(css|sass|scss|less))['"]{1}/gm;
@@ -81,7 +80,7 @@ const getPrePlugins = (ctx, skipHQTrans, skipPoly) => {
     [ babelTransformPrivateMethods, { loose: true }],
     [ hqTransformDefine, {
       // TODO: make it conditional
-      'import.meta': { url: querystring.escape(ctx.dpath) },
+      'import.meta': { url: pathToURL(ctx.dpath) },
       'process.env.NODE_ENV': ctx.app.production ? 'production' : 'development',
       'typeof window': 'object',
     }],
@@ -502,7 +501,7 @@ const compileCSSModules = async (ctx, content) => {
     ...Array.from(content.matchAll(CSS_REQUIRE_MODULES_REX)),
   ];
   const cssModules = styleImports.map(([ , filename ]) =>
-    urlToPath(querystring.unescape(url.resolve(`${querystring.escape(ctx.dirname)}/`, filename))));
+    urlToPath(url.resolve(`${pathToURL(ctx.dirname)}/`, filename)));
   const extensions = styleImports.map(([ ,, ext ]) => ext);
 
   const styleBuilds = cssModules
@@ -515,8 +514,7 @@ const compileCSSModules = async (ctx, content) => {
         const { code, map } = await compileCSS({
           ...ctx,
           dpath,
-          originalPath: querystring.escape(dpath),
-          path: querystring.escape(dpath),
+          path: dpath,
           srcPath: fileSrcPath,
           stats: { ...ctx.stats, ext: `.${extensions[index]}` },
         }, styleContent, false, { skipSM: ctx.app.build, useModules: true });
@@ -539,7 +537,7 @@ const compileCSSModules = async (ctx, content) => {
         const stats = ctx.app.table.touch(fileSrcPath);
         const styleBuildPromise = saveContent(code, {
           dpath,
-          path: querystring.escape(dpath),
+          path: dpath,
           stats,
           store: ctx.store,
         });
@@ -549,7 +547,7 @@ const compileCSSModules = async (ctx, content) => {
           // TODO: add map byte length here
           const mapBuildPromise = saveContent(JSON.stringify(map), {
             dpath: `${dpath}.map`,
-            path: `${querystring.escape(dpath)}.map`,
+            path: `${dpath}.map`,
             stats: mapStats,
             store: ctx.store,
           });

package.json

@@ -35,15 +35,15 @@
     "npm": ">=6.10.3"
   },
   "dependencies": {
-    "@babel/cli": "^7.12.1",
-    "@babel/core": "^7.12.3",
+    "@babel/cli": "^7.12.10",
+    "@babel/core": "^7.12.10",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
     "@babel/plugin-proposal-decorators": "^7.12.1",
     "@babel/plugin-proposal-export-default-from": "^7.12.1",
     "@babel/plugin-proposal-private-methods": "^7.12.1",
-    "@babel/preset-env": "^7.12.1",
+    "@babel/preset-env": "^7.12.11",
     "@babel/preset-flow": "^7.12.1",
-    "@babel/preset-react": "^7.12.5",
+    "@babel/preset-react": "^7.12.10",
     "@hqjs/babel-plugin-add-decorators-metadata": "~0.0.2",
     "@hqjs/babel-plugin-add-type-metadata": "~0.0.4",
     "@hqjs/babel-plugin-expose-global-to-window": "~0.0.2",
@@ -70,44 +70,44 @@
     "babel-plugin-minify-dead-code-elimination": "~0.5.1",
     "babel-plugin-transform-assets-import-to-string": "^1.2.0",
     "babel-preset-minify": "~0.5.1",
-    "browserslist": "^4.14.6",
-    "buffer": "^6.0.1",
+    "browserslist": "^4.16.0",
+    "buffer": "^6.0.3",
     "chokidar": "^3.4.3",
     "coffeescript": "^2.5.1",
     "compressible": "^2.0.18",
-    "core-js": "^3.7.0",
+    "core-js": "^3.8.1",
     "cssnano": "^4.1.10",
     "fast-glob": "^3.2.4",
     "fs-extra": "^9.0.1",
-    "htmlnano": "~0.2.7",
+    "htmlnano": "~0.2.8",
     "imagemin": "^7.0.1",
     "imagemin-gifsicle": "^7.0.0",
     "imagemin-mozjpeg": "^9.0.0",
     "imagemin-pngquant": "^9.0.1",
     "imagemin-svgo": "^8.0.0",
     "koa": "^2.13.0",
     "koa-compose": "^4.1.0",
-    "less": "^3.12.2",
+    "less": "^4.0.0",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.6.1",
     "node-sass": "^5.0.0",
-    "postcss": "^8.1.6",
+    "postcss": "^8.2.1",
     "postcss-less": "^4.0.0",
-    "postcss-modules": "^3.2.2",
+    "postcss-modules": "^4.0.0",
     "postcss-preset-env": "^6.7.0",
     "postcss-sass": "^0.4.4",
     "postcss-scss": "^3.0.4",
-    "posthtml": "~0.13.4",
+    "posthtml": "~0.15.1",
     "process": "~0.11.10",
     "regenerator-runtime": "~0.13.7",
-    "resolve": "^1.18.1",
-    "rollup": "^2.33.1",
+    "resolve": "^1.19.0",
+    "rollup": "^2.35.1",
     "vue-template-compiler": "^2.6.12",
     "woothee": "^1.11.1",
-    "ws": "^7.3.1"
+    "ws": "^7.4.1"
   },
   "devDependencies": {
-    "eslint": "^7.13.0",
+    "eslint": "^7.16.0",
     "nodemon": "^2.0.6"
   },
   "publishConfig": {