@modern-js/core 1.0.0-rc.16 → 1.0.0-rc.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/dist/js/modern/config/index.js +1 -1
  3. package/dist/js/node/config/index.js +1 -1
  4. package/package.json +76 -76
  5. package/src/config/index.ts +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @modern-js/core
2
2
 
3
+ ## 1.0.0-rc.17
4
+
5
+ ### Patch Changes
6
+
7
+ - 224f7fe: fix server route match
8
+ - 30ac27c: feat: add generator package description
9
+ - 204c626: feat: initial
10
+ - fix: #118 #104
11
+ - Updated dependencies [224f7fe]
12
+ - Updated dependencies [30ac27c]
13
+ - Updated dependencies [204c626]
14
+ - Updated dependencies [undefined]
15
+ - @modern-js/load-config@1.0.0-rc.17
16
+ - @modern-js/plugin@1.0.0-rc.17
17
+ - @modern-js/utils@1.0.0-rc.17
18
+
3
19
  ## 1.0.0-rc.16
4
20
 
5
21
  ### Patch Changes
package/dist/js/modern/config/index.js CHANGED
@@ -20,7 +20,7 @@ const debug = createDebugger('resolve-config');
20
20
  export { defaults as defaultsConfig };
21
21
  export const defineConfig = config => config;
