<<<<<<< HEAD
var version = require("./package.json").version;
var nbdir = "../exatomic/static/";

// Custom webpack loaders are generally the same for all webpack bundles, hence
// stored in a separate local variable.
var loaders = [
    { test: /\.json$/, loader: "json-loader" },
];


module.exports = [
    {// Notebook extension
     //
     // This bundle only contains the part of the JavaScript that is run on
     // load of the notebook. This section generally only performs
     // some configuration for requirejs, and provides the legacy
     // "load_ipython_extension" function which is required for any notebook
     // extension.
     //
        entry: "./src/extension.js",
        output: {
            filename: "extension.js",
            path: nbdir,
            libraryTarget: "amd"
        }
    },
    {// Bundle for the notebook containing the custom widget views and models
     //
     // This bundle contains the implementation for the custom widget views and
     // custom widget.
     // It must be an amd module
     //
        entry: "./src/index.js",
        output: {
            filename: "index.js",
            path: nbdir,
            libraryTarget: "amd"
        },
        devtool: "source-map",
        module: {
            loaders: loaders
        },
        externals: ["jupyter-js-widgets"]
    },
    {// Embeddable jupyter-exatomic bundle
     //
     // This bundle is generally almost identical to the notebook bundle
     // containing the custom widget views and models.
     //
     // The only difference is in the configuration of the webpack public path
     // for the static assets.
     //
     // It will be automatically distributed by unpkg to work with the static
     // widget embedder.
     //
     // The target bundle is always `dist/index.js`, which is the path required
     // by the custom widget embedder.
     //
        entry: "./src/embed.js",
        output: {
            filename: "index.js",
            path: "./dist/",
            libraryTarget: "amd",
            publicPath: "https://unpkg.com/jupyter-exatomic@" + version + "/dist/"
        },
        devtool: "source-map",
        module: {
            loaders: loaders
        },
        externals: ["jupyter-js-widgets"]
    }
];
=======
var version = require("./package.json").version;

// Custom webpack loaders are generally the same for all webpack bundles, hence
// stored in a separate local variable.
var loaders = [
    { test: /\.json$/, loader: "json-loader" },
];


module.exports = [
    {// Notebook extension
     //
     // This bundle only contains the part of the JavaScript that is run on
     // load of the notebook. This section generally only performs
     // some configuration for requirejs, and provides the legacy
     // "load_ipython_extension" function which is required for any notebook
     // extension.
     //
        entry: "./src/extension.js",
        output: {
            filename: "extension.js",
            path: "../exatomic/static",
            libraryTarget: "amd"
        }
    },
    {// Bundle for the notebook containing the custom widget views and models
     //
     // This bundle contains the implementation for the custom widget views and
     // custom widget.
     // It must be an amd module
     //
        entry: "./src/index.js",
        output: {
            filename: "index.js",
            path: "../exatomic/static",
            libraryTarget: "amd"
        },
        devtool: "source-map",
        module: {
            loaders: loaders
        },
        //externals: ["jupyter-js-widgets"]
        externals: ["@jupyter-widgets/base", "@jupyter-widgets/controls"]
    },
    {// Embeddable jupyter-exatomic bundle
     //
     // This bundle is generally almost identical to the notebook bundle
     // containing the custom widget views and models.
     //
     // The only difference is in the configuration of the webpack public path
     // for the static assets.
     //
     // It will be automatically distributed by unpkg to work with the static
     // widget embedder.
     //
     // The target bundle is always `dist/index.js`, which is the path required
     // by the custom widget embedder.
     //
        entry: "./src/embed.js",
        output: {
            filename: "index.js",
            path: "./dist/",
            libraryTarget: "amd",
            publicPath: "https://unpkg.com/jupyter-exatomic@" + version + "/dist/"
        },
        devtool: "source-map",
        module: {
            loaders: loaders
        },
        //externals: ["jupyter-js-widgets"]
        externals: ["@jupyter-widgets/base", "@jupyter-widgets/controls"]
    }
];
>>>>>>> 1c37655b6be3dca60b2adbeee8ca3767e5477943

@@ -1,2353 +1,4 @@
-%3C%3C%3C%3C%3C%3C%3C HEAD%0Avar version = require(%22./package.json%22).version;%0D%0Avar nbdir = %22../exatomic/static/%22;%0D%0A%0D%0A// Custom webpack loaders are generally the same for all webpack bundles, hence%0D%0A// stored in a separate local variable.%0D%0Avar loaders = %5B%0D%0A    %7B test: /%5C.json$/, loader: %22json-loader%22 %7D,%0D%0A%5D;%0D%0A%0D%0A%0D%0Amodule.exports = %5B%0D%0A    %7B// Notebook extension%0D%0A     //%0D%0A     // This bundle only contains the part of the JavaScript that is run on%0D%0A     // load of the notebook. This section generally only performs%0D%0A     // some configuration for requirejs, and provides the legacy%0D%0A     // %22load_ipython_extension%22 function which is required for any notebook%0D%0A     // extension.%0D%0A     //%0D%0A        entry: %22./src/extension.js%22,%0D%0A        output: %7B%0D%0A            filename: %22extension.js%22,%0D%0A            path: nbdir,%0D%0A            libraryTarget: %22amd%22%0D%0A        %7D%0D%0A    %7D,%0D%0A    %7B// Bundle for the notebook containing the custom widget views and models%0D%0A     //%0D%0A     // This bundle contains the implementation for the custom widget views and%0D%0A     // custom widget.%0D%0A     // It must be an amd module%0D%0A     //%0D%0A        entry: %22./src/index.js%22,%0D%0A        output: %7B%0D%0A            filename: %22index.js%22,%0D%0A            path: nbdir,%0D%0A            libraryTarget: %22amd%22%0D%0A        %7D,%0D%0A        devtool: %22source-map%22,%0D%0A        module: %7B%0D%0A            loaders: loaders%0D%0A        %7D,%0D%0A        externals: %5B%22jupyter-js-widgets%22%5D%0D%0A    %7D,%0D%0A    %7B// Embeddable jupyter-exatomic bundle%0D%0A     //%0D%0A     // This bundle is generally almost identical to the notebook bundle%0D%0A     // containing the custom widget views and models.%0D%0A     //%0D%0A     // The only difference is in the configuration of the webpack public path%0D%0A     // for the static assets.%0D%0A     //%0D%0A     // It will be automatically distributed by unpkg to work with the static%0D%0A     // widget embedder.%0D%0A     //%0D%0A     // The target bundle is always %60dist/index.js%60, which is the path required%0D%0A     // by the custom widget embedder.%0D%0A     //%0D%0A        entry: %22./src/embed.js%22,%0D%0A        output: %7B%0D%0A            filename: %22index.js%22,%0D%0A            path: %22./dist/%22,%0D%0A            libraryTarget: %22amd%22,%0D%0A            publicPath: %22https://unpkg.com/jupyter-exatomic@%22 + version + %22/dist/%22%0D%0A        %7D,%0D%0A        devtool: %22source-map%22,%0D%0A        module: %7B%0D%0A            loaders: loaders%0D%0A        %7D,%0D%0A        externals: %5B%22jupyter-js-widgets%22%5D%0D%0A    %7D%0D%0A%5D;%0D%0A=======%0A
 var 
@@ -2400,53 +2400,4 @@
 %0A%5D;%0A
-%3E%3E%3E%3E%3E%3E%3E 1c37655b6be3dca60b2adbeee8ca3767e5477943%0A

Remove ^M from webpack