feat(chore): support npmmirror cdn

packages/blockToWebComponentTemplate/vite.config.js

@@ -43,7 +43,7 @@ export default defineConfig(({ command, mode }) => {
   }
 
   const vuePluginConfig = {}
-  const styleLinks = ['https://npm.onmicrosoft.cn/@opentiny/vue-theme@3.14/index.css']
+  const styleLinks = ['https://registry.npmmirror.com/@opentiny/vue-theme/3.14/files/index.css']
 
   config.publicDir = false
 

packages/design-core/.env.alpha

@@ -1,7 +1,8 @@
 # alpha mode, used by the "build:alpha" script
 
 NODE_ENV=production
-VITE_CDN_DOMAIN=https://npm.onmicrosoft.cn
+VITE_CDN_DOMAIN=https://registry.npmmirror.com
+VITE_CDN_TYPE=npmmirror
 VITE_LOCAL_IMPORT_MAPS=false
 VITE_LOCAL_BUNDLE_DEPS=false
 # VITE_ORIGIN=

packages/design-core/.env.development

@@ -1,7 +1,9 @@
 # development mode, used by the "vite" command
 
 NODE_ENV=development
-VITE_CDN_DOMAIN=https://npm.onmicrosoft.cn
+VITE_CDN_DOMAIN=https://registry.npmmirror.com
+VITE_CDN_TYPE=npmmirror
+
 VITE_LOCAL_IMPORT_MAPS=false
 VITE_LOCAL_BUNDLE_DEPS=false
 # request data via alpha service

packages/design-core/.env.prod

@@ -1,7 +1,8 @@
 # prod mode, used by the "build:prod" script
 
 NODE_ENV=production
-VITE_CDN_DOMAIN=https://npm.onmicrosoft.cn
+VITE_CDN_DOMAIN=https://registry.npmmirror.com
+VITE_CDN_TYPE=npmmirror
 VITE_LOCAL_IMPORT_MAPS=false
 VITE_LOCAL_BUNDLE_DEPS=false
 #VITE_ORIGIN=

packages/design-core/public/mock/bundle.json

@@ -20,8 +20,8 @@
           "npm": {
             "package": "element-plus",
             "version": "2.4.2",
-            "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
-            "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
+            "script": "https://registry.npmmirror.com/element-plus/2.4.2/files/dist/index.full.mjs",
+            "css": "https://registry.npmmirror.com/element-plus/2.4.2/files/dist/index.css",
             "dependencies": null,
             "exportName": "ElInput"
           },
@@ -300,8 +300,8 @@
           "npm": {
             "package": "element-plus",
             "version": "2.4.2",
-            "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
-            "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
+            "script": "https://registry.npmmirror.com/element-plus/2.4.2/files/dist/index.full.mjs",
+            "css": "https://registry.npmmirror.com/element-plus/2.4.2/files/dist/index.css",
             "dependencies": null,
             "exportName": "ElButton"
           },
@@ -621,8 +621,8 @@
           "npm": {
             "package": "element-plus",
             "version": "2.4.2",
-            "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
-            "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
+            "script": "https://registry.npmmirror.com/element-plus/2.4.2/files/dist/index.full.mjs",
+            "css": "https://registry.npmmirror.com/element-plus/2.4.2/files/dist/index.css",
             "dependencies": null,
             "exportName": "ElForm"
           },
@@ -1078,8 +1078,8 @@
           "npm": {
             "package": "element-plus",
             "version": "2.4.2",
-            "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
-            "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
+            "script": "https://registry.npmmirror.com/element-plus/2.4.2/files/dist/index.full.mjs",
+            "css": "https://registry.npmmirror.com/element-plus/2.4.2/files/dist/index.css",
             "dependencies": null,
             "exportName": "ElFormItem"
           },
@@ -1428,8 +1428,8 @@
           "npm": {
             "package": "element-plus",
             "version": "2.4.2",
-            "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
-            "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
+            "script": "https://registry.npmmirror.com/element-plus/2.4.2/files/dist/index.full.mjs",
+            "css": "https://registry.npmmirror.com/element-plus/2.4.2/files/dist/index.css",
             "dependencies": null,
             "exportName": "ElTable"
           },
@@ -2666,8 +2666,8 @@
           "npm": {
             "package": "element-plus",
             "version": "2.4.2",
-            "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
-            "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
+            "script": "https://registry.npmmirror.com/element-plus/2.4.2/files/dist/index.full.mjs",
+            "css": "https://registry.npmmirror.com/element-plus/2.4.2/files/dist/index.css",
             "dependencies": null,
             "exportName": "ElTableColumn"
           },

packages/design-core/src/preview/src/preview/importMap.js

@@ -19,9 +19,15 @@ import { VITE_CDN_DOMAIN } from '@opentiny/tiny-engine-controller/js/environment
 const importMap = {}
 
 const opentinyVueVersion = '~3.14'
+const versionDelimiter = import.meta.env.VITE_CDN_TYPE === 'npmmirror' ? '/' : '@'
+const fileDelimiter = import.meta.env.VITE_CDN_TYPE === 'npmmirror' ? '/files' : ''
 
 function replacePlaceholder(v) {
-  return v.replace('${VITE_CDN_DOMAIN}', VITE_CDN_DOMAIN).replace('${opentinyVueVersion}', opentinyVueVersion)
+  return v
+    .replace('${VITE_CDN_DOMAIN}', VITE_CDN_DOMAIN)
+    .replace('${opentinyVueVersion}', opentinyVueVersion)
+    .replace('${versionDelimiter}', versionDelimiter)
+    .replace('${fileDelimiter}', fileDelimiter)
 }
 
 importMap.imports = {

packages/design-core/src/preview/src/preview/importMap.json

@@ -1,23 +1,23 @@
 {
   "imports": {
-    "vue": "${VITE_CDN_DOMAIN}/vue@3.4.23/dist/vue.runtime.esm-browser.js",
-    "vue/server-renderer": "${VITE_CDN_DOMAIN}/@vue/server-renderer@3.4.23/dist/server-renderer.esm-browser.js",
-    "vue-i18n": "${VITE_CDN_DOMAIN}/vue-i18n@9.2.0-beta.36/dist/vue-i18n.esm-browser.js",
-    "vue-router": "${VITE_CDN_DOMAIN}/vue-router@4.0.16/dist/vue-router.esm-browser.js",
-    "@vue/devtools-api": "${VITE_CDN_DOMAIN}/@vue/devtools-api@6.5.1/lib/esm/index.js",
-    "@vueuse/core": "${VITE_CDN_DOMAIN}/@vueuse/core@9.6.0/index.mjs",
-    "@vueuse/shared": "${VITE_CDN_DOMAIN}/@vueuse/shared@9.6.0/index.mjs",
-    "axios": "${VITE_CDN_DOMAIN}/axios@1.0.0/dist/esm/axios.js",
-    "axios-mock-adapter": "${VITE_CDN_DOMAIN}/axios-mock-adapter@1.21.1/dist/axios-mock-adapter.js",
-    "@opentiny/tiny-engine-webcomponent-core": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-webcomponent-core@1/dist/tiny-engine-webcomponent-core.es.js",
-    "@opentiny/tiny-engine-i18n-host": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-i18n-host@1/dist/lowcode-design-i18n-host.es.js",
-    "@opentiny/tiny-engine-builtin-component": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-builtin-component@1/dist/index.js",
-    "vue-demi": "${VITE_CDN_DOMAIN}/vue-demi@0.13.11/lib/index.mjs",
-    "pinia": "${VITE_CDN_DOMAIN}/pinia@2.0.22/dist/pinia.esm-browser.js",
-    "@opentiny/vue": "${VITE_CDN_DOMAIN}/@opentiny/vue@${opentinyVueVersion}/runtime/tiny-vue.mjs",
-    "@opentiny/vue-icon": "${VITE_CDN_DOMAIN}/@opentiny/vue@${opentinyVueVersion}/runtime/tiny-vue-icon.mjs",
-    "@opentiny/vue-common": "${VITE_CDN_DOMAIN}/@opentiny/vue@${opentinyVueVersion}/runtime/tiny-vue-common.mjs",
-    "@opentiny/vue-locale": "${VITE_CDN_DOMAIN}/@opentiny/vue@${opentinyVueVersion}/runtime/tiny-vue-locale.mjs",
-    "@opentiny/vue-renderless/": "${VITE_CDN_DOMAIN}/@opentiny/vue-renderless@${opentinyVueVersion}/"
+    "vue": "${VITE_CDN_DOMAIN}/vue${versionDelimiter}3.4.23${fileDelimiter}/dist/vue.runtime.esm-browser.js",
+    "vue/server-renderer": "${VITE_CDN_DOMAIN}/@vue/server-renderer${versionDelimiter}3.4.23${fileDelimiter}/dist/server-renderer.esm-browser.js",
+    "vue-i18n": "${VITE_CDN_DOMAIN}/vue-i18n${versionDelimiter}9.2.0-beta.36${fileDelimiter}/dist/vue-i18n.esm-browser.js",
+    "vue-router": "${VITE_CDN_DOMAIN}/vue-router${versionDelimiter}4.0.16${fileDelimiter}/dist/vue-router.esm-browser.js",
+    "@vue/devtools-api": "${VITE_CDN_DOMAIN}/@vue/devtools-api${versionDelimiter}6.5.1${fileDelimiter}/lib/esm/index.js",
+    "@vueuse/core": "${VITE_CDN_DOMAIN}/@vueuse/core${versionDelimiter}9.6.0${fileDelimiter}/index.mjs",
+    "@vueuse/shared": "${VITE_CDN_DOMAIN}/@vueuse/shared${versionDelimiter}9.6.0${fileDelimiter}/index.mjs",
+    "axios": "${VITE_CDN_DOMAIN}/axios${versionDelimiter}1.0.0${fileDelimiter}/dist/esm/axios.js",
+    "axios-mock-adapter": "${VITE_CDN_DOMAIN}/axios-mock-adapter${versionDelimiter}1.21.1${fileDelimiter}/dist/axios-mock-adapter.js",
+    "@opentiny/tiny-engine-webcomponent-core": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-webcomponent-core${versionDelimiter}1${fileDelimiter}/dist/tiny-engine-webcomponent-core.es.js",
+    "@opentiny/tiny-engine-i18n-host": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-i18n-host${versionDelimiter}1${fileDelimiter}/dist/lowcode-design-i18n-host.es.js",
+    "@opentiny/tiny-engine-builtin-component": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-builtin-component${versionDelimiter}1${fileDelimiter}/dist/index.js",
+    "vue-demi": "${VITE_CDN_DOMAIN}/vue-demi${versionDelimiter}0.13.11${fileDelimiter}/lib/index.mjs",
+    "pinia": "${VITE_CDN_DOMAIN}/pinia${versionDelimiter}2.0.22${fileDelimiter}/dist/pinia.esm-browser.js",
+    "@opentiny/vue": "${VITE_CDN_DOMAIN}/@opentiny/vue${versionDelimiter}${opentinyVueVersion}${fileDelimiter}/runtime/tiny-vue.mjs",
+    "@opentiny/vue-icon": "${VITE_CDN_DOMAIN}/@opentiny/vue${versionDelimiter}${opentinyVueVersion}${fileDelimiter}/runtime/tiny-vue-icon.mjs",
+    "@opentiny/vue-common": "${VITE_CDN_DOMAIN}/@opentiny/vue${versionDelimiter}${opentinyVueVersion}${fileDelimiter}/runtime/tiny-vue-common.mjs",
+    "@opentiny/vue-locale": "${VITE_CDN_DOMAIN}/@opentiny/vue${versionDelimiter}${opentinyVueVersion}${fileDelimiter}/runtime/tiny-vue-locale.mjs",
+    "@opentiny/vue-renderless/": "${VITE_CDN_DOMAIN}/@opentiny/vue-renderless${versionDelimiter}${opentinyVueVersion}${fileDelimiter}/"
   }
 }

packages/design-core/src/preview/src/preview/srcFiles.js

@@ -26,10 +26,16 @@ import storesHelperJS from './srcFiles/storesHelper.js?raw'
 
 const srcFiles = {}
 
+const versionDelimiter = import.meta.env.VITE_CDN_TYPE === 'npmmirror' ? '/' : '@'
+const fileDelimiter = import.meta.env.VITE_CDN_TYPE === 'npmmirror' ? '/files' : ''
+
 srcFiles['App.vue'] = appVue
 srcFiles['Main.vue'] = mainVue
 srcFiles['constant.js'] = constantJS
-srcFiles['app.js'] = appJS.replace(/VITE_CDN_DOMAIN/g, import.meta.env.VITE_CDN_DOMAIN)
+srcFiles['app.js'] = appJS
+  .replace(/VITE_CDN_DOMAIN/g, import.meta.env.VITE_CDN_DOMAIN)
+  .replaceAll('${versionDelimiter}', versionDelimiter)
+  .replaceAll('${fileDelimiter}', fileDelimiter)
 srcFiles['injectGlobal.js'] = injectGlobalJS
 srcFiles['lowcode.js'] = lowcodeJS
 srcFiles['dataSourceMap.js'] = dataSourceMapJS

packages/design-core/src/preview/src/preview/srcFiles/app.js

@@ -16,5 +16,6 @@ function addCss(href) {
   link.setAttribute('href', href)
   document.head.appendChild(link)
 }
-addCss('VITE_CDN_DOMAIN/@opentiny/[email protected]/index.css')
-addCss('VITE_CDN_DOMAIN/@opentiny/[email protected]/index.css')
+
+addCss('VITE_CDN_DOMAIN/@opentiny/vue-theme${versionDelimiter}3.14${fileDelimiter}/index.css')
+addCss('VITE_CDN_DOMAIN/@opentiny/vue-theme-mobile${versionDelimiter}3.14${fileDelimiter}/index.css')

packages/design-core/vite.config.js

@@ -197,8 +197,48 @@ const commonAlias = {
   '@opentiny/tiny-engine-app-addons': path.resolve(__dirname, './config/addons.js')
 }
 
+const getImportMaps = (cdnLink, command, cdnType) => {
+  const versionDelimiter = cdnType === 'npmmirror' ? '/' : '@'
+  const fileDelimiter = cdnType === 'npmmirror' ? '/files' : ''
+
+  const importMapStyles = [
+    `${cdnLink}/@opentiny/vue-theme${versionDelimiter}${importMapVersions.tinyVue}${fileDelimiter}/index.css`
+  ]
+
+  const importmap = {
+    imports: {
+      prettier: `${cdnLink}/prettier${versionDelimiter}${importMapVersions.prettier}${fileDelimiter}/esm/standalone.mjs`,
+      'prettier/': `${cdnLink}/prettier${versionDelimiter}${importMapVersions.prettier}${fileDelimiter}/esm/`,
+      'prettier/parser-typescript': `${cdnLink}/prettier${versionDelimiter}${importMapVersions.prettier}${fileDelimiter}/esm/parser-typescript.mjs`,
+      'prettier/parser-html': `${cdnLink}/prettier${versionDelimiter}${importMapVersions.prettier}${fileDelimiter}/esm/parser-html.mjs`,
+      'prettier/parser-postcss': `${cdnLink}/prettier${versionDelimiter}${importMapVersions.prettier}${fileDelimiter}/esm/parser-postcss.mjs`,
+      'prettier/parser-babel': `${cdnLink}/prettier${versionDelimiter}${importMapVersions.prettier}${fileDelimiter}/esm/parser-babel.mjs`,
+
+      vue: `${cdnLink}/vue${versionDelimiter}${importMapVersions.vue}${fileDelimiter}/dist/vue.runtime.esm-browser${
+        command === 'build' ? '.prod' : ''
+      }.js`,
+      '@opentiny/vue': `${cdnLink}/@opentiny/vue${versionDelimiter}${importMapVersions.tinyVue}${fileDelimiter}/runtime/tiny-vue.mjs`,
+      '@opentiny/vue-icon': `${cdnLink}/@opentiny/vue${versionDelimiter}${importMapVersions.tinyVue}${fileDelimiter}/runtime/tiny-vue-icon.mjs`,
+      '@opentiny/vue-common': `${cdnLink}/@opentiny/vue${versionDelimiter}${importMapVersions.tinyVue}${fileDelimiter}/runtime/tiny-vue-common.mjs`,
+      '@opentiny/vue-locale': `${cdnLink}/@opentiny/vue${versionDelimiter}${importMapVersions.tinyVue}${fileDelimiter}/runtime/tiny-vue-locale.mjs`,
+      '@opentiny/vue-design-smb': `${cdnLink}/@opentiny/vue-design-smb${versionDelimiter}${importMapVersions.tinyVue}${fileDelimiter}/index.js`,
+      '@opentiny/vue-theme/theme-tool': `${cdnLink}/@opentiny/vue-theme${versionDelimiter}${importMapVersions.tinyVue}${fileDelimiter}/theme-tool.js`,
+      '@opentiny/vue-theme/theme': `${cdnLink}/@opentiny/vue-theme${versionDelimiter}${importMapVersions.tinyVue}${fileDelimiter}/theme/index.js`
+    }
+  }
+
+  return {
+    importMapStyles,
+    importmap
+  }
+}
+
 export default defineConfig(({ command, mode }) => {
-  const { VITE_CDN_DOMAIN, VITE_LOCAL_IMPORT_MAPS, VITE_LOCAL_BUNDLE_DEPS } = loadEnv(mode, process.cwd(), '')
+  const { VITE_CDN_DOMAIN, VITE_LOCAL_IMPORT_MAPS, VITE_LOCAL_BUNDLE_DEPS, VITE_CDN_TYPE } = loadEnv(
+    mode,
+    process.cwd(),
+    ''
+  )
   const isLocalImportMap = VITE_LOCAL_IMPORT_MAPS === 'true' // true公共依赖库使用本地打包文件，false公共依赖库使用公共CDN
   const isCopyBundleDeps = VITE_LOCAL_BUNDLE_DEPS === 'true' // true bundle里的cdn依赖处理成本地依赖， false 不处理
 
@@ -240,7 +280,9 @@ export default defineConfig(({ command, mode }) => {
   if (command === 'serve') {
     const devVueAlias = {
       find: /^vue$/,
-      replacement: `${VITE_CDN_DOMAIN}/vue@${importMapVersions.vue}/dist/vue.runtime.esm-browser.js`
+      replacement: `${VITE_CDN_DOMAIN}/vue${VITE_CDN_TYPE === 'npmmirror' ? '/' : ''}${importMapVersions.vue}${
+        VITE_CDN_TYPE === 'npmmirror' ? '/files' : ''
+      }/dist/vue.runtime.esm-browser.js`
     }
 
     config.resolve.alias = [
@@ -260,29 +302,7 @@ export default defineConfig(({ command, mode }) => {
     }
   }
 
-  const importmap = {
-    imports: {
-      prettier: `${VITE_CDN_DOMAIN}/prettier@${importMapVersions.prettier}/esm/standalone.mjs`,
-      'prettier/': `${VITE_CDN_DOMAIN}/prettier@${importMapVersions.prettier}/esm/`,
-      'prettier/parser-typescript': `${VITE_CDN_DOMAIN}/prettier@${importMapVersions.prettier}/esm/parser-typescript.mjs`,
-      'prettier/parser-html': `${VITE_CDN_DOMAIN}/prettier@${importMapVersions.prettier}/esm/parser-html.mjs`,
-      'prettier/parser-postcss': `${VITE_CDN_DOMAIN}/prettier@${importMapVersions.prettier}/esm/parser-postcss.mjs`,
-      'prettier/parser-babel': `${VITE_CDN_DOMAIN}/prettier@${importMapVersions.prettier}/esm/parser-babel.mjs`,
-
-      vue: `${VITE_CDN_DOMAIN}/vue@${importMapVersions.vue}/dist/vue.runtime.esm-browser${
-        command === 'build' ? '.prod' : ''
-      }.js`,
-      '@opentiny/vue': `${VITE_CDN_DOMAIN}/@opentiny/vue@${importMapVersions.tinyVue}/runtime/tiny-vue.mjs`,
-      '@opentiny/vue-icon': `${VITE_CDN_DOMAIN}/@opentiny/vue@${importMapVersions.tinyVue}/runtime/tiny-vue-icon.mjs`,
-      '@opentiny/vue-common': `${VITE_CDN_DOMAIN}/@opentiny/vue@${importMapVersions.tinyVue}/runtime/tiny-vue-common.mjs`,
-      '@opentiny/vue-locale': `${VITE_CDN_DOMAIN}/@opentiny/vue@${importMapVersions.tinyVue}/runtime/tiny-vue-locale.mjs`,
-      '@opentiny/vue-design-smb': `${VITE_CDN_DOMAIN}/@opentiny/vue-design-smb@${importMapVersions.tinyVue}/index.js`,
-      '@opentiny/vue-theme/theme-tool': `${VITE_CDN_DOMAIN}/@opentiny/vue-theme@${importMapVersions.tinyVue}/theme-tool.js`,
-      '@opentiny/vue-theme/theme': `${VITE_CDN_DOMAIN}/@opentiny/vue-theme@${importMapVersions.tinyVue}/theme/index.js`
-    }
-  }
-
-  const importMapStyles = [`${VITE_CDN_DOMAIN}/@opentiny/vue-theme@${importMapVersions.tinyVue}/index.css`]
+  const { importMapStyles, importmap } = getImportMaps(VITE_CDN_DOMAIN, command, VITE_CDN_TYPE)
 
   config.plugins.push(
     monacoEditorPluginInstance,