@rancher/shell 0.3.14 → 0.3.15

package/vue.config.js

@@ -162,7 +162,7 @@ module.exports = function(dir, _appConfig) {
     const items = fs.readdirSync(path.relative(dir, './pkg'));
 
     // Ignore hidden folders
-    items.filter(name => !name.startsWith('.')).forEach((name) => {
+    items.filter((name) => !name.startsWith('.')).forEach((name) => {
       const f = require(path.join(dir, 'pkg', name, 'package.json'));
 
       // Package file must have rancher field to be a plugin
@@ -200,7 +200,7 @@ module.exports = function(dir, _appConfig) {
   const pkgImport = new webpack.NormalModuleReplacementPlugin(/^@pkg/, (resource) => {
     const ctx = resource.context.split('/');
     // Find 'pkg' folder in the contxt
-    const index = ctx.findIndex(s => s === 'pkg');
+    const index = ctx.findIndex((s) => s === 'pkg');
 
     if (index !== -1 && (index + 1) < ctx.length) {
       const pkg = ctx[index + 1];
@@ -271,6 +271,9 @@ module.exports = function(dir, _appConfig) {
   }
   const rancherEnv = process.env.RANCHER_ENV || 'web';
 
+  const loginLocaleSelector = process.env.LOGIN_LOCALE_SELECTOR || 'true';
+  const excludeOperatorPkg = process.env.EXCLUDE_OPERATOR_PKG || 'false';
+
   console.log(`API: '${ api }'. Env: '${ rancherEnv }'`); // eslint-disable-line no-console
   const proxy = {
     ...appConfig.proxies,
@@ -330,7 +333,7 @@ module.exports = function(dir, _appConfig) {
 
         server.websocketProxies.push({
           upgrade(req, socket, head) {
-            const path = Object.keys(socketProxies).find(path => req.url.startsWith(path));
+            const path = Object.keys(socketProxies).find((path) => req.url.startsWith(path));
 
             if (path) {
               const proxy = socketProxies[path];
@@ -381,6 +384,7 @@ module.exports = function(dir, _appConfig) {
       config.resolve.alias['@pkg'] = path.join(dir, 'pkg');
       config.resolve.alias['./node_modules'] = path.join(dir, 'node_modules');
       config.resolve.alias['@components'] = COMPONENTS_DIR;
+      config.resolve.alias['vue$'] = dev ? path.resolve(process.cwd(), 'node_modules', 'vue') : 'vue';
       config.resolve.modules.push(__dirname);
       config.plugins.push(virtualModules);
       config.plugins.push(autoImport);
@@ -389,17 +393,19 @@ module.exports = function(dir, _appConfig) {
       // DefinePlugin does string replacement within our code. We may want to consider replacing it with something else. In code we'll see something like
       // process.env.commit even though process and env aren't even defined objects. This could cause people to be mislead.
       config.plugins.push(new webpack.DefinePlugin({
-        'process.client':              JSON.stringify(true),
-        'process.env.commit':          JSON.stringify(commit),
-        'process.env.version':         JSON.stringify(dashboardVersion),
-        'process.env.dev':             JSON.stringify(dev),
-        'process.env.pl':              JSON.stringify(pl),
-        'process.env.perfTest':        JSON.stringify(perfTest),
-        'process.env.rancherEnv':      JSON.stringify(rancherEnv),
-        'process.env.harvesterPkgUrl': JSON.stringify(process.env.HARVESTER_PKG_URL),
-        'process.env.api':             JSON.stringify(api),
+        'process.client':                  JSON.stringify(true),
+        'process.env.commit':              JSON.stringify(commit),
+        'process.env.version':             JSON.stringify(dashboardVersion),
+        'process.env.dev':                 JSON.stringify(dev),
+        'process.env.pl':                  JSON.stringify(pl),
+        'process.env.perfTest':            JSON.stringify(perfTest),
+        'process.env.loginLocaleSelector': JSON.stringify(loginLocaleSelector),
+        'process.env.excludeOperatorPkg':  JSON.stringify(excludeOperatorPkg),
+        'process.env.rancherEnv':          JSON.stringify(rancherEnv),
+        'process.env.harvesterPkgUrl':     JSON.stringify(process.env.HARVESTER_PKG_URL),
+        'process.env.api':                 JSON.stringify(api),
         // Store the Router Base as env variable that we can use in `shell/config/router.js`
-        'process.env.routerBase':      JSON.stringify(routerBasePath),
+        'process.env.routerBase':          JSON.stringify(routerBasePath),
 
         // This is a replacement of the nuxt publicRuntimeConfig
         'nuxt.publicRuntimeConfig': JSON.stringify({

package/components/form/GithubPicker.vue

@@ -1,390 +0,0 @@
-<script>
-import { mapState } from 'vuex';
-import debounce from 'lodash/debounce';
-import { findBy } from '@shell/utils/array';
-import { EXTENDED_SCOPES } from '@shell/store/github';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-
-export const FILE_PATTERNS = {
-  dockerfile: /^Dockerfile(\..*)?$/i,
-  riofile:    /^Riofile(\..*)?$/i,
-  yaml:       /^.*\.ya?ml?$/i,
-};
-
-export default {
-  components: { LabeledSelect },
-  props:      {
-    value: {
-      type:     Object,
-      required: true,
-    },
-
-    // Filter files displayed in dropdown by keys in FILE_PATTERNS
-    filePattern: {
-      type:    String,
-      default: null,
-    },
-
-    preferredFile: {
-      type:    String,
-      default: null,
-    },
-
-    fileKey: {
-      type:    String,
-      default: 'dockerfile',
-    }
-  },
-
-  data() {
-    return {
-      repos:    [],
-      branches: [],
-      files:    [],
-
-      loadingRecentRepos: true,
-      loadingBranches:    true,
-      loadingFiles:       true,
-
-      selectedRepo:   null,
-      selectedBranch: null,
-      selectedFile:   null
-    };
-  },
-
-  computed: {
-    ...mapState({
-      scopes:      state => state.github.scopes,
-      recentRepos: state => state.github.repos,
-    }),
-
-    hasPrivate() {
-      return this.scopes.includes('repo');
-    },
-
-    repoPlaceholder() {
-      if ( this.loadingRecentRepos ) {
-        return 'Loading...';
-      } else {
-        return 'Select a Repository...';
-      }
-    },
-
-    branchPlaceholder() {
-      if ( this.selectedRepo ) {
-        if ( this.loadingBranches ) {
-          return 'Loading...';
-        } else {
-          return 'Select a Branch...';
-        }
-      } else {
-        return 'Select a Repository First';
-      }
-    },
-
-    filePlaceholder() {
-      if ( this.selectedBranch ) {
-        if ( this.loadingFiles ) {
-          return 'Loading...';
-        } else {
-          return 'Select a File...';
-        }
-      } else {
-        return 'Select a Branch First';
-      }
-    }
-  },
-
-  created() {
-    this.queueSearchRepos = debounce(this.searchRepos, 300);
-  },
-
-  async mounted() {
-    await this.fetchRepos();
-
-    if ( this.value && this.value.repo ) {
-      const repo = await this.$store.dispatch('github/fetchRepoByUrl', this.value.repo);
-
-      if ( !repo ) {
-        return;
-      }
-
-      this.selectRepo(repo);
-
-      const branch = await this.$store.dispatch('github/fetchBranch', { repo, branch: this.value.branch });
-
-      if ( !branch ) {
-        return;
-      }
-
-      this.selectBranch(branch);
-
-      const file = await this.$store.dispatch('github/fetchFile', {
-        repo,
-        branch,
-        file: this.value.file || this.preferredFile
-      });
-
-      if ( !file ) {
-        return;
-      }
-
-      this.selectFile(file);
-    }
-  },
-
-  methods: {
-    update() {
-      if ( this.selectedRepo && this.selectedBranch && this.selectedFile ) {
-        // Do something
-      }
-    },
-
-    selectRepo(repo) {
-      this.selectedFile = null;
-      this.selectedBranch = null;
-      this.selectedRepo = repo;
-      if ( repo ) {
-        this.fetchBranches(repo);
-      }
-
-      this.update();
-    },
-
-    selectBranch(branch) {
-      this.selectedFile = null;
-      this.selectedBranch = branch;
-      if ( branch ) {
-        this.fetchFiles(this.selectedRepo, branch);
-      }
-    },
-
-    selectFile(file) {
-      this.selectedFile = file;
-      this.value.repo = this.selectedRepo.clone_url;
-      this.value.branch = this.selectedBranch.name;
-      delete this.value.revision;
-      this.value[this.fileKey] = file.path;
-      this.$emit('input', this.value);
-    },
-
-    async expandScope() {
-      await this.$store.dispatch('github/forgetCache');
-      this.$store.dispatch('auth/redirectTo', {
-        provider: 'github',
-        scopes:   EXTENDED_SCOPES,
-        backTo:   this.$route.fullPath
-      });
-    },
-
-    onSearchRepos(search, loading) {
-      loading(true);
-      this.queueSearchRepos(search, loading);
-    },
-
-    async searchRepos(search, loading) {
-      const recent = await this.$store.dispatch('github/fetchRecentRepos');
-
-      if ( !search ) {
-        this.repos = recent;
-        loading(false);
-
-        return;
-      }
-
-      try {
-        loading(true);
-
-        const remote = await this.$store.dispatch('github/searchRepos', { search });
-        let matchingRecent = [];
-
-        if ( recent ) {
-          matchingRecent = recent.filter((x) => {
-            return x.full_name.toLowerCase().includes(search.toLowerCase()) &&
-            !findBy(remote, 'full_name', x.full_name);
-          });
-        }
-
-        this.repos = [...matchingRecent, ...remote];
-      } catch (err) {
-        this.repos = recent;
-      } finally {
-        loading(false);
-      }
-    },
-
-    async fetchRepos() {
-      try {
-        const res = await this.$store.dispatch('github/fetchRecentRepos');
-
-        this.repos = res;
-      } finally {
-        this.loadingRecentRepos = false;
-      }
-    },
-
-    async fetchBranches(repo) {
-      this.loadingBranches = true;
-
-      try {
-        const res = await this.$store.dispatch('github/fetchBranches', { repo: this.selectedRepo });
-
-        this.branches = res;
-
-        if ( !this.selectedBranch ) {
-          const master = findBy(this.branches, 'name', 'master');
-
-          if ( master ) {
-            this.selectBranch(master);
-          }
-        }
-      } finally {
-        this.loadingBranches = false;
-      }
-    },
-
-    async fetchFiles(repo, branch) {
-      try {
-        const res = await this.$store.dispatch('github/fetchFiles', {
-          repo:    this.selectedRepo,
-          branch:  this.selectedBranch,
-          pattern: FILE_PATTERNS[(this.filePattern || '').toLowerCase()],
-        });
-
-        this.files = res;
-
-        if ( !this.selectedFile && this.preferredFile ) {
-          const file = findBy(this.files, 'path', this.preferredFile);
-
-          if ( file ) {
-            this.selectFile(file);
-          }
-        }
-      } finally {
-        this.loadingFiles = false;
-      }
-    },
-  },
-};
-
-</script>
-
-<template>
-  <div class="picker">
-    <div
-      v-if="!hasPrivate && !loadingRecentRepos"
-      class="expand-scope pb-20"
-    >
-      <i class="icon icon-info" /> Showing only public repos.  <a
-        href="#"
-        class="text-primary bg-transparent"
-        @click="expandScope"
-      >
-        Click here
-      </a>
-      to grant Rio access to read private repos.
-    </div>
-    <div class="row">
-      <div class="col span-4">
-        <LabeledSelect
-          :placeholder="repoPlaceholder"
-          :disabled="loadingRecentRepos"
-          :options="repos"
-          label="full_name"
-          :value="selectedRepo"
-          :clearable="false"
-          @search="onSearchRepos"
-          @input="selectRepo"
-        >
-          <template #spinner="{loading}">
-            <span v-show="loading">
-              <i class="icon icon-spinner icon-spin" /> Loading&hellip;
-            </span>
-          </template>
-          <template #no-options>
-            Type to search GitHub repositories
-          </template>
-          <template
-            slot="option"
-            slot-scope="option"
-          >
-            <div class="d-center">
-              <img :src="option.owner.avatar_url">
-              {{ option.full_name }}
-            </div>
-          </template>
-          <template
-            slot="selected-option"
-            slot-scope="option"
-          >
-            <div class="selected d-center">
-              <img :src="option.owner.avatar_url">
-              {{ option.full_name }}
-            </div>
-          </template>
-        </LabeledSelect>
-      </div>
-      <div class="col span-4">
-        <LabeledSelect
-          :disabled="!selectedRepo || loadingBranches"
-          :placeholder="branchPlaceholder"
-          :options="branches"
-          label="name"
-          :value="selectedBranch"
-          :clearable="false"
-          @input="selectBranch"
-        />
-      </div>
-      <div class="col span-4">
-        <LabeledSelect
-          :disabled="!selectedBranch"
-          :placeholder="filePlaceholder"
-          :options="files"
-          label="path"
-          :value="selectedFile"
-          :clearable="false"
-          @input="selectFile"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.picker {
-  img {
-    height: 30px;
-    margin-right: 1rem;
-  }
-
-  .d-center {
-    display: flex;
-    align-items: center;
-  }
-
-  .selected img {
-    width: auto;
-    max-height: 23px;
-    margin-right: 0.5rem;
-  }
-
-  .v-select .dropdown li {
-    border-bottom: 1px solid rgba(112, 128, 144, 0.1);
-  }
-
-  .v-select .dropdown li:last-child {
-    border-bottom: none;
-  }
-
-  .v-select .dropdown li a {
-    padding: 10px 20px;
-    width: 100%;
-    font-size: 1.25em;
-    color: #3c3c3c;
-  }
-
-  .v-select .dropdown-menu .active > a {
-    color: #fff;
-  }
-}
-</style>

package/creators/pkg/package-lock.json

@@ -1,37 +0,0 @@
-{
-  "name": "@rancher/create-pkg",
-  "version": "0.1.37",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
-    },
-    "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
-    },
-    "universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
-    }
-  }
-}