webpack-dynamic-require - npm Package Compare versions

Comparing version 1.0.3 to 1.0.4

lib/Dynamic.js

@@ -163,2 +163,20 @@ "use strict";
 
+function loadComponentCss(baseUrl, styleId, needComboCssChunk) {
+  var componentCss = 'component.css';
+  var comboCssChunks = needComboCssChunk.map(function (chunkName) {
+    return "deps/".concat(chunkName, ".css");
+  });
+  comboCssChunks.unshift(componentCss);
+  var comboCssUrl = "".concat(baseUrl, "/??").concat(comboCssChunks.join());
+  var ss = (0, _fgLoadcss.loadCSS)(comboCssUrl); // @ts-ignore
+
+  ss && ss.setAttribute('id', styleId);
+  return new Promise(function (resolve, reject) {
+    onloadCSS(ss, function () {
+      resolve();
+    });
+    setTimeout(reject, 5000);
+  });
+}
+
 function DynamicRequire(name, baseUrl, hashed) {
@@ -171,2 +189,13 @@ if (!name || !baseUrl) {
   var jsonpUrl = "".concat(baseUrl, "/jsonpmodules.js");
+  var scriptId = "".concat(name, "_js");
+  var styleId = "".concat(name, "_css");
+  var uninstallFn = "".concat(name, "_uninstall"); // @ts-ignore
+
+  window[uninstallFn] = function () {
+    var jse = document.getElementById(scriptId);
+    var csse = document.getElementById(styleId);
+    jse && jse.remove();
+    csse && csse.remove();
+  };
+
   return jsonp(jsonpUrl, {
@@ -178,2 +207,5 @@ cbVal: jsonpCallback
     var entryModuleName = "".concat(name, "/").concat(entry);
+    var componentChunks = 'vendor.js,component.js';
+    var needComboCssChunk = [];
+    var needComboChunk = [];
 
@@ -186,12 +218,2 @@ if (hashed) {
 
-    if (g.webpackData.c[entryModuleName]) {
-      // if webpack enable hmr above return { children, exports, hot ...}
-      var module = g.webpackData(entryModuleName);
-      return Promise.resolve(module.a || module);
-    }
-
-    var componentChunks = 'vendor.js,component.js';
-    var componentCss = 'component.css';
-    var needComboChunk = [];
-    var needComboCssChunk = [];
     modules.forEach(function (_ref) {
@@ -212,18 +234,20 @@ var _ref2 = _slicedToArray(_ref, 3),
       }
-    }); // 先加载css
+    }); // 已经加载过了的逻辑
 
-    var ssPromise;
-    var comboCssChunks = needComboCssChunk.map(function (chunkName) {
-      return "deps/".concat(chunkName, ".css");
-    });
-    comboCssChunks.unshift(componentCss);
-    var comboCssUrl = "".concat(baseUrl, "/??").concat(comboCssChunks.join());
-    var ss = (0, _fgLoadcss.loadCSS)(comboCssUrl);
-    ssPromise = new Promise(function (resolve, reject) {
-      onloadCSS(ss, function () {
-        resolve();
-      });
-      setTimeout(reject, 5000);
-    }); // 并行加载js
+    if (g.webpackData.c[entryModuleName]) {
+      // if webpack enable hmr above return { children, exports, hot ...}
+      var module = g.webpackData(entryModuleName);
+      var csse = document.getElementById(styleId); // 样式已经卸载，重新加载出来
 
+      if (!csse) {
+        loadComponentCss(baseUrl, styleId, needComboCssChunk);
+      }
+
+      return Promise.resolve(module.a || module);
+    } // 新加载逻辑
+    // 加载css
+
+
+    var ssPromise = loadComponentCss(baseUrl, styleId, needComboCssChunk); // 并行加载js
+
     var jsPromise;
@@ -263,2 +287,2 @@ var comboChunks = needComboChunk.map(function (chunkName) {
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/Dynamic.ts"],"names":["g","window","global","onloadCSS","ss","callback","called","newcb","call","addEventListener","attachEvent","navigator","onloadcssdefined","jsonp","url","opt","fn","timeout","cbKey","cbVal","timer","Date","now","s","slice","indexOf","script","document","createElement","remove","clearTimeout","head","removeChild","undefined","src","data","appendChild","Promise","resolve","reject","setTimeout","Error","args","getBlurVersion","version","split","map","v","i","join","DynamicRequire","name","baseUrl","hashed","jsonpCallback","replace","jsonpUrl","then","modules","entry","entryModuleName","hashState","MurmurHash3","hash","result","toString","substr","webpackData","c","module","a","componentChunks","componentCss","needComboChunk","needComboCssChunk","forEach","moduleName","chunkName","isCss","push","ssPromise","comboCssChunks","unshift","comboCssUrl","jsPromise","comboChunks","comboUrl","console","log","e","all","warn","error"],"mappings":"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","sourcesContent":["import Scriptjs from 'scriptjs';\nimport { loadCSS } from 'fg-loadcss';\nimport camelCase from 'camelcase';\nimport MurmurHash3 from 'imurmurhash';\n// import { Require, ParseModuleData } from './Main';\nexport * from './Main';\n\ndeclare var window: Window, global: any;\nvar g = typeof window != \"undefined\" ? window : global;\n\nexport type DepType = {\n  type: string;\n  version: string;\n  enforce: boolean;\n};\n\nexport type Deps = {\n  [name: string]: DepType;\n}\n\nexport type JSONOpt = {\n  timeout?: number;\n  cbKey?: string;\n  cbVal?: string;\n}\n\n/*! onloadCSS. (onload callback for loadCSS) [c]2017 Filament Group, Inc. MIT License */\n/* global navigator */\n/* exported onloadCSS */\nfunction onloadCSS(ss: any, callback?: () => void) {\n  let called: boolean | undefined;\n  function newcb() {\n    if (!called && callback) {\n      called = true;\n      callback.call(ss);\n    }\n  }\n  if (ss.addEventListener) {\n    ss.addEventListener(\"load\", newcb);\n  }\n  if (ss.attachEvent) {\n    ss.attachEvent(\"onload\", newcb);\n  }\n\n  // This code is for browsers that don’t support onload\n  // No support for onload (it'll bind but never fire):\n  //\t* Android 4.3 (Samsung Galaxy S4, Browserstack)\n  //\t* Android 4.2 Browser (Samsung Galaxy SIII Mini GT-I8200L)\n  //\t* Android 2.3 (Pantech Burst P9070)\n\n  // Weak inference targets Android < 4.4\n  if (\"isApplicationInstalled\" in navigator && \"onloadcssdefined\" in ss) {\n    ss.onloadcssdefined(newcb);\n  }\n}\n\n\nconst jsonp = (url: string, opt: JSONOpt = {}, fn?: Function) => {\n\n  if (typeof opt === 'function') {\n    fn = opt\n    opt = {}\n  }\n\n  let { timeout = null, cbKey = 'callback', cbVal = 'fengyu' } = opt\n  let timer: number;\n\n  if (cbVal === 'fengyu') {\n    cbVal += Date.now()\n  }\n\n  let s = ''\n  s += `&${cbKey}=${cbVal}`\n\n  s = s.slice(1)\n\n  url += (~url.indexOf('?') ? '&' : '?') + s\n\n  var script = document.createElement('script')\n\n  var remove = () => {\n    timer && clearTimeout(timer)\n    document.head.removeChild(script)\n    g[cbVal] = undefined\n  }\n\n  script.src = url\n\n\n  if (fn !== undefined && typeof fn === 'function') {\n    g[cbVal] = (data: any) => {\n      fn(data)\n      remove()\n    }\n\n    document.head.appendChild(script)\n    return\n  }\n\n  return new Promise((resolve: (arg0: any) => void, reject: (arg0: Error) => void) => {\n    // 请求超时\n    if (timeout) {\n      timer = setTimeout(() => {\n        reject(new Error('jsonp request timeout'))\n        remove()\n      }, timeout)\n    }\n    // 正常\n    g[cbVal] = (...args: any) => {\n      resolve(args);\n      remove()\n    }\n\n    document.head.appendChild(script)\n  })\n}\n\nfunction getBlurVersion(version: string) {\n  return version.split('.').map((v, i) => i > 0 ? 'x' : v).join('.');\n}\n// const _require_ = g.webpackData;\n// g.webpackData = function(moduleId: any) {\n//   const module = _require_.m[moduleId] as Function;\n//   if (!module) {\n//     console.warn(moduleId, 'can not be founded, check chunk is completion');\n//     return;\n//   }\n//   return _require_.call(this, moduleId);\n// }\n// Object.assign(g.webpackData, _require_);\n\nexport function DynamicRequire(name: string, baseUrl: string, hashed: boolean) {\n  if (!name || !baseUrl) {\n    throw new Error('DynamicRequire name and baseUrl paramters must setted');\n  }\n  const jsonpCallback = camelCase(name.replace(/@/g, '$')).replace(/\\//g, '_');\n  const jsonpUrl = `${baseUrl}/jsonpmodules.js`;\n  return jsonp(jsonpUrl, {\n    cbVal: jsonpCallback\n  }).then(function (args) {\n    const modules: string[] = args[0];\n    const entry: string = args[1];\n    let entryModuleName = `${name}/${entry}`;\n    if (hashed) {\n      const hashState = new MurmurHash3();\n      hashState.hash(entryModuleName);\n      entryModuleName = hashState.result().toString(16).substr(0, 6);\n    }\n    if (g.webpackData.c[entryModuleName]) {\n      // if webpack enable hmr above return { children, exports, hot ...}\n      const module = g.webpackData(entryModuleName);\n      return Promise.resolve(module.a || module);\n    }\n\n    const componentChunks = 'vendor.js,component.js';\n    const componentCss = 'component.css';\n    const needComboChunk: string[] = [];\n    const needComboCssChunk: string[] = [];\n    modules.forEach(([moduleName, chunkName, isCss]) => {\n      const module = g.webpackData.c[moduleName];\n      // 如果module不存在，放到module对应的chunk到combo信息里\n      if (!module && needComboChunk.indexOf(chunkName) === -1) {\n        needComboChunk.push(chunkName);\n      }\n      if (!module && isCss && needComboCssChunk.indexOf(chunkName) === -1) {\n        needComboCssChunk.push(chunkName);\n      }\n    });\n    // 先加载css\n    let ssPromise;\n    const comboCssChunks = needComboCssChunk.map(chunkName => `deps/${chunkName}.css`);\n    comboCssChunks.unshift(componentCss);\n    const comboCssUrl = `${baseUrl}/??${comboCssChunks.join()}`;\n    const ss = loadCSS(comboCssUrl);\n    ssPromise = new Promise((resolve, reject) => {\n      onloadCSS(ss, () => {\n        resolve();\n      });\n      setTimeout(reject, 5000);\n    });\n\n    // 并行加载js\n    let jsPromise;\n    const comboChunks = needComboChunk.map(chunkName => `deps/${chunkName}.js`)\n    comboChunks.unshift(componentChunks); // 补上必须的组件资源\n    const comboUrl = `${baseUrl}/??${comboChunks.join()}`;\n    jsPromise = new Promise((resolve, reject) => {\n      Scriptjs(comboUrl, () => {\n        try {\n          console.log('load combo js done', name);\n          const module = g.webpackData(entryModuleName);\n          resolve(module.a || module);\n        } catch (e) {\n          reject(e);\n        }\n      });\n    });\n    return Promise.all([ssPromise, jsPromise]).then(([ss, module]) => {\n      return module;\n    }).catch(e => {\n      console.warn('bootload module error', e);\n    })\n  }).catch(function (error: any) {\n    console.warn('load remote error');\n    throw error\n  })\n}"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/Dynamic.ts"],"names":["g","window","global","onloadCSS","ss","callback","called","newcb","call","addEventListener","attachEvent","navigator","onloadcssdefined","jsonp","url","opt","fn","timeout","cbKey","cbVal","timer","Date","now","s","slice","indexOf","script","document","createElement","remove","clearTimeout","head","removeChild","undefined","src","data","appendChild","Promise","resolve","reject","setTimeout","Error","args","getBlurVersion","version","split","map","v","i","join","loadComponentCss","baseUrl","styleId","needComboCssChunk","componentCss","comboCssChunks","chunkName","unshift","comboCssUrl","setAttribute","DynamicRequire","name","hashed","jsonpCallback","replace","jsonpUrl","scriptId","uninstallFn","jse","getElementById","csse","then","modules","entry","entryModuleName","componentChunks","needComboChunk","hashState","MurmurHash3","hash","result","toString","substr","forEach","moduleName","isCss","module","webpackData","c","push","a","ssPromise","jsPromise","comboChunks","comboUrl","console","log","e","all","warn","error"],"mappings":"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","sourcesContent":["import Scriptjs from 'scriptjs';\nimport { loadCSS } from 'fg-loadcss';\nimport camelCase from 'camelcase';\nimport MurmurHash3 from 'imurmurhash';\n// import { Require, ParseModuleData } from './Main';\nexport * from './Main';\n\ndeclare var window: Window, global: any;\nvar g = typeof window != \"undefined\" ? window : global;\n\nexport type DepType = {\n  type: string;\n  version: string;\n  enforce: boolean;\n};\n\nexport type Deps = {\n  [name: string]: DepType;\n}\n\nexport type JSONOpt = {\n  timeout?: number;\n  cbKey?: string;\n  cbVal?: string;\n}\n\n/*! onloadCSS. (onload callback for loadCSS) [c]2017 Filament Group, Inc. MIT License */\n/* global navigator */\n/* exported onloadCSS */\nfunction onloadCSS(ss: any, callback?: () => void) {\n  let called: boolean | undefined;\n  function newcb() {\n    if (!called && callback) {\n      called = true;\n      callback.call(ss);\n    }\n  }\n  if (ss.addEventListener) {\n    ss.addEventListener(\"load\", newcb);\n  }\n  if (ss.attachEvent) {\n    ss.attachEvent(\"onload\", newcb);\n  }\n\n  // This code is for browsers that don’t support onload\n  // No support for onload (it'll bind but never fire):\n  //\t* Android 4.3 (Samsung Galaxy S4, Browserstack)\n  //\t* Android 4.2 Browser (Samsung Galaxy SIII Mini GT-I8200L)\n  //\t* Android 2.3 (Pantech Burst P9070)\n\n  // Weak inference targets Android < 4.4\n  if (\"isApplicationInstalled\" in navigator && \"onloadcssdefined\" in ss) {\n    ss.onloadcssdefined(newcb);\n  }\n}\n\n\nconst jsonp = (url: string, opt: JSONOpt = {}, fn?: Function) => {\n\n  if (typeof opt === 'function') {\n    fn = opt\n    opt = {}\n  }\n\n  let { timeout = null, cbKey = 'callback', cbVal = 'fengyu' } = opt\n  let timer: number;\n\n  if (cbVal === 'fengyu') {\n    cbVal += Date.now()\n  }\n\n  let s = ''\n  s += `&${cbKey}=${cbVal}`\n\n  s = s.slice(1)\n\n  url += (~url.indexOf('?') ? '&' : '?') + s\n\n  var script = document.createElement('script')\n\n  var remove = () => {\n    timer && clearTimeout(timer)\n    document.head.removeChild(script)\n    g[cbVal] = undefined\n  }\n\n  script.src = url\n\n\n  if (fn !== undefined && typeof fn === 'function') {\n    g[cbVal] = (data: any) => {\n      fn(data)\n      remove()\n    }\n\n    document.head.appendChild(script)\n    return\n  }\n\n  return new Promise((resolve: (arg0: any) => void, reject: (arg0: Error) => void) => {\n    // 请求超时\n    if (timeout) {\n      timer = setTimeout(() => {\n        reject(new Error('jsonp request timeout'))\n        remove()\n      }, timeout)\n    }\n    // 正常\n    g[cbVal] = (...args: any) => {\n      resolve(args);\n      remove()\n    }\n\n    document.head.appendChild(script)\n  })\n}\n\nfunction getBlurVersion(version: string) {\n  return version.split('.').map((v, i) => i > 0 ? 'x' : v).join('.');\n}\n// const _require_ = g.webpackData;\n// g.webpackData = function(moduleId: any) {\n//   const module = _require_.m[moduleId] as Function;\n//   if (!module) {\n//     console.warn(moduleId, 'can not be founded, check chunk is completion');\n//     return;\n//   }\n//   return _require_.call(this, moduleId);\n// }\n// Object.assign(g.webpackData, _require_);\n\n\nfunction loadComponentCss(baseUrl: string, styleId: string, needComboCssChunk: string[]) {\n  const componentCss = 'component.css';\n  const comboCssChunks = needComboCssChunk.map(chunkName => `deps/${chunkName}.css`);\n  comboCssChunks.unshift(componentCss);\n  const comboCssUrl = `${baseUrl}/??${comboCssChunks.join()}`;\n\n\n  const ss = loadCSS(comboCssUrl);\n  // @ts-ignore\n  ss && ss.setAttribute('id', styleId);\n  return new Promise((resolve, reject) => {\n    onloadCSS(ss, () => {\n      resolve();\n    });\n    setTimeout(reject, 5000);\n  });\n}\n\nexport function DynamicRequire(name: string, baseUrl: string, hashed: boolean) {\n  if (!name || !baseUrl) {\n    throw new Error('DynamicRequire name and baseUrl paramters must setted');\n  }\n  const jsonpCallback = camelCase(name.replace(/@/g, '$')).replace(/\\//g, '_');\n  const jsonpUrl = `${baseUrl}/jsonpmodules.js`;\n  const scriptId = `${name}_js`;\n  const styleId = `${name}_css`;\n  const uninstallFn = `${name}_uninstall`;\n  // @ts-ignore\n  window[uninstallFn] = () => {\n    const jse = document.getElementById(scriptId);\n    const csse = document.getElementById(styleId);\n    jse && jse.remove();\n    csse && csse.remove();\n  }\n  return jsonp(jsonpUrl, {\n    cbVal: jsonpCallback\n  }).then(function (args) {\n    const modules: string[] = args[0];\n    const entry: string = args[1];\n    let entryModuleName = `${name}/${entry}`;\n    const componentChunks = 'vendor.js,component.js';\n    const needComboCssChunk: string[] = [];\n    const needComboChunk: string[] = [];\n\n    if (hashed) {\n      const hashState = new MurmurHash3();\n      hashState.hash(entryModuleName);\n      entryModuleName = hashState.result().toString(16).substr(0, 6);\n    }\n\n    modules.forEach(([moduleName, chunkName, isCss]) => {\n      const module = g.webpackData.c[moduleName];\n      // 如果module不存在，放到module对应的chunk到combo信息里\n      if (!module && needComboChunk.indexOf(chunkName) === -1) {\n        needComboChunk.push(chunkName);\n      }\n      if (!module && isCss && needComboCssChunk.indexOf(chunkName) === -1) {\n        needComboCssChunk.push(chunkName);\n      }\n    });\n\n    // 已经加载过了的逻辑\n    if (g.webpackData.c[entryModuleName]) {\n      // if webpack enable hmr above return { children, exports, hot ...}\n      const module = g.webpackData(entryModuleName);\n      const csse = document.getElementById(styleId);\n      // 样式已经卸载，重新加载出来\n      if (!csse) {\n        loadComponentCss(baseUrl, styleId, needComboCssChunk);\n      }\n      return Promise.resolve(module.a || module);\n    }\n\n    // 新加载逻辑\n    // 加载css\n    const ssPromise = loadComponentCss(baseUrl, styleId, needComboCssChunk);\n    // 并行加载js\n    let jsPromise;\n    const comboChunks = needComboChunk.map(chunkName => `deps/${chunkName}.js`)\n    comboChunks.unshift(componentChunks); // 补上必须的组件资源\n    const comboUrl = `${baseUrl}/??${comboChunks.join()}`;\n    jsPromise = new Promise((resolve, reject) => {\n      Scriptjs(comboUrl, () => {\n        try {\n          console.log('load combo js done', name);\n          const module = g.webpackData(entryModuleName);\n          resolve(module.a || module);\n        } catch (e) {\n          reject(e);\n        }\n      });\n    });\n    return Promise.all([ssPromise, jsPromise]).then(([ss, module]) => {\n      return module;\n    }).catch(e => {\n      console.warn('bootload module error', e);\n    })\n  }).catch(function (error: any) {\n    console.warn('load remote error');\n    throw error\n  })\n}"]}

package.json

 {
   "name": "webpack-dynamic-require",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "you can require cdn bundle dynamic",
@@ -5,0 +5,0 @@ "main": "lib/Dynamic.js",

src/Dynamic.ts

@@ -132,2 +132,21 @@ import Scriptjs from 'scriptjs';
 
+
+function loadComponentCss(baseUrl: string, styleId: string, needComboCssChunk: string[]) {
+  const componentCss = 'component.css';
+  const comboCssChunks = needComboCssChunk.map(chunkName => `deps/${chunkName}.css`);
+  comboCssChunks.unshift(componentCss);
+  const comboCssUrl = `${baseUrl}/??${comboCssChunks.join()}`;
+
+
+  const ss = loadCSS(comboCssUrl);
+  // @ts-ignore
+  ss && ss.setAttribute('id', styleId);
+  return new Promise((resolve, reject) => {
+    onloadCSS(ss, () => {
+      resolve();
+    });
+    setTimeout(reject, 5000);
+  });
+}
+
 export function DynamicRequire(name: string, baseUrl: string, hashed: boolean) {
@@ -139,2 +158,12 @@ if (!name || !baseUrl) {
   const jsonpUrl = `${baseUrl}/jsonpmodules.js`;
+  const scriptId = `${name}_js`;
+  const styleId = `${name}_css`;
+  const uninstallFn = `${name}_uninstall`;
+  // @ts-ignore
+  window[uninstallFn] = () => {
+    const jse = document.getElementById(scriptId);
+    const csse = document.getElementById(styleId);
+    jse && jse.remove();
+    csse && csse.remove();
+  }
   return jsonp(jsonpUrl, {
@@ -146,2 +175,6 @@ cbVal: jsonpCallback
     let entryModuleName = `${name}/${entry}`;
+    const componentChunks = 'vendor.js,component.js';
+    const needComboCssChunk: string[] = [];
+    const needComboChunk: string[] = [];
+
     if (hashed) {
@@ -152,12 +185,3 @@ const hashState = new MurmurHash3();
     }
-    if (g.webpackData.c[entryModuleName]) {
-      // if webpack enable hmr above return { children, exports, hot ...}
-      const module = g.webpackData(entryModuleName);
-      return Promise.resolve(module.a || module);
-    }
 
-    const componentChunks = 'vendor.js,component.js';
-    const componentCss = 'component.css';
-    const needComboChunk: string[] = [];
-    const needComboCssChunk: string[] = [];
     modules.forEach(([moduleName, chunkName, isCss]) => {
@@ -173,15 +197,18 @@ const module = g.webpackData.c[moduleName];
     });
-    // 先加载css
-    let ssPromise;
-    const comboCssChunks = needComboCssChunk.map(chunkName => `deps/${chunkName}.css`);
-    comboCssChunks.unshift(componentCss);
-    const comboCssUrl = `${baseUrl}/??${comboCssChunks.join()}`;
-    const ss = loadCSS(comboCssUrl);
-    ssPromise = new Promise((resolve, reject) => {
-      onloadCSS(ss, () => {
-        resolve();
-      });
-      setTimeout(reject, 5000);
-    });
 
+    // 已经加载过了的逻辑
+    if (g.webpackData.c[entryModuleName]) {
+      // if webpack enable hmr above return { children, exports, hot ...}
+      const module = g.webpackData(entryModuleName);
+      const csse = document.getElementById(styleId);
+      // 样式已经卸载，重新加载出来
+      if (!csse) {
+        loadComponentCss(baseUrl, styleId, needComboCssChunk);
+      }
+      return Promise.resolve(module.a || module);
+    }
+
+    // 新加载逻辑
+    // 加载css
+    const ssPromise = loadComponentCss(baseUrl, styleId, needComboCssChunk);
     // 并行加载js
@@ -188,0 +215,0 @@ let jsPromise;

No alert changes

Improved metrics

Total package byte prevSize

77271

increased by4.98%

Lines of code

835

increased by4.77%

No dependency changes