22
22
  export const loadUserConfig = async (appDirectory, filePath) => {
23
- const loaded = loadConfig(appDirectory, filePath);
23
+ const loaded = await loadConfig(appDirectory, filePath);
24
24
  const config = !loaded ? {} : await (typeof loaded.config === 'function' ? loaded.config(0) : loaded.config);
25
25
  return {
26
26
  config: mergeWith({}, config || {}, (loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {}),
package/dist/js/node/config/index.js CHANGED
@@ -50,7 +50,7 @@ const defineConfig = config => config;
50
50
  exports.defineConfig = defineConfig;
51
51
 
52
52
  const loadUserConfig = async (appDirectory, filePath) => {
53
- const loaded = (0, _loadConfig.loadConfig)(appDirectory, filePath);
53
+ const loaded = await (0, _loadConfig.loadConfig)(appDirectory, filePath);
54
54
  const config = !loaded ? {} : await (typeof loaded.config === 'function' ? loaded.config(0) : loaded.config);
55
55
  return {
56
56
  config: (0, _lodash.default)({}, config || {}, (loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {}),
package/package.json CHANGED
@@ -1,77 +1,77 @@
1
1
  {
2
- "name": "@modern-js/core",
3
- "version": "1.0.0-rc.16",
4
- "jsnext:source": "./src/index.ts",
5
- "types": "./dist/types/index.d.ts",
6
- "main": "./dist/js/node/index.js",
7
- "module": "./dist/js/treeshaking/index.js",
8
- "jsnext:modern": "./dist/js/modern/index.js",
9
- "exports": {
10
- ".": {
11
- "node": {
12
- "import": "./dist/js/modern/index.js",
13
- "require": "./dist/js/node/index.js"
14
- },
15
- "default": "./dist/js/treeshaking/index.js"
16
- },
17
- "./bin": "./bin/modern-js.js"
18
- },
19
- "typesVersions": {
20
- "*": {
21
- "config": [
22
- "./dist/types/config/index.d.ts"
23
- ]
24
- }
25
- },
26
- "bin": "./bin/modern-js.js",
27
- "dependencies": {
28
- "@babel/runtime": "^7",
29
- "@babel/code-frame": "^7.14.5",
30
- "@modern-js/load-config": "^1.0.0-rc.16",
31
- "@modern-js/plugin": "^1.0.0-rc.16",
32
- "@modern-js/utils": "^1.0.0-rc.16",
33
- "address": "^1.1.2",
34
- "ajv": "^8.6.2",
35
- "ajv-keywords": "^5.0.0",
36
- "better-ajv-errors": "^0.7.0",
37
- "chokidar": "^3.5.2",
38
- "commander": "^8.1.0",
39
- "dotenv": "^10.0.0",
40
- "dotenv-expand": "^5.1.0",
41
- "lodash.clonedeep": "^4.5.0",
42
- "lodash.mergewith": "^4.6.2",
43
- "minimist": "^1.2.5",
44
- "signale": "^1.4.0",
45
- "v8-compile-cache": "^2.3.0"
46
- },
47
- "devDependencies": {
48
- "@types/babel__code-frame": "^7.0.3",
49
- "@modern-js/types": "^1.0.0-rc.16",
50
- "@types/jest": "^26",
51
- "@types/lodash.clonedeep": "^4.5.6",
52
- "@types/lodash.mergewith": "^4.6.6",
53
- "@types/node": "^14",
54
- "@types/react": "^17",
55
- "@types/react-dom": "^17",
56
- "@types/signale": "^1.4.2",
57
- "typescript": "^4",
58
- "@modern-js/plugin-testing": "^1.0.0-rc.16",
59
- "@modern-js/module-tools": "^1.0.0-rc.16"
60
- },
61
- "sideEffects": false,
62
- "modernConfig": {
63
- "output": {
64
- "packageMode": "node-js"
65
- }
66
- },
67
- "publishConfig": {
68
- "registry": "https://registry.npmjs.org/",
69
- "access": "public"
70
- },
71
- "scripts": {
72
- "new": "modern new",
73
- "build": "modern build",
74
- "dev": "modern build --watch",
75
- "test": "modern test --passWithNoTests"
76
- }
77
- }
2
+ "name": "@modern-js/core",
3
+ "version": "1.0.0-rc.17",
4
+ "jsnext:source": "./src/index.ts",
5
+ "types": "./dist/types/index.d.ts",
6
+ "main": "./dist/js/node/index.js",
7
+ "module": "./dist/js/treeshaking/index.js",
8
+ "jsnext:modern": "./dist/js/modern/index.js",
9
+ "exports": {
10
+ ".": {
11
+ "node": {
12
+ "import": "./dist/js/modern/index.js",
13
+ "require": "./dist/js/node/index.js"
14
+ },
15
+ "default": "./dist/js/treeshaking/index.js"
16
+ },
17
+ "./bin": "./bin/modern-js.js"
18
+ },
19
+ "typesVersions": {
20
+ "*": {
21
+ "config": [
22
+ "./dist/types/config/index.d.ts"
23
+ ]
24
+ }
25
+ },
26
+ "bin": "./bin/modern-js.js",
27
+ "dependencies": {
28
+ "@babel/runtime": "^7",
29
+ "@babel/code-frame": "^7.14.5",
30
+ "@modern-js/load-config": "^1.0.0-rc.17",
31
+ "@modern-js/plugin": "^1.0.0-rc.17",
32
+ "@modern-js/utils": "^1.0.0-rc.17",
33
+ "address": "^1.1.2",
34
+ "ajv": "^8.6.2",
35
+ "ajv-keywords": "^5.0.0",
36
+ "better-ajv-errors": "^0.7.0",
37
+ "chokidar": "^3.5.2",
38
+ "commander": "^8.1.0",
39
+ "dotenv": "^10.0.0",
40
+ "dotenv-expand": "^5.1.0",
41
+ "lodash.clonedeep": "^4.5.0",
42
+ "lodash.mergewith": "^4.6.2",
43
+ "minimist": "^1.2.5",
44
+ "signale": "^1.4.0",
45
+ "v8-compile-cache": "^2.3.0"
46
+ },
47
+ "devDependencies": {
48
+ "@types/babel__code-frame": "^7.0.3",
49
+ "@modern-js/types": "^1.0.0-rc.17",
50
+ "@types/jest": "^26",
51
+ "@types/lodash.clonedeep": "^4.5.6",
52
+ "@types/lodash.mergewith": "^4.6.6",
53
+ "@types/node": "^14",
54
+ "@types/react": "^17",
55
+ "@types/react-dom": "^17",
56
+ "@types/signale": "^1.4.2",
57
+ "typescript": "^4",
58
+ "@modern-js/plugin-testing": "^1.0.0-rc.17",
59
+ "@modern-js/module-tools": "^1.0.0-rc.17"
60
+ },
61
+ "sideEffects": false,
62
+ "modernConfig": {
63
+ "output": {
64
+ "packageMode": "node-js"
65
+ }
66
+ },
67
+ "publishConfig": {
68
+ "registry": "https://registry.npmjs.org/",
69
+ "access": "public"
70
+ },
71
+ "scripts": {
72
+ "new": "modern new",
73
+ "build": "modern build",
74
+ "dev": "modern build --watch",
75
+ "test": "modern test --passWithNoTests"
76
+ }
77
+ }
package/src/config/index.ts CHANGED
@@ -175,7 +175,7 @@ export const loadUserConfig = async (
175
175
  appDirectory: string,
176
176
  filePath?: string,
177
177
  ): Promise<LoadedConfig> => {
178
- const loaded = loadConfig<ConfigParam>(appDirectory, filePath);
178
+ const loaded = await loadConfig<ConfigParam>(appDirectory, filePath);
179
179
 
180
180
  const config = !loaded
181
181
  ? {}