refactor: restructure runtime code (#798)

Author: evilebottnawi

.eslintignore

@@ -1,3 +1,2 @@
 /node_modules
-/lib/url/escape.js
-/lib/css-base.js
+/lib/runtime

lib/loader.js

@@ -113,7 +113,7 @@ module.exports = function loader(content, map) {
       if (query.url !== false && result.urlItems.length > 0) {
         urlEscapeHelper = `var escape = require(${loaderUtils.stringifyRequest(
           this,
-          require.resolve('./url/escape.js')
+          require.resolve('./runtime/escape.js')
         )});\n`;
 
         cssAsString = cssAsString.replace(result.urlItemRegExpG, (item) => {
@@ -184,7 +184,7 @@ module.exports = function loader(content, map) {
         null,
         `${urlEscapeHelper}exports = module.exports = require(${loaderUtils.stringifyRequest(
           this,
-          require.resolve('./css-base.js')
+          require.resolve('./runtime/api.js')
         )})(${sourceMap});\n` +
           `// imports\n${importJs}\n\n` +
           `// module\n${moduleJs}\n\n` +

lib/css-base.js renamed to lib/runtime/api.js

@@ -15,13 +15,13 @@ function getEvaluated(output, modules) {
     );
     m = { exports: {}, id: 1 };
     fn(m, m.exports, (module) => {
-      if (module.indexOf('css-base') >= 0) {
+      if (module.indexOf('runtime/api') >= 0) {
         // eslint-disable-next-line global-require
-        return require('../lib/css-base');
+        return require('../lib/runtime/api');
       }
-      if (module.indexOf('url/escape') >= 0) {
+      if (module.indexOf('runtime/escape') >= 0) {
         // eslint-disable-next-line global-require
-        return require('../lib/url/escape');
+        return require('../lib/runtime/escape');
       }
       if (module.indexOf('-!/path/css-loader!') === 0) {
         // eslint-disable-next-line no-param-reassign

lib/url/escape.js renamed to lib/runtime/escape.js

@@ -1,6 +1,6 @@
-/* eslint-env mocha*/
+/* eslint-env mocha */
 
-const base = require('../lib/css-base');
+const api = require('../lib/runtime/api');
 
 describe('css-base', () => {
   before(() => {
@@ -22,23 +22,23 @@ describe('css-base', () => {
   });
 
   it('should toString a single module', () => {
-    const m = base();
+    const m = api();
     m.push([1, 'body { a: 1; }', '']);
     m.toString().should.be.eql('body { a: 1; }');
   });
   it('should toString multiple modules', () => {
-    const m = base();
+    const m = api();
     m.push([2, 'body { b: 2; }', '']);
     m.push([1, 'body { a: 1; }', '']);
     m.toString().should.be.eql('body { b: 2; }body { a: 1; }');
   });
   it('should toString with media query', () => {
-    const m = base();
+    const m = api();
     m.push([1, 'body { a: 1; }', 'screen']);
     m.toString().should.be.eql('@media screen{body { a: 1; }}');
   });
   it('should import modules', () => {
-    const m = base();
+    const m = api();
     const m1 = [1, 'body { a: 1; }', 'screen'];
     const m2 = [2, 'body { b: 2; }', ''];
     const m3 = [3, 'body { c: 3; }', ''];
@@ -55,7 +55,7 @@ describe('css-base', () => {
     );
   });
   it('should import named modules', () => {
-    const m = base();
+    const m = api();
     const m1 = ['./module1', 'body { a: 1; }', 'screen'];
     const m2 = ['./module2', 'body { b: 2; }', ''];
     const m3 = ['./module3', 'body { c: 3; }', ''];
@@ -72,7 +72,7 @@ describe('css-base', () => {
     );
   });
   it('should toString with source mapping', () => {
-    const m = base(true);
+    const m = api(true);
     m.push([
       1,
       'body { a: 1; }',
@@ -90,7 +90,7 @@ describe('css-base', () => {
   });
   it('should toString without source mapping if btoa not avalibale', () => {
     global.btoa = null;
-    const m = base(true);
+    const m = api(true);
     m.push([
       1,
       'body { a: 1; }',

test/helpers.js

@@ -0,0 +1,18 @@
+/* eslint-env mocha */
+
+require('should');
+const escape = require('../lib/runtime/escape');
+
+describe('runtime escape', () => {
+  it('should escape url', () => {
+    escape(true).should.be.eql(true);
+    escape('image.png').should.be.eql('image.png');
+    escape('"image.png"').should.be.eql('image.png');
+    escape("'image.png'").should.be.eql('image.png');
+    escape('image other.png').should.be.eql('"image other.png"');
+    escape('"image other.png"').should.be.eql('"image other.png"');
+    escape("'image other.png'").should.be.eql('"image other.png"');
+    escape('image"other.png').should.be.eql('"image\\"other.png"');
+    escape('image\nother.png').should.be.eql('"image\\nother.png"');
+  });
+});