@docusaurus/core 4.0.0-canary-6968 → 4.0.0-canary-6970

package/lib/commands/deploy.js

@@ -86,26 +86,16 @@ This behavior can have SEO impacts and create relative link issues.
             throw new Error('Please set the GIT_USER environment variable, or explicitly specify USE_SSH instead!');
         }
     }
-    const organizationName = process.env.ORGANIZATION_NAME ??
-        process.env.CIRCLE_PROJECT_USERNAME ??
-        siteConfig.organizationName;
+    const organizationName = process.env.ORGANIZATION_NAME ?? siteConfig.organizationName;
     if (!organizationName) {
         throw new Error(`Missing project organization name. Did you forget to define "organizationName" in ${siteConfigPath}? You may also export it via the ORGANIZATION_NAME environment variable.`);
     }
     logger_1.default.info `organizationName: name=${organizationName}`;
-    const projectName = process.env.PROJECT_NAME ??
-        process.env.CIRCLE_PROJECT_REPONAME ??
-        siteConfig.projectName;
+    const projectName = process.env.PROJECT_NAME ?? siteConfig.projectName;
     if (!projectName) {
         throw new Error(`Missing project name. Did you forget to define "projectName" in ${siteConfigPath}? You may also export it via the PROJECT_NAME environment variable.`);
     }
     logger_1.default.info `projectName: name=${projectName}`;
-    // We never deploy on pull request.
-    const isPullRequest = process.env.CI_PULL_REQUEST ?? process.env.CIRCLE_PULL_REQUEST;
-    if (isPullRequest) {
-        logger_1.default.info('Skipping deploy on a pull request.');
-        process.exit(0);
-    }
     // github.io indicates organization repos that deploy via default branch. All
     // others use gh-pages (either case can be configured actually, but we can
     // make educated guesses). Organization deploys look like:

package/lib/commands/swizzle/config.js

@@ -13,16 +13,17 @@ const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_validation_1 = require("@docusaurus/utils-validation");
 const common_1 = require("./common");
 const themes_1 = require("./themes");
-function getModuleSwizzleConfig(swizzlePlugin) {
+function getModuleSwizzleConfig(swizzlePlugin, themeName) {
     const getSwizzleConfig = swizzlePlugin.plugin.plugin.getSwizzleConfig ??
         swizzlePlugin.plugin.pluginModule?.module.getSwizzleConfig;
     if (getSwizzleConfig) {
         return getSwizzleConfig();
     }
-    // TODO deprecate getSwizzleComponentList later
+    // TODO Docusaurus v5: remove the deprecated getSwizzleComponentList() API
     const getSwizzleComponentList = swizzlePlugin.plugin.plugin.getSwizzleComponentList ??
         swizzlePlugin.plugin.pluginModule?.module.getSwizzleComponentList;
     if (getSwizzleComponentList) {
+        logger_1.default.warn `Theme name=${themeName} uses the deprecated code=${'getSwizzleComponentList()'} API, which will be removed in Docusaurus v5. The theme should implement code=${'getSwizzleConfig()'} instead: url=${'https://docusaurus.io/docs/api/plugin-methods/extend-infrastructure#getSwizzleConfig'}`;
         const safeComponents = getSwizzleComponentList() ?? [];
         const safeComponentConfig = {
             actions: {
@@ -69,7 +70,7 @@ const FallbackSwizzleConfig = {
 };
 function getThemeSwizzleConfig(themeName, plugins) {
     const plugin = (0, themes_1.getPluginByThemeName)(plugins, themeName);
-    const config = getModuleSwizzleConfig(plugin);
+    const config = getModuleSwizzleConfig(plugin, themeName);
     if (config) {
         try {
             return normalizeSwizzleConfig(config);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "4.0.0-canary-6968",
+  "version": "4.0.0-canary-6970",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -27,15 +27,15 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "4.0.0-canary-6968",
-    "@docusaurus/bundler": "4.0.0-canary-6968",
-    "@docusaurus/fs": "4.0.0-canary-6968",
-    "@docusaurus/glob": "4.0.0-canary-6968",
-    "@docusaurus/logger": "4.0.0-canary-6968",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6968",
-    "@docusaurus/utils": "4.0.0-canary-6968",
-    "@docusaurus/utils-common": "4.0.0-canary-6968",
-    "@docusaurus/utils-validation": "4.0.0-canary-6968",
+    "@docusaurus/babel": "4.0.0-canary-6970",
+    "@docusaurus/bundler": "4.0.0-canary-6970",
+    "@docusaurus/fs": "4.0.0-canary-6970",
+    "@docusaurus/glob": "4.0.0-canary-6970",
+    "@docusaurus/logger": "4.0.0-canary-6970",
+    "@docusaurus/mdx-loader": "4.0.0-canary-6970",
+    "@docusaurus/utils": "4.0.0-canary-6970",
+    "@docusaurus/utils-common": "4.0.0-canary-6970",
+    "@docusaurus/utils-validation": "4.0.0-canary-6970",
     "@rspack/core": "^2.2.3",
     "@rspack/dev-server": "^2.2.1",
     "boxen": "^9.0.0",
@@ -68,8 +68,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6968",
-    "@docusaurus/types": "4.0.0-canary-6968",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6970",
+    "@docusaurus/types": "4.0.0-canary-6970",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/escape-html": "^1.0.4",
     "@types/history": "^4.7.11",