Integrate do-catalog generation

4 years ago · 909758fe47
parent 0a7fc1f555
commit 909758fe47
6 changed files with 19 additions and 13 deletions
--- a/NEWS.md
+++ b/NEWS.md
@ -5,8 +5,9 @@ Development
 - None yet

 ### Features
-* Fix column sanitization for connector syncs ([15885](https://github.com/CartoDB/cartodb/pull/15885))
-* Load config files as ERB templates to allow reading ENV values ([15881](https://github.com/CartoDB/cartodb/pull/15881))
+* Fix column sanitization for connector syncs ([#15885](https://github.com/CartoDB/cartodb/pull/15885))
+* Load config files as ERB templates to allow reading ENV values ([#15881](https://github.com/CartoDB/cartodb/pull/15881))
+* Add public website DO catalog integration ([#15908](https://github.com/CartoDB/cartodb/pull/15908))

 ### Bug fixes / enhancements
 * Identify multi-line GeoJSON columns correctly on imports [#15891](https://github.com/CartoDB/cartodb/pull/15891)
--- a/lib/assets/javascripts/do-catalog/App.vue
+++ b/lib/assets/javascripts/do-catalog/App.vue
@ -6,7 +6,7 @@

 <script>
 export default {
-  name: 'do-catalog'
+  name: 'App'
 };
 </script>

--- a/lib/assets/javascripts/do-catalog/main.js
+++ b/lib/assets/javascripts/do-catalog/main.js
@ -7,20 +7,21 @@ import router from './router';

 Vue.config.productionTip = false;

-const elementId = process.env.NODE_ENV === 'production' ? '#do-catalog' : '#app';
+const el = process.env.NODE_ENV === 'development' ? '#app' : '#do-catalog';

+/* eslint-disable no-new */
 new Vue({
+  el,
  router,
  store,
  i18n,
-  render: h => h(App)
-}).$mount(elementId);
+  components: { App },
+  template: '<App />'
+});

 // HTML integration
 /*
  <link rel="stylesheet" href="./do-catalog.css">
  <script src="./do-catalog.umd.min.js" async defer></script>
-  <body>
-    <div id="do-catalog"></div>
-  </body>
+  <div id="do-catalog"></div>
 */
--- a/lib/assets/javascripts/new-dashboard/components/Subscriptions/ModalSubscription.vue
+++ b/lib/assets/javascripts/new-dashboard/components/Subscriptions/ModalSubscription.vue
@ -64,7 +64,6 @@
                  class="checkbox-decorationMedia"
                >
                  <path
-                    data-v-d1b5b660=""
                    d="M1.65 3.803l2.84 3.169L10.38.717"
                    fill="none"
                    class="checkbox-check"
--- a/package.json
+++ b/package.json
@ -226,9 +226,9 @@
    "update-internal-deps": "rm -rf node_modules && npm install",
    "branch-files": "node lib/build/branchFiles/branchFiles.js",
    "affected_specs": "node lib/build/branchFiles/branchFiles.js | xargs node lib/build/affectedFiles/affectedFiles.js",
-    "build": "NODE_ENV=production webpack --progress --config webpack/v4/webpack.prod.config.js",
+    "build": "NODE_ENV=production webpack --progress --config webpack/v4/webpack.prod.config.js && npm run build:do-catalog",
    "build:dev": "NODE_ENV=development webpack --progress --config webpack/v4/webpack.dev.config.js",
-    "build:static": "NODE_ENV=production webpack --progress --config w ebpack/static-pages/webpack.prod.config.js",
+    "build:static": "NODE_ENV=production webpack --progress --config webpack/static-pages/webpack.prod.config.js",
    "build:do-catalog": "NODE_ENV=production vue-cli-service build --target lib --name do-catalog --formats umd-min --no-clean --inline-vue lib/assets/javascripts/do-catalog/main.js",
    "carto-node": "NODE_ENV=production webpack --progress --config webpack/carto-node/webpack.config.js",
    "dev": "NODE_ENV=development webpack --progress --watch --config webpack/v4/webpack.dev.config.js",
--- a/vue.config.js
+++ b/vue.config.js
@ -2,7 +2,8 @@ const path = require('path');
 const { version } = require('./package.json');

 module.exports = {
-  outputDir: path.resolve(__dirname, `public/assets/${version}/javascripts`),
+  runtimeCompiler: true,
+  outputDir: path.resolve(__dirname, `public/assets/${version}/export`),
  configureWebpack: {
    resolve: {
      alias: {
@ -10,6 +11,10 @@ module.exports = {
        'new-dashboard': path.resolve(__dirname, 'lib/assets/javascripts/new-dashboard/')
      },
      extensions: ['.js', '.vue', '.json', '.scss']
+    },
+    performance: {
+      maxEntrypointSize: 2048000,
+      maxAssetSize: 1024000
    }
  },
  css: {