Pārlūkot izejas kodu

Clean up implementation

Steven Silvester 7 gadi atpakaļ
vecāks
revīzija
943480251a
3 mainītis faili ar 12 papildinājumiem un 14 dzēšanām
  1. 1 1
      jupyterlab/commands.py
  2. 1 1
      jupyterlab/package.app.json
  3. 10 12
      jupyterlab/webpack.config.js

+ 1 - 1
jupyterlab/commands.py

@@ -800,7 +800,7 @@ def _ensure_package(app_dir, logger=None, name=None, version=None):
             shutil.rmtree(staging)
             os.makedirs(staging)
 
-    for fname in ['index.app.js', 'webpack.config.js', 'update-app.js']:
+    for fname in ['index.app.js', 'webpack.config.js']:
         dest = pjoin(staging, fname.replace('.app', ''))
         shutil.copy(pjoin(here, fname), dest)
 

+ 1 - 1
jupyterlab/package.app.json

@@ -2,7 +2,7 @@
   "name": "@jupyterlab/application-top",
   "version": "0.10.2",
   "scripts": {
-    "build": "webpack && node update-app.js",
+    "build": "webpack",
     "build:prod": "webpack --devtool source-map",
     "publish": "node make-release.js"
   },

+ 10 - 12
jupyterlab/webpack.config.js

@@ -13,33 +13,31 @@ fs.ensureDirSync(buildDir);
 
 fs.copySync('./package.json', './build/package.json');
 
+// Handle the extensions.
+var extensions = package_data.jupyterlab.extensions;
+var mimeExtensions = package_data.jupyterlab.mimeExtensions;
+Build.ensureAssets({
+  packageNames: Object.keys(mimeExtensions).concat(Object.keys(extensions)),
+  output: package_data.jupyterlab.outputDir
+});
+
 // Create the entry point file.
 var source = fs.readFileSync('index.js').toString();
 var template = Handlebars.compile(source);
 var data = {
-  jupyterlab_extensions: package_data.jupyterlab.extensions,
-  jupyterlab_mime_extensions: package_data.jupyterlab.mimeExtensions,
+  jupyterlab_extensions: extensions,
+  jupyterlab_mime_extensions: mimeExtensions,
 };
 var result = template(data);
 
 fs.writeFileSync(path.resolve(buildDir, 'index.out.js'), result);
 
-// Handle the extensions.
-Build.ensureAssets({
-  packageNames: [
-    Object.keys(package_data.jupyterlab.mimeExtensions) +
-    Object.keys(package_data.jupyterlab.extensions)
-  ],
-  output: package_data.jupyterlab.outputDir
-});
-
 // Create the hash
 var hash = crypto.createHash('md5');
 hash.update(fs.readFileSync('./package.json'));
 var digest = hash.digest('hex');
 fs.writeFileSync(path.resolve(buildDir, 'hash.md5'), digest);
 
-
 module.exports = {
   entry:  path.resolve(buildDir, 'index.out.js'),
   output: {