expressa 2.0.19 → 2.0.20

package/cypress/integration/custom_collections.js

@@ -13,9 +13,11 @@ describe('Custom Collections', function() {
     cy.visit('/')
     cy.get('.hamburger-container').click();
     cy.wait(100)
-    cy.get('span').contains('Collection').click();
+    cy.get('span').contains('Data').click();
+    cy.wait(1000)
+    cy.get('.is-opened span').contains('Collection').click();
 
-    cy.get('.btn-primary').click();
+    cy.get('.btn-primary').contains('Add').click();
     let id = `coll-${randomId()}`;
     cy.fillValue('_id', id)
 

package/cypress/support/commands.js

@@ -24,6 +24,21 @@
 // -- This will overwrite an existing command --
 // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
 
+Cypress.Commands.overwrite('server', () => {
+  // no-op polyfill for deprecated cy.server
+})
+
+Cypress.Commands.overwrite('route', (originalFn, arg1, arg2, arg3) => {
+  // polyfill cy.route to cy.intercept for Cypress >= 10
+  if (typeof arg2 === 'undefined' && typeof arg3 === 'undefined') {
+    return cy.intercept(arg1)
+  }
+  if (typeof arg3 === 'undefined') {
+    return cy.intercept(arg1, arg2)
+  }
+  return cy.intercept(arg1, arg2, arg3)
+})
+
 Cypress.Commands.add('randomId', (length) => {
     var text = "";
     var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";

package/cypress/support/util.js

@@ -1,4 +1,4 @@
-exports.randomId = function(length) {
+export function randomId(length) {
   var text = "";
   var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 

package/cypress.config.js

@@ -0,0 +1,18 @@
+// Configure Cypress v10+ while preserving legacy folder structure
+// https://docs.cypress.io/guides/references/configuration
+
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+	e2e: {
+		// Keep using the legacy integration tests directory
+		specPattern: 'cypress/integration/**/*.js',
+		supportFile: 'cypress/support/index.js',
+		baseUrl: 'http://localhost:3001/admin',
+		setupNodeEvents(on, config) {
+			// no plugins yet
+			return config
+		}
+	},
+	video: false
+})

package/modules/admin/build/build.js

@@ -14,7 +14,8 @@ const webpackConfig = require('./webpack.prod.conf')
 const spinner = ora('building for production...')
 spinner.start()
 
-rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
+// Clean the entire dist directory to ensure no stale top-level hashed files linger
+rm(path.join(config.build.assetsRoot), err => {
   if (err) throw err
   webpack(webpackConfig, (err, stats) => {
     spinner.stop()

package/modules/admin/build/utils.js

@@ -19,7 +19,8 @@ exports.cssLoaders = function(options) {
   const cssLoader = {
     loader: 'css-loader',
     options: {
-      sourceMap: options.sourceMap
+      sourceMap: options.sourceMap,
+      esModule: false
     }
   }
 

package/modules/admin/build/webpack.base.conf.js

@@ -84,10 +84,10 @@ module.exports = {
       },
       {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-        loader: 'url-loader',
+        loader: 'file-loader',
         options: {
-          limit: 10000,
-          name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
+          name: utils.assetsPath('fonts/[name].[hash:7].[ext]'),
+          esModule: false
         }
       },
       {

package/modules/admin/dist/css/{864.506917a4.css → 197.7a90435e.css}

@@ -1,5 +1,5 @@
 
-.el-table[data-v-3076ddee] th {
+.el-table[data-v-4b9ae5da] th {
  background-color: #343a40 !important;
  border-color: #454d55;
  color: #fff;

package/modules/admin/dist/css/{699.d1f90954.css → 430.8c9b0482.css}

@@ -1,5 +1,5 @@
 
-.el-table[data-v-3076ddee] th {
+.el-table[data-v-4b9ae5da] th {
  background-color: #343a40 !important;
  border-color: #454d55;
  color: #fff;

package/modules/admin/dist/css/{899.506917a4.css → 566.7a90435e.css}

@@ -1,5 +1,5 @@
 
-.el-table[data-v-3076ddee] th {
+.el-table[data-v-4b9ae5da] th {
  background-color: #343a40 !important;
  border-color: #454d55;
  color: #fff